]> spindle.queued.net Git - midori/commitdiff
Don't search for place holder text in panels
authorChristian Dywan <christian@twotoasts.de>
Fri, 3 Aug 2012 19:05:54 +0000 (21:05 +0200)
committerChristian Dywan <christian@twotoasts.de>
Fri, 3 Aug 2012 19:07:28 +0000 (21:07 +0200)
extensions/cookie-manager/cookie-manager-page.c
panels/midori-bookmarks.c
panels/midori-history.c

index 6b6ac634e2e55753c2d8c3a4593dff28481e41b3..fb450b8c39e8e43e0ccb903e1efeb288c44648fe 100644 (file)
@@ -809,7 +809,10 @@ static void cm_filter_entry_changed_cb(GtkEditable *editable, CookieManagerPage
        if (priv->ignore_changed_filter)
                return;
 
-       text = gtk_entry_get_text(GTK_ENTRY(editable));
+       if (gtk_entry_get_placeholder_text(GTK_ENTRY(editable)) != NULL)
+               text = gtk_entry_get_text(GTK_ENTRY(editable));
+       else
+               text = NULL;
        cm_filter_tree(cmp, text);
 
        cookie_manager_update_filter(priv->parent, text);
index 01da74621f82300547190e9dfc5334df1e089297..8ef87c3a9dbfb6863f625dacdffa4e72bf03b1a3 100644 (file)
@@ -998,7 +998,12 @@ midori_bookmarks_filter_entry_changed_cb (GtkEntry*        entry,
 {
     if (bookmarks->filter_timeout)
         g_source_remove (bookmarks->filter_timeout);
-    katze_assign (bookmarks->filter, g_strdup (gtk_entry_get_text (entry)));
+
+    if (gtk_entry_get_placeholder_text (entry) != NULL)
+        katze_assign (bookmarks->filter, g_strdup (gtk_entry_get_text (entry)));
+    else
+        katze_assign (bookmarks->filter, NULL);
+
     bookmarks->filter_timeout = g_timeout_add (COMPLETION_DELAY,
         midori_bookmarks_filter_timeout_cb, bookmarks);
 }
index 50d09a123c155213e94cc6ab59102d52af01e925..b5d6af38e8715ea85eb27a13a1df8873b6b23f50 100644 (file)
@@ -964,7 +964,11 @@ midori_history_filter_entry_changed_cb (GtkEntry*      entry,
         g_source_remove (history->filter_timeout);
     history->filter_timeout = g_timeout_add (COMPLETION_DELAY,
         midori_history_filter_timeout_cb, history);
-    katze_assign (history->filter, g_strdup (gtk_entry_get_text (entry)));
+
+    if (gtk_entry_get_placeholder_text (entry) != NULL)
+        katze_assign (history->filter, g_strdup (gtk_entry_get_text (entry)));
+    else
+        katze_assign (history->filter, NULL);
 }
 
 static void