Merge lp://qastaging/~gue5t/midori/bookmark-search-gtk2-placeholder into lp://qastaging/midori
Proposed by
gue5t gue5t
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Cris Dywan | ||||
| Approved revision: | 7013 | ||||
| Merged at revision: | 7014 | ||||
| Proposed branch: | lp://qastaging/~gue5t/midori/bookmark-search-gtk2-placeholder | ||||
| Merge into: | lp://qastaging/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://qastaging/~gue5t/midori/bookmark-search-gtk2-placeholder | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cris Dywan | Approve | ||
|
Review via email:
|
|||
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.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Another good catch! So apparently that wasn't renamed when sokoke-has-default was renamed.