ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/indicator-messages/path-change/+merge/12297
  proposed by: Ted Gould (ted)
  review: Approve - Neil J. Patel (njpatel)
------------------------------------------------------------
revno: 141 [merge]
committer: Ted Gould <ted@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2009-09-23 13:28:44 -0500
message:
  Merging in branch to add a path for indicators in /usr/share and make it so that invalid desktop files don't create visible menu items.
modified:
  src/dirs.h
  src/launcher-menu-item.c
  src/messages-service.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 'src/dirs.h'
--- src/dirs.h	2009-08-19 18:50:16 +0000
+++ src/dirs.h	2009-09-23 16:06:01 +0000
@@ -1,3 +1,4 @@
-#define  SYSTEM_APPS_DIR        "/etc/indicators/messages/applications"
+#define  SYSTEM_APPS_DIR        "/usr/share/indicators/messages/applications"
+#define  SYSTEM_APPS_DIR_OLD    "/etc/indicators/messages/applications"
 #define  USER_APPS_DIR          "indicators/messages/applications"
 #define  USER_BLACKLIST_DIR     "indicators/messages/applications-blacklist"

=== modified file 'src/launcher-menu-item.c'
--- src/launcher-menu-item.c	2009-08-27 01:53:29 +0000
+++ src/launcher-menu-item.c	2009-09-23 16:48:09 +0000
@@ -137,6 +137,10 @@
 
 	g_signal_connect(G_OBJECT(self), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_cb), NULL);
 
+	if (priv->appinfo == NULL) {
+		launcher_menu_item_set_eclipsed(self, TRUE);
+	}
+
 	return self;
 }
 

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2009-09-15 21:17:44 +0000
+++ src/messages-service.c	2009-09-23 16:48:09 +0000
@@ -1148,7 +1148,10 @@
 		dbusmenu_menuitem_child_append(root_menuitem, DBUSMENU_MENUITEM(ll->separator));
 		resort_menu(root_menuitem);
 
-		if (blacklist_check(launcher_menu_item_get_desktop(ll->menuitem))) {
+		/* If we're in the black list or we've gotten eclipsed
+		   by something else, hide the item and the separator. */
+		if (blacklist_check(launcher_menu_item_get_desktop(ll->menuitem)) ||
+				launcher_menu_item_get_eclipsed(ll->menuitem)) {
 			launcher_menu_item_set_eclipsed(ll->menuitem, TRUE);
 			dbusmenu_menuitem_property_set(ll->separator, DBUSMENU_MENUITEM_PROP_VISIBLE, "false");
 		}
@@ -1244,6 +1247,7 @@
 
 	g_idle_add(blacklist_init, NULL);
 	g_idle_add(build_launchers, SYSTEM_APPS_DIR);
+	g_idle_add(build_launchers, SYSTEM_APPS_DIR_OLD);
 	gchar * userdir = g_build_filename(g_get_user_config_dir(), USER_APPS_DIR, NULL);
 	g_idle_add(build_launchers, userdir);