Merge lp:~tuxator/midori/fix-1184505 into lp:midori

[Paweł Forysiuk]

Specify int64 id item as a string in bookmark remove/update queries

[Cris Dywan (kalikiana)]

Looks good!

review: Approve

=== modified file 'midori/midori-bookmarks.c'
--- midori/midori-bookmarks.c	2012-11-25 15:37:41 +0000
+++ midori/midori-bookmarks.c	2013-06-13 17:00:46 +0000
@@ -48,19 +48,21 @@
 {
     gchar* sqlcmd;
     char* errmsg = NULL;
-
-
-    sqlcmd = sqlite3_mprintf (
-            "DELETE FROM bookmarks WHERE id = %" G_GINT64_FORMAT ";",
+    gchar* id;
+
+    id = g_strdup_printf ("%" G_GINT64_FORMAT,
             katze_item_get_meta_integer (item, "id"));
 
+    sqlcmd = sqlite3_mprintf ("DELETE FROM bookmarks WHERE id = %q", id);
+
     if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
     {
-        g_printerr (_("Failed to remove history item: %s\n"), errmsg);
+        g_printerr (_("Failed to remove bookmark item: %s\n"), errmsg);
         sqlite3_free (errmsg);
     }
 
     sqlite3_free (sqlcmd);
+    g_free (id);
 }
 
 #define _APPEND_TO_SQL_ERRORMSG(custom_errmsg) \
 
=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2013-06-04 17:28:05 +0000
+++ panels/midori-bookmarks.c	2013-06-13 17:00:46 +0000
@@ -556,6 +556,10 @@
     char* errmsg = NULL;
     gchar* parentid;
     gboolean updated;
+    gchar* id;
+
+    id = g_strdup_printf ("%" G_GINT64_FORMAT,
+            katze_item_get_meta_integer (item, "id"));
 
     if (katze_item_get_meta_integer (item, "parentid") > 0)
         parentid = g_strdup_printf ("%" G_GINT64_FORMAT,
@@ -566,14 +570,14 @@
     sqlcmd = sqlite3_mprintf (
             "UPDATE bookmarks SET "
             "parentid=%q, title='%q', uri='%q', desc='%q', toolbar=%d, app=%d "
-            "WHERE id = %" G_GINT64_FORMAT ";",
+            "WHERE id = %q ;",
             parentid,
             katze_item_get_name (item),
             katze_str_non_null (katze_item_get_uri (item)),
             katze_str_non_null (katze_item_get_meta_string (item, "desc")),
             katze_item_get_meta_boolean (item, "toolbar"),
             katze_item_get_meta_boolean (item, "app"),
-            katze_item_get_meta_integer (item, "id"));
+            id);
 
     updated = TRUE;
     if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
@@ -585,6 +589,7 @@
 
     sqlite3_free (sqlcmd);
     g_free (parentid);
+    g_free (id);
 
     return updated;
 }