Merge lp:~gue5t/midori/bookmark-search-gtk2-placeholder into lp:midori

[gue5t gue5t]

Fix fallout (broken bookmarks and history panel search) from tweaks to GTK2 entry placeholder

Two places were passing the wrong key to g_object_set_data to check whether the search entry was showing a placeholder. This fixes them and makes search of bookmarks and history in the respective panels work properly again.

[Cris Dywan (kalikiana)]

Another good catch! So apparently that wasn't renamed when sokoke-has-default was renamed.

review: Approve

=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2015-02-24 18:18:08 +0000
+++ panels/midori-bookmarks.c	2015-08-10 00:16:10 +0000
@@ -1327,7 +1327,7 @@
     if (bookmarks->filter_timeout)
         g_source_remove (bookmarks->filter_timeout);
 
-    if (!g_object_get_data (G_OBJECT (entry), "sokoke_has_default"))
+    if (!g_object_get_data (G_OBJECT (entry), "sokoke_showing_default"))
         katze_assign (bookmarks->filter, g_strdup (gtk_entry_get_text (entry)));
     else
         katze_assign (bookmarks->filter, NULL);
 
=== modified file 'panels/midori-history.c'
--- panels/midori-history.c	2013-10-25 21:49:56 +0000
+++ panels/midori-history.c	2015-08-10 00:16:10 +0000
@@ -897,7 +897,7 @@
     history->filter_timeout = midori_timeout_add (COMPLETION_DELAY,
         midori_history_filter_timeout_cb, history, NULL);
 
-    if (!g_object_get_data (G_OBJECT (entry), "sokoke_has_default"))
+    if (!g_object_get_data (G_OBJECT (entry), "sokoke_showing_default"))
         katze_assign (history->filter, g_strdup (gtk_entry_get_text (entry)));
     else
         katze_assign (history->filter, NULL);