ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/indicator-messages/command-item-blank-icon/+merge/22046
  proposed by: Ted Gould (ted)
  review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 179 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-03-25 10:20:17 -0500
message:
  Adding in support for shifting over command items
modified:
  configure.ac
  src/app-menu-item.c
  src/launcher-menu-item.c


--
lp:indicator-messages
https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk

Your team ayatana-commits is subscribed to branch lp:indicator-messages.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk/+edit-subscription.

=== modified file 'configure.ac'
--- configure.ac	2010-03-18 18:28:16 +0000
+++ configure.ac	2010-03-25 15:16:46 +0000
@@ -31,7 +31,7 @@
 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

=== modified file 'src/app-menu-item.c'
--- src/app-menu-item.c	2010-03-23 21:08:48 +0000
+++ src/app-menu-item.c	2010-03-24 16:32:06 +0000
@@ -340,6 +340,7 @@
 	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 @@
 		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);
 		}

=== modified file 'src/launcher-menu-item.c'
--- src/launcher-menu-item.c	2010-03-17 18:34:27 +0000
+++ src/launcher-menu-item.c	2010-03-24 16:33:32 +0000
@@ -190,6 +190,7 @@
 		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);