Merge lp:~larsu/indicator-messages/lp956147 into lp:indicator-messages/0.3

Proposed by Lars Karlitski on 2012-04-10
Status: Merged
Approved by: Charles Kerr on 2012-04-10
Approved revision: 266
Merged at revision: 269
Proposed branch: lp:~larsu/indicator-messages/lp956147
Merge into: lp:indicator-messages/0.3
Diff against target: 22 lines (+1/-4)
1 file modified
src/messages-service.c (+1/-4)
To merge this branch: bzr merge lp:~larsu/indicator-messages/lp956147
Reviewer Review Type Date Requested Status
Charles Kerr (community) 2012-04-10 Approve on 2012-04-10
Review via email: mp+101407@code.launchpad.net
To post a comment you must log in.
Charles Kerr (charlesk) wrote :

Looks good!

I noticed that dbusmenu-glib's menuitem.h has this:

> #define DBUSMENU_MENUITEM_ICON_NAME_BLANK "blank-icon"

so I tweaked the patch to use the symbolic name rather than the string literal.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/messages-service.c'
2--- src/messages-service.c 2012-04-05 14:37:12 +0000
3+++ src/messages-service.c 2012-04-10 16:11:23 +0000
4@@ -29,7 +29,6 @@
5 #include <libindicator/indicator-service.h>
6 #include <gio/gio.h>
7 #include <glib/gi18n.h>
8-#include <gtk/gtk.h>
9
10 #include <libdbusmenu-glib/client.h>
11 #include <libdbusmenu-glib/server.h>
12@@ -665,9 +664,7 @@
13 g_debug("Application Shortcut added: %s", mi != NULL ? dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL) : "none");
14 DbusmenuMenuitem * shell = DBUSMENU_MENUITEM(data);
15 if (mi != NULL) {
16-#if GTK_CHECK_VERSION(3, 0, 0)
17- dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "");
18-#endif
19+ dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "blank-icon");
20 dbusmenu_menuitem_child_append(shell, mi);
21 }
22 resort_menu(shell);

Subscribers

People subscribed via source and target branches