ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #00551
[Branch ~indicator-applet-developers/indicator-applet/applet] Rev 332: Cleaning up the about dialogs to have better names (same as service files, no translations), the ...
Merge authors:
Ted Gould (ted)
Related merge proposals:
https://code.launchpad.net/~ted/indicator-applet/nice-name/+merge/13984
proposed by: Ted Gould (ted)
review: Approve - Robert Collins (lifeless)
------------------------------------------------------------
revno: 332 [merge]
committer: Ted Gould <ted@xxxxxxxxxxxxx>
branch nick: applet
timestamp: Mon 2009-10-26 20:39:29 -0500
message:
Cleaning up the about dialogs to have better names (same as service files, no translations), the right version numbers, and use the GTK API instead of libgnomeui.
modified:
configure.ac
src-session/applet-main.c
src/applet-main.c
--
lp:indicator-applet
https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet
Your team ayatana-commits is subscribed to branch lp:indicator-applet.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-applet/applet/+edit-subscription.
=== modified file 'configure.ac'
--- configure.ac 2009-09-01 13:36:39 +0000
+++ configure.ac 2009-10-26 19:39:01 +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 19:52:45 +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 19:52:45 +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 */
