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

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

I agree with you that this isn't a perfect patch, but doing things right would take more time than we have right now. It's better to put in this quick fix than to ship with the "broken" icons.

Considering the tradeoffs, this is the right fix for 12.04.

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-04 14:48:53 +0000
3+++ src/messages-service.c 2012-04-04 17:09:26 +0000
4@@ -29,6 +29,7 @@
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@@ -664,7 +665,9 @@
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_child_append(shell, mi);
20 }
21 resort_menu(shell);

Subscribers

People subscribed via source and target branches