Messaging Menu

Merge lp:~ted/indicator-messages/command-item-blank-icon into lp:indicator-messages/0.5

  1. command-item-blank-icon
  2. Merge into trunk
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ted/indicator-messages/command-item-blank-icon
Merge into: lp:indicator-messages/0.5
Diff against target: 43 lines (+4/-1)
3 files modified
configure.ac (+1/-1)
src/app-menu-item.c (+2/-0)
src/launcher-menu-item.c (+1/-0)
To merge this branch: bzr merge lp:~ted/indicator-messages/command-item-blank-icon
Reviewer Review Type Date Requested Status
Cody Russell (community) Approve
Review via email: mp+22046@code.launchpad.net

Description of the change

Adds blank icons to command items.

To post a comment you must log in.
Revision history for this message
Cody Russell (bratsche) :
review: Approve
lp:~ted/indicator-messages/command-item-blank-icon updated
180. By Ted Gould

Increasing the dbusmenu required version to 0.2.8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2010-03-18 18:28:16 +0000
3+++ configure.ac 2010-03-25 15:24:30 +0000
4@@ -31,7 +31,7 @@
5 PANEL_REQUIRED_VERSION=2.0.0
6 INDICATE_REQUIRED_VERSION=0.3.0
7 INDICATOR_REQUIRED_VERSION=0.3.5
8-DBUSMENUGTK_REQUIRED_VERSION=0.2.5
9+DBUSMENUGTK_REQUIRED_VERSION=0.2.8
10
11 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
12 gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
13
14=== modified file 'src/app-menu-item.c'
15--- src/app-menu-item.c 2010-03-23 21:08:48 +0000
16+++ src/app-menu-item.c 2010-03-25 15:24:30 +0000
17@@ -340,6 +340,7 @@
18 AppMenuItem * self = APP_MENU_ITEM(data);
19 AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(self);
20 DbusmenuMenuitemProxy * mip = dbusmenu_menuitem_proxy_new(child);
21+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(mip), DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
22
23 priv->shortcuts = g_list_insert(priv->shortcuts, mip, position);
24
25@@ -441,6 +442,7 @@
26 g_debug("\tProcessing %d children", g_list_length(children));
27 while (children != NULL) {
28 DbusmenuMenuitemProxy * mip = dbusmenu_menuitem_proxy_new(DBUSMENU_MENUITEM(children->data));
29+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(mip), DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
30 priv->shortcuts = g_list_append(priv->shortcuts, mip);
31 children = g_list_next(children);
32 }
33
34=== modified file 'src/launcher-menu-item.c'
35--- src/launcher-menu-item.c 2010-03-17 18:34:27 +0000
36+++ src/launcher-menu-item.c 2010-03-25 15:24:30 +0000
37@@ -190,6 +190,7 @@
38 DbusmenuMenuitem * mi = dbusmenu_menuitem_new();
39 g_object_set_data(G_OBJECT(mi), NICK_DATA, (gpointer)nicks[i]);
40
41+ dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
42 dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, indicator_desktop_shortcuts_nick_get_name(priv->ids, nicks[i]));
43 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(nick_activate_cb), self);
44

Subscribers

People subscribed via source and target branches

to all changes: