Merge lp:~ted/indicator-applet/nice-name into lp:indicator-applet/0.4

[Ted Gould]

[Ted Gould (ted)]

Fixing some cosmetic things in the about dialog and removing the libgnomeui dependency.

[lp:~ted/indicator-applet/nice-name]

338. By Ted Gould on 2009-10-26

Attaching another bug

339. By Ted Gould on 2009-10-26

Another bug

[Robert Collins (lifeless)]

 review +1

Is there a NEWS file or similar that the dependency change should go in?

-Rob

review: Approve

[Ted Gould (ted)]

On Mon, 2009-10-26 at 21:57 +0000, Robert Collins wrote:
> Is there a NEWS file or similar that the dependency change should go in?

No, not really. We've not really kept those around. Considering today
we only have one downstream... :(

=== modified file 'configure.ac'
--- configure.ac	2009-09-01 13:36:39 +0000
+++ configure.ac	2009-10-26 21:40:24 +0000
@@ -32,7 +32,6 @@
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
                           libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
-						  libgnomeui-2.0
 						  indicator >= $INDICATOR_REQUIRED_VERSION)
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)

=== modified file 'src-session/applet-main.c'
--- src-session/applet-main.c	2009-10-14 18:16:48 +0000
+++ src-session/applet-main.c	2009-10-26 21:40:24 +0000
@@ -22,7 +22,6 @@
 
 #include <config.h>
 #include <panel-applet.h>
-#include <libgnomeui/gnome-ui-init.h>
 
 #include "libindicator/indicator.h"
 
@@ -35,13 +34,6 @@
                         				         GdkPixmap                 *pixmap,
                                          GtkWidget                 *menubar);
 
-/* ****************** *
- *  Global Variables  *
- * ****************** */
-
-static GnomeProgram *program = NULL;
-
-
 /*************
  * main
  * ***********/
@@ -173,9 +165,9 @@
 	license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
 
 	gtk_show_about_dialog(NULL,
-		"version", "0.1",
+		"version", VERSION,
 		"copyright", "Copyright \xc2\xa9 2009 Canonical, Ltd.",
-		"comments", _("An applet to hold all of the system indicators."),
+		"comments", _("A place to adjust your status, change users or exit your session."),
 		"authors", authors,
 		"license", license_i18n,
 		"wrap-license", TRUE,
@@ -222,14 +214,8 @@
 
 	if (!first_time)
 	{
-        gint argc = 1;
-        gchar *argv[2] = { "indicator-applet-session", NULL};
-	    
 		first_time = TRUE;
-		program = gnome_program_init ("indicator-applet-session", "0.1",
-				    LIBGNOMEUI_MODULE, argc, argv,
-				    GNOME_PROGRAM_STANDARD_PROPERTIES,
-				    NULL);
+		g_set_application_name(_("Indicator Applet Session"));
 	}
 
 	/* Set panel options */

=== modified file 'src/applet-main.c'
--- src/applet-main.c	2009-08-24 18:22:32 +0000
+++ src/applet-main.c	2009-10-26 21:40:24 +0000
@@ -22,7 +22,6 @@
 
 #include <config.h>
 #include <panel-applet.h>
-#include <libgnomeui/gnome-ui-init.h>
 
 #include "libindicator/indicator.h"
 
@@ -35,13 +34,6 @@
                         				         GdkPixmap                 *pixmap,
                                          GtkWidget                 *menubar);
 
-/* ****************** *
- *  Global Variables  *
- * ****************** */
-
-static GnomeProgram *program = NULL;
-
-
 /*************
  * main
  * ***********/
@@ -173,7 +165,7 @@
 	license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
 
 	gtk_show_about_dialog(NULL,
-		"version", "0.1",
+		"version", VERSION,
 		"copyright", "Copyright \xc2\xa9 2009 Canonical, Ltd.",
 		"comments", _("An applet to hold all of the system indicators."),
 		"authors", authors,
@@ -216,14 +208,8 @@
 
 	if (!first_time)
 	{
-        gint argc = 1;
-        gchar *argv[2] = { "indicator-applet", NULL};
-	    
 		first_time = TRUE;
-		program = gnome_program_init ("indicator-applet", "0.1",
-				    LIBGNOMEUI_MODULE, argc, argv,
-				    GNOME_PROGRAM_STANDARD_PROPERTIES,
-				    NULL);
+		g_set_application_name(_("Indicator Applet"));
 	}
 
 	/* Set panel options */