Indicator Applet

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

  1. nice-name
  2. Merge into applet
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~ted/indicator-applet/nice-name
Merge into: lp://staging/indicator-applet/0.4
Diff against target: 116 lines
3 files modified
configure.ac (+0/-1)
src-session/applet-main.c (+3/-17)
src/applet-main.c (+2/-16)
To merge this branch: bzr merge lp://staging/~ted/indicator-applet/nice-name
Reviewer Review Type Date Requested Status
Robert Collins (community) Approve
Review via email: mp+13984@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

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

lp://staging/~ted/indicator-applet/nice-name updated
338. By Ted Gould

Attaching another bug

339. By Ted Gould

Another bug

Revision history for this message
Robert Collins (lifeless) wrote :

 review +1

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

-Rob

review: Approve
Revision history for this message
Ted Gould (ted) wrote :

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... :(

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2009-09-01 13:36:39 +0000
3+++ configure.ac 2009-10-26 21:40:24 +0000
4@@ -32,7 +32,6 @@
5
6 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
7 libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
8- libgnomeui-2.0
9 indicator >= $INDICATOR_REQUIRED_VERSION)
10 AC_SUBST(APPLET_CFLAGS)
11 AC_SUBST(APPLET_LIBS)
12
13=== modified file 'src-session/applet-main.c'
14--- src-session/applet-main.c 2009-10-14 18:16:48 +0000
15+++ src-session/applet-main.c 2009-10-26 21:40:24 +0000
16@@ -22,7 +22,6 @@
17
18 #include <config.h>
19 #include <panel-applet.h>
20-#include <libgnomeui/gnome-ui-init.h>
21
22 #include "libindicator/indicator.h"
23
24@@ -35,13 +34,6 @@
25 GdkPixmap *pixmap,
26 GtkWidget *menubar);
27
28-/* ****************** *
29- * Global Variables *
30- * ****************** */
31-
32-static GnomeProgram *program = NULL;
33-
34-
35 /*************
36 * main
37 * ***********/
38@@ -173,9 +165,9 @@
39 license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
40
41 gtk_show_about_dialog(NULL,
42- "version", "0.1",
43+ "version", VERSION,
44 "copyright", "Copyright \xc2\xa9 2009 Canonical, Ltd.",
45- "comments", _("An applet to hold all of the system indicators."),
46+ "comments", _("A place to adjust your status, change users or exit your session."),
47 "authors", authors,
48 "license", license_i18n,
49 "wrap-license", TRUE,
50@@ -222,14 +214,8 @@
51
52 if (!first_time)
53 {
54- gint argc = 1;
55- gchar *argv[2] = { "indicator-applet-session", NULL};
56-
57 first_time = TRUE;
58- program = gnome_program_init ("indicator-applet-session", "0.1",
59- LIBGNOMEUI_MODULE, argc, argv,
60- GNOME_PROGRAM_STANDARD_PROPERTIES,
61- NULL);
62+ g_set_application_name(_("Indicator Applet Session"));
63 }
64
65 /* Set panel options */
66
67=== modified file 'src/applet-main.c'
68--- src/applet-main.c 2009-08-24 18:22:32 +0000
69+++ src/applet-main.c 2009-10-26 21:40:24 +0000
70@@ -22,7 +22,6 @@
71
72 #include <config.h>
73 #include <panel-applet.h>
74-#include <libgnomeui/gnome-ui-init.h>
75
76 #include "libindicator/indicator.h"
77
78@@ -35,13 +34,6 @@
79 GdkPixmap *pixmap,
80 GtkWidget *menubar);
81
82-/* ****************** *
83- * Global Variables *
84- * ****************** */
85-
86-static GnomeProgram *program = NULL;
87-
88-
89 /*************
90 * main
91 * ***********/
92@@ -173,7 +165,7 @@
93 license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL);
94
95 gtk_show_about_dialog(NULL,
96- "version", "0.1",
97+ "version", VERSION,
98 "copyright", "Copyright \xc2\xa9 2009 Canonical, Ltd.",
99 "comments", _("An applet to hold all of the system indicators."),
100 "authors", authors,
101@@ -216,14 +208,8 @@
102
103 if (!first_time)
104 {
105- gint argc = 1;
106- gchar *argv[2] = { "indicator-applet", NULL};
107-
108 first_time = TRUE;
109- program = gnome_program_init ("indicator-applet", "0.1",
110- LIBGNOMEUI_MODULE, argc, argv,
111- GNOME_PROGRAM_STANDARD_PROPERTIES,
112- NULL);
113+ g_set_application_name(_("Indicator Applet"));
114 }
115
116 /* Set panel options */

Subscribers

People subscribed via source and target branches

to status/vote changes: