Midori Web Browser

Merge lp:~danrabbit/midori/bookmark-regression-fix into lp:midori

  1. bookmark-regression-fix
  2. Merge into trunk
Proposed by Danielle Foré
Status: Merged
Approved by: Paweł Forysiuk
Approved revision: 6171
Merged at revision: 6171
Proposed branch: lp:~danrabbit/midori/bookmark-regression-fix
Merge into: lp:midori
Diff against target: 15 lines (+1/-4)
1 file modified
midori/midori-browser.c (+1/-4)
To merge this branch: bzr merge lp:~danrabbit/midori/bookmark-regression-fix
Reviewer Review Type Date Requested Status
Paweł Forysiuk Approve
Review via email: mp+164972@code.launchpad.net

Commit message

Fix bookmarks dialog rename regression introduced in r6167.

Description of the change

It appears my bookmark dialog rework caused a small regression with regards to editing folders in the bookmarks sidepanel. This branch fixes that regression.

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-05-21 16:00:42 +0000
3+++ midori/midori-browser.c 2013-05-21 20:03:26 +0000
4@@ -986,10 +986,7 @@
5 entry_title = gtk_entry_new ();
6 gtk_entry_set_activates_default (GTK_ENTRY (entry_title), TRUE);
7 value = katze_item_get_name (bookmark);
8- if (!is_folder)
9- {
10- gtk_entry_set_text (GTK_ENTRY (entry_title), katze_str_non_null (value));
11- }
12+ gtk_entry_set_text (GTK_ENTRY (entry_title), katze_str_non_null (value));
13 midori_browser_edit_bookmark_title_changed_cb (GTK_ENTRY (entry_title),
14 GTK_DIALOG (dialog));
15 g_signal_connect (entry_title, "changed",

Subscribers

People subscribed via source and target branches

to all changes: