Midori Web Browser

Merge lp:~aauzi/midori/fix-1177553-1 into lp:midori

  1. fix-1177553-1
  2. Merge into trunk
Proposed by André Auzi
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6222
Merged at revision: 6222
Proposed branch: lp:~aauzi/midori/fix-1177553-1
Merge into: lp:midori
Diff against target: 21 lines (+2/-2)
1 file modified
midori/midori-browser.c (+2/-2)
To merge this branch: bzr merge lp:~aauzi/midori/fix-1177553-1
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+170693@code.launchpad.net

Commit message

Fix showing (sub)folders in bookmarkbar

To post a comment you must log in.
Revision history for this message
Paweł Forysiuk (tuxator) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'midori/midori-browser.c'
2--- midori/midori-browser.c 2013-06-19 20:28:39 +0000
3+++ midori/midori-browser.c 2013-06-20 20:14:22 +0000
4@@ -6931,7 +6931,7 @@
5 KatzeItem* item)
6 {
7 MidoriBrowser* browser = midori_browser_get_for_widget (toolbar);
8- GtkAction* action = _action_by_name (browser, "Tools");
9+ GtkAction* action = _action_by_name (browser, "Bookmarks");
10 GtkToolItem* toolitem = katze_array_action_create_tool_item_for (
11 KATZE_ARRAY_ACTION (action), item);
12 g_object_set_data (G_OBJECT (toolitem), "KatzeItem", item);
13@@ -6991,7 +6991,7 @@
14 gint64 id = katze_item_get_meta_integer (item, "id");
15 gchar* parentid = g_strdup_printf ("%" G_GINT64_FORMAT, id);
16 KatzeArray* subfolder = midori_array_query (browser->bookmarks,
17- "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid = %q AND uri != ''",
18+ "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid = %q",
19 parentid);
20
21 katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item));

Subscribers

People subscribed via source and target branches

to all changes: