Merged:

  Ted Gould 2009-09-24 Making a 0.2.4
    Ted Gould 2009-09-24 [merge] Merging in the minimum width branch to fix descriptions getting truncated when they're a reasonable length.
    Ted Gould 2009-09-23 Adding in a resort after editing the blacklist
    Ted Gould 2009-09-23 Too big
    Ted Gould 2009-09-23 Putting in teh size request a minimum width
    Ted Gould 2009-09-24 [merge] Merging in the icon scaling branch
    Ted Gould 2009-09-23 Forgot to scale on icon changing.
    Ted Gould 2009-09-23 Putting in a little code to scale icons.
    Ted Gould 2009-09-23 Version to kick LP
    Ted Gould 2009-09-23 [merge] 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.
    Ted Gould 2009-09-23 If we're not given a valid desktop file we should eclipse ourselves, and if we're eclipsed, we should hide the separator as well.
    Ted Gould 2009-09-23 Looking at the old system apps directory as well.
    Ted Gould 2009-09-23 Changing directory names
    Ted Gould 2009-09-17 Making a purdy 0.2.3
    Ted Gould 2009-09-16 [merge] Merging in i18n branch to add i18n.
    Ted Gould 2009-09-15 Forgot intltool
    Ted Gould 2009-09-15 Adding in header for gettext
    Ted Gould 2009-09-15 Adding in some encoding to make things fun.
    Ted Gould 2009-09-15 Oops, teach me to cut and paste :) 
    Ted Gould 2009-09-15 Making it so the po directory is connected in.
    Ted Gould 2009-09-15 Adding configure stuff in to set up gettext
    Ted Gould 2009-09-15 Adding a po directory with a list of files.
    Ted Gould 2009-09-15 Setting up the gettext stuff.

1 files changed, 13 insertions, 2 deletions

diff --git a/src/messages-service.c b/src/messages-service.c
index 0ba0deb..65c9af7 100644
--- a/src/messages-service.c
+++ b/src/messages-service.c
@@ -22,6 +22,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <string.h>
 #include <locale.h>
+#include <libintl.h>
+#include <config.h>
 #include <pango/pango-utils.h>
 #include <dbus/dbus-glib-bindings.h>
 #include <libindicate/listener.h>
@@ -348,6 +350,7 @@ blacklist_remove (gpointer data)
 	}
 
 	check_hidden();
+	resort_menu(root_menuitem);
 
 	return FALSE;
 }
@@ -1146,7 +1149,10 @@ build_launcher (gpointer data)
 		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");
 		}
@@ -1220,7 +1226,11 @@ main (int argc, char ** argv)
 		return 1;
 	}
 
-	setlocale(LC_ALL,"");
+	/* Setting up i18n and gettext.  Apparently, we need
+	   all of these. */
+	setlocale (LC_ALL, "");
+	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+	textdomain (GETTEXT_PACKAGE);
 
 	dbus_interface = message_service_dbus_new();
 
@@ -1238,6 +1248,7 @@ main (int argc, char ** argv)
 
 	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);