Midori Web Browser

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

  1. bookmark-search-gtk2-placeholder
  2. Merge into trunk
Proposed by gue5t gue5t
Status: Merged
Approved by: Cris Dywan
Approved revision: 7013
Merged at revision: 7014
Proposed branch: lp:~gue5t/midori/bookmark-search-gtk2-placeholder
Merge into: lp:midori
Diff against target: 25 lines (+2/-2)
2 files modified
panels/midori-bookmarks.c (+1/-1)
panels/midori-history.c (+1/-1)
To merge this branch: bzr merge lp:~gue5t/midori/bookmark-search-gtk2-placeholder
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Review via email: mp+267465@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'panels/midori-bookmarks.c'
2--- panels/midori-bookmarks.c 2015-02-24 18:18:08 +0000
3+++ panels/midori-bookmarks.c 2015-08-10 00:16:10 +0000
4@@ -1327,7 +1327,7 @@
5 if (bookmarks->filter_timeout)
6 g_source_remove (bookmarks->filter_timeout);
7
8- if (!g_object_get_data (G_OBJECT (entry), "sokoke_has_default"))
9+ if (!g_object_get_data (G_OBJECT (entry), "sokoke_showing_default"))
10 katze_assign (bookmarks->filter, g_strdup (gtk_entry_get_text (entry)));
11 else
12 katze_assign (bookmarks->filter, NULL);
13
14=== modified file 'panels/midori-history.c'
15--- panels/midori-history.c 2013-10-25 21:49:56 +0000
16+++ panels/midori-history.c 2015-08-10 00:16:10 +0000
17@@ -897,7 +897,7 @@
18 history->filter_timeout = midori_timeout_add (COMPLETION_DELAY,
19 midori_history_filter_timeout_cb, history, NULL);
20
21- if (!g_object_get_data (G_OBJECT (entry), "sokoke_has_default"))
22+ if (!g_object_get_data (G_OBJECT (entry), "sokoke_showing_default"))
23 katze_assign (history->filter, g_strdup (gtk_entry_get_text (entry)));
24 else
25 katze_assign (history->filter, NULL);

Subscribers

People subscribed via source and target branches

to all changes: