[Xfce4-commits] <midori:master> Delete search history when clearing history

[Christian Dywan]

Updating branch refs/heads/master
         to 922a94fc98c9ac7dd2ba3ed39323a8a3e68879a2 (commit)
       from b4a21723fc7e9c892174b3bdbc7bf980757edfa1 (commit)

commit 922a94fc98c9ac7dd2ba3ed39323a8a3e68879a2
Author: Samuel Creshal <creshal at arcor.de>
Date:   Tue Jul 6 10:42:30 2010 +0200

    Delete search history when clearing history

 midori/midori-browser.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 3f3808b..cdbe57d 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -4164,9 +4164,18 @@ midori_browser_clear_private_data_response_cb (GtkWidget*     dialog,
 
             if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
             {
-                g_printerr (_("Failed to remove history item: %s\n"), errmsg);
+                g_printerr (_("Failed to clear history: %s\n"), errmsg);
                 sqlite3_free (errmsg);
             }
+            else
+            {
+                sqlcmd = "DELETE FROM search";
+                if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
+                {
+                    g_printerr (_("Failed to clear search history: %s\n"), errmsg);
+                    sqlite3_free (errmsg);
+                }
+            }
             clear_prefs |= MIDORI_CLEAR_HISTORY;
         }
         #endif