James Westby has proposed merging 
lp:~james-w/indicator-applet/messages-cleanups into 
lp:~indicator-applet-developers/indicator-applet/messages.

Requested reviews:
    Indicator Applet Developers (indicator-applet-developers)

Hi,

This is just a couple of cleanups for indicator-messages.

The first corrects a copy paste error in autogen.sh.

The second prevents trying to use a NULL appinfo.

Thanks,

James

-- 
https://code.launchpad.net/~james-w/indicator-applet/messages-cleanups/+merge/5228
Your team Indicator Applet Developers is subscribed to branch 
lp:~indicator-applet-developers/indicator-applet/messages.
=== modified file 'autogen.sh'
--- autogen.sh	2008-12-05 00:34:45 +0000
+++ autogen.sh	2009-04-05 11:03:12 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PKG_NAME="indicator-applet"
+PKG_NAME="indicator-messages"
 
 which gnome-autogen.sh || {
 	echo "You need gnome-common from GNOME SVN"

=== modified file 'src/app-menu-item.c'
--- src/app-menu-item.c	2009-03-18 19:22:08 +0000
+++ src/app-menu-item.c	2009-04-05 11:03:31 +0000
@@ -192,11 +192,11 @@
 	if (priv->count_on_label && !priv->unreadcount < 1) {
 		/* TRANSLATORS: This is the name of the program and the number of indicators.  So it
 		                would read something like "Mail Client (5)" */
-		gchar * label = g_strdup_printf(_("%s (%d)"), g_app_info_get_name(priv->appinfo), priv->unreadcount);
+		gchar * label = g_strdup_printf(_("%s (%d)"), app_menu_item_get_name(self), priv->unreadcount);
 		gtk_label_set_text(GTK_LABEL(priv->name), label);
 		g_free(label);
 	} else {
-		gtk_label_set_text(GTK_LABEL(priv->name), g_app_info_get_name(priv->appinfo));
+		gtk_label_set_text(GTK_LABEL(priv->name), app_menu_item_get_name(self));
 	}
 
 	return;
@@ -220,7 +220,7 @@
 	g_return_if_fail(priv->appinfo != NULL);
 
 	update_label(self);
-	g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, g_app_info_get_name(priv->appinfo), TRUE);
+	g_signal_emit(G_OBJECT(self), signals[NAME_CHANGED], 0, app_menu_item_get_name(self), TRUE);
 
 	return;
 }

_______________________________________________
Mailing list: https://launchpad.net/~dx-team
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~dx-team
More help   : https://help.launchpad.net/ListHelp

Reply via email to