aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-03-25 10:20:17 -0500
committerTed Gould <ted@gould.cx>2010-03-25 10:20:17 -0500
commit0c4c949c296aa4e740d383f2dacdd48ec0f1f180 (patch)
treecca01979e5f0480c06ad5db46e92500b29928c7a
parent18b9b156aa4a099d8bc5c97d178f178bea198165 (diff)
parentdb45cc036947bc462e8875b163148ee06744e8cb (diff)
downloadayatana-indicator-messages-0c4c949c296aa4e740d383f2dacdd48ec0f1f180.tar.gz
ayatana-indicator-messages-0c4c949c296aa4e740d383f2dacdd48ec0f1f180.tar.bz2
ayatana-indicator-messages-0c4c949c296aa4e740d383f2dacdd48ec0f1f180.zip
Adding in support for shifting over command items
-rw-r--r--configure.ac2
-rw-r--r--src/app-menu-item.c2
-rw-r--r--src/launcher-menu-item.c1
3 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 98fc5a5..a8829a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ GIO_UNIX_REQUIRED_VERSION=2.18
PANEL_REQUIRED_VERSION=2.0.0
INDICATE_REQUIRED_VERSION=0.3.0
INDICATOR_REQUIRED_VERSION=0.3.5
-DBUSMENUGTK_REQUIRED_VERSION=0.2.5
+DBUSMENUGTK_REQUIRED_VERSION=0.2.8
PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
diff --git a/src/app-menu-item.c b/src/app-menu-item.c
index a47c073..cbd2242 100644
--- a/src/app-menu-item.c
+++ b/src/app-menu-item.c
@@ -340,6 +340,7 @@ child_added_cb (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint positio
AppMenuItem * self = APP_MENU_ITEM(data);
AppMenuItemPrivate * priv = APP_MENU_ITEM_GET_PRIVATE(self);
DbusmenuMenuitemProxy * mip = dbusmenu_menuitem_proxy_new(child);
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(mip), DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
priv->shortcuts = g_list_insert(priv->shortcuts, mip, position);
@@ -441,6 +442,7 @@ root_changed (DbusmenuClient * client, DbusmenuMenuitem * newroot, gpointer data
g_debug("\tProcessing %d children", g_list_length(children));
while (children != NULL) {
DbusmenuMenuitemProxy * mip = dbusmenu_menuitem_proxy_new(DBUSMENU_MENUITEM(children->data));
+ dbusmenu_menuitem_property_set(DBUSMENU_MENUITEM(mip), DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
priv->shortcuts = g_list_append(priv->shortcuts, mip);
children = g_list_next(children);
}
diff --git a/src/launcher-menu-item.c b/src/launcher-menu-item.c
index 279d167..18f54d8 100644
--- a/src/launcher-menu-item.c
+++ b/src/launcher-menu-item.c
@@ -190,6 +190,7 @@ launcher_menu_item_new (const gchar * desktop_file)
DbusmenuMenuitem * mi = dbusmenu_menuitem_new();
g_object_set_data(G_OBJECT(mi), NICK_DATA, (gpointer)nicks[i]);
+ dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, DBUSMENU_MENUITEM_ICON_NAME_BLANK);
dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, indicator_desktop_shortcuts_nick_get_name(priv->ids, nicks[i]));
g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(nick_activate_cb), self);