Nautilus

Merge lp:~aacid/nautilus/fix_quicklist_underscore into lp:~ubuntu-desktop/nautilus/ubuntu

Proposed by Albert Astals Cid on 2012-05-22

Status:	Merged
Merged at revision:	297
Proposed branch:	lp:~aacid/nautilus/fix_quicklist_underscore
Merge into:	lp:~ubuntu-desktop/nautilus/ubuntu
Diff against target:	32 lines (+6/-2) 1 file modified debian/patches/12_unity_launcher_support.patch (+6/-2)
To merge this branch:	bzr merge lp:~aacid/nautilus/fix_quicklist_underscore
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Didier Roche		2012-05-22	Approve on 2012-05-22
Review via email: mp+106760@code.launchpad.net

Escape _ as __

Fixes bug where foo_bar would appear as foobar with the b underlined in the quicklist

Escape _ as __

Fixes bug where foo_bar would appear as foobar with the b underlined in the quicklist

Didier Roche (didrocks) wrote on 2012-05-22:

will change the line numbers on the patch and use g_free. Thanks for the fix!

review: Approve

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

People subscribed via source and target branches

to all changes:

1	=== modified file 'debian/patches/12_unity_launcher_support.patch'
2	--- debian/patches/12_unity_launcher_support.patch 2012-05-15 00:08:55 +0000
3	+++ debian/patches/12_unity_launcher_support.patch 2012-05-22 09:04:19 +0000
4	@@ -683,7 +683,7 @@
5	Index: nautilus-3.5.1/src/unity-bookmarks-handler.c
6	===================================================================
7	--- /dev/null 1970-01-01 00:00:00.000000000 +0000
8	-+++ nautilus-3.5.1/src/unity-bookmarks-handler.c 2012-05-15 11:53:38.043941831 +1200
9	++++ nautilus-3.5.1/src/unity-bookmarks-handler.c 2012-05-22 08:52:17 +0000
10	@@ -0,0 +1,133 @@
11	+/*unity-bookmarks-handler.c: handle Unity bookmark for quicklist
12	+ *
13	@@ -718,6 +718,8 @@
14	+#include "nautilus-application.h"
15	+#include "nautilus-window-private.h"
16	+
17	++#include <eel/eel-string.h>
18	++
19	+static UnityQuicklistHandler* unity_quicklist_handler = NULL;
20	+static NautilusBookmarkList* bookmarks = NULL;
21	+
22	@@ -788,7 +790,9 @@
23	+ UnityLauncherEntry *entry = l->data;
24	+
25	+ DbusmenuMenuitem* menuitem = dbusmenu_menuitem_new();
26	-+ dbusmenu_menuitem_property_set (menuitem, "label", nautilus_bookmark_get_name (bookmark));
27	++ gchar *bookmark_name_dbusmenu = eel_str_replace_substring (nautilus_bookmark_get_name (bookmark), "_", "__");
28	++ dbusmenu_menuitem_property_set (menuitem, "label", bookmark_name_dbusmenu);
29	++ free (bookmark_name_dbusmenu);
30	+ g_signal_connect (menuitem, DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
31	+ (GCallback) activate_bookmark_by_quicklist,
32	+ bookmark);