Session Menu

Merge lp:~indicator-applet-developers/indicator-session/ubuntu into lp:~ubuntu-desktop/indicator-session/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merge reported by: Ken VanDine
Merged at revision: not available
Proposed branch: lp:~indicator-applet-developers/indicator-session/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-session/ubuntu
Diff against target: None lines
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-session/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+12010@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) :
review: Approve

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-11 01:36:16 +0000
3+++ configure.ac 2009-09-17 16:05:10 +0000
4@@ -4,7 +4,7 @@
5 AC_PREREQ(2.53)
6
7 AM_CONFIG_HEADER(config.h)
8-AM_INIT_AUTOMAKE(indicator-session, 0.1.3)
9+AM_INIT_AUTOMAKE(indicator-session, 0.1.4)
10
11 AM_MAINTAINER_MODE
12
13
14=== modified file 'data/icons/16x16/status/Makefile.am'
15--- data/icons/16x16/status/Makefile.am 2009-08-24 15:40:20 +0000
16+++ data/icons/16x16/status/Makefile.am 2009-09-17 16:05:10 +0000
17@@ -2,7 +2,7 @@
18 iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
19
20 icons_DATA = \
21- user-online.png \
22+ user-available.png \
23 user-offline.png \
24 user-away.png \
25 user-busy.png \
26
27=== renamed file 'data/icons/16x16/status/user-online.png' => 'data/icons/16x16/status/user-available.png'
28=== modified file 'data/icons/22x22/status/Makefile.am'
29--- data/icons/22x22/status/Makefile.am 2009-08-24 15:40:20 +0000
30+++ data/icons/22x22/status/Makefile.am 2009-09-17 16:05:10 +0000
31@@ -2,7 +2,7 @@
32 iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
33
34 icons_DATA = \
35- user-online.png \
36+ user-available.png \
37 user-offline.png \
38 user-away.png \
39 user-busy.png \
40
41=== renamed file 'data/icons/22x22/status/user-online.png' => 'data/icons/22x22/status/user-available.png'
42=== modified file 'data/icons/24x24/status/Makefile.am'
43--- data/icons/24x24/status/Makefile.am 2009-08-24 15:40:20 +0000
44+++ data/icons/24x24/status/Makefile.am 2009-09-17 16:05:10 +0000
45@@ -2,7 +2,7 @@
46 iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
47
48 icons_DATA = \
49- user-online.png \
50+ user-available.png \
51 user-offline.png \
52 user-away.png \
53 user-busy.png \
54
55=== renamed file 'data/icons/24x24/status/user-online.png' => 'data/icons/24x24/status/user-available.png'
56=== modified file 'data/icons/32x32/status/Makefile.am'
57--- data/icons/32x32/status/Makefile.am 2009-08-24 15:40:20 +0000
58+++ data/icons/32x32/status/Makefile.am 2009-09-17 16:05:10 +0000
59@@ -2,7 +2,7 @@
60 iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
61
62 icons_DATA = \
63- user-online.png \
64+ user-available.png \
65 user-offline.png \
66 user-away.png \
67 user-busy.png \
68
69=== renamed file 'data/icons/32x32/status/user-online.png' => 'data/icons/32x32/status/user-available.png'
70=== modified file 'data/icons/48x48/status/Makefile.am'
71--- data/icons/48x48/status/Makefile.am 2009-08-24 15:40:20 +0000
72+++ data/icons/48x48/status/Makefile.am 2009-09-17 16:05:10 +0000
73@@ -2,7 +2,7 @@
74 iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
75
76 icons_DATA = \
77- user-online.png \
78+ user-available.png \
79 user-offline.png \
80 user-away.png \
81 user-busy.png \
82
83=== renamed file 'data/icons/48x48/status/user-online.png' => 'data/icons/48x48/status/user-available.png'
84=== modified file 'data/icons/scalable/status/Makefile.am'
85--- data/icons/scalable/status/Makefile.am 2009-08-24 15:40:20 +0000
86+++ data/icons/scalable/status/Makefile.am 2009-09-17 16:05:10 +0000
87@@ -2,7 +2,7 @@
88 iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
89
90 icons_DATA = \
91- user-online.svg \
92+ user-available.svg \
93 user-offline.svg \
94 user-away.svg \
95 user-busy.svg \
96
97=== renamed file 'data/icons/scalable/status/user-online.svg' => 'data/icons/scalable/status/user-available.svg'
98=== modified file 'debian/changelog'
99--- debian/changelog 2009-09-11 09:44:02 +0000
100+++ debian/changelog 2009-09-17 16:08:11 +0000
101@@ -1,3 +1,15 @@
102+indicator-session (0.1.4-0ubuntu1~ppa1) karmic; urgency=low
103+
104+ * Upstream release 0.1.4
105+
106+ -- Ted Gould <ted@ubuntu.com> Thu, 17 Sep 2009 11:08:07 -0500
107+
108+indicator-session (0.1.3-0ubuntu2~ppa1) karmic; urgency=low
109+
110+ * Fixes to issues brought up by the design team.
111+
112+ -- Ted Gould <ted@ubuntu.com> Wed, 16 Sep 2009 16:14:34 -0500
113+
114 indicator-session (0.1.3-0ubuntu1) karmic; urgency=low
115
116 * Upstream release 0.1.3
117
118=== modified file 'src/gtk-dialog/gtk-logout-helper.c'
119--- src/gtk-dialog/gtk-logout-helper.c 2009-09-10 20:59:38 +0000
120+++ src/gtk-dialog/gtk-logout-helper.c 2009-09-15 20:45:56 +0000
121@@ -21,7 +21,7 @@
122 with this program. If not, see <http://www.gnu.org/licenses/>.
123 */
124
125-
126+#include <config.h>
127 #include <glib.h>
128 #include <gtk/gtk.h>
129 #include <dbus/dbus-glib.h>
130@@ -121,6 +121,12 @@
131 {
132 gtk_init(&argc, &argv);
133
134+ /* Setting up i18n and gettext. Apparently, we need
135+ all of these. */
136+ setlocale (LC_ALL, "");
137+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
138+ textdomain (GETTEXT_PACKAGE);
139+
140 GError * error = NULL;
141 GOptionContext * context = g_option_context_new(" - logout of the current session");
142 g_option_context_add_main_entries(context, options, "gtk-logout-helper");
143
144=== modified file 'src/session-service.c'
145--- src/session-service.c 2009-09-10 22:05:42 +0000
146+++ src/session-service.c 2009-09-16 16:34:26 +0000
147@@ -21,6 +21,7 @@
148 with this program. If not, see <http://www.gnu.org/licenses/>.
149 */
150
151+#include <config.h>
152
153 #include <glib/gi18n.h>
154
155@@ -258,9 +259,9 @@
156
157 shutdown_mi = dbusmenu_menuitem_new();
158 if (supress_confirmations()) {
159- dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown"));
160+ dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));
161 } else {
162- dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown..."));
163+ dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));
164 }
165 dbusmenu_menuitem_child_append(root, shutdown_mi);
166 g_signal_connect(G_OBJECT(shutdown_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown");
167@@ -282,6 +283,12 @@
168 {
169 g_type_init();
170
171+ /* Setting up i18n and gettext. Apparently, we need
172+ all of these. */
173+ setlocale (LC_ALL, "");
174+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
175+ textdomain (GETTEXT_PACKAGE);
176+
177 DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
178 DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
179 GError * error = NULL;
180
181=== modified file 'src/status-service.c'
182--- src/status-service.c 2009-09-10 18:40:49 +0000
183+++ src/status-service.c 2009-09-16 21:00:17 +0000
184@@ -20,6 +20,7 @@
185 with this program. If not, see <http://www.gnu.org/licenses/>.
186 */
187
188+#include <config.h>
189
190 #include <sys/types.h>
191 #include <pwd.h>
192@@ -60,7 +61,7 @@
193 };
194
195 static const gchar * status_icons[STATUS_PROVIDER_STATUS_LAST] = {
196- /* STATUS_PROVIDER_STATUS_ONLINE, */ "user-online",
197+ /* STATUS_PROVIDER_STATUS_ONLINE, */ "user-available",
198 /* STATUS_PROVIDER_STATUS_AWAY, */ "user-away",
199 /* STATUS_PROVIDER_STATUS_DND, */ "user-busy",
200 /* STATUS_PROVIDER_STATUS_INVISIBLE, */ "user-invisible",
201@@ -95,8 +96,6 @@
202 if (global_status != oldglobal) {
203 g_debug("Global status changed to: %s", _(status_strings[global_status]));
204
205- /* Set the status name on the menu item */
206- dbusmenu_menuitem_property_set(status_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _(status_strings[global_status]));
207 /* Configure the icon on the panel */
208 status_service_dbus_set_status(dbus_interface, status_icons[global_status]);
209
210@@ -124,33 +123,6 @@
211 return;
212 }
213
214-/* A fun little function to actually lock the screen. If,
215- that's what you want, let's do it! */
216-static void
217-lock_screen (DbusmenuMenuitem * mi, gpointer data)
218-{
219- g_debug("Lock Screen");
220-
221- DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
222- g_return_if_fail(session_bus != NULL);
223-
224- DBusGProxy * proxy = dbus_g_proxy_new_for_name_owner(session_bus,
225- "org.gnome.ScreenSaver",
226- "/",
227- "org.gnome.ScreenSaver",
228- NULL);
229- g_return_if_fail(proxy != NULL);
230-
231- dbus_g_proxy_call_no_reply(proxy,
232- "Lock",
233- G_TYPE_INVALID,
234- G_TYPE_INVALID);
235-
236- g_object_unref(proxy);
237-
238- return;
239-}
240-
241 static void
242 status_menu_click (DbusmenuMenuitem * mi, gpointer data)
243 {
244@@ -218,7 +190,7 @@
245 build_user_item(root);
246
247 status_menuitem = dbusmenu_menuitem_new();
248- dbusmenu_menuitem_property_set(status_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _(status_strings[global_status]));
249+ dbusmenu_menuitem_property_set(status_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Set Status"));
250 dbusmenu_menuitem_child_append(root, status_menuitem);
251
252 StatusProviderStatus i;
253@@ -244,11 +216,6 @@
254 g_debug("Built %s", status_strings[i]);
255 }
256
257- DbusmenuMenuitem * mi = dbusmenu_menuitem_new();
258- dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));
259- g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(lock_screen), GINT_TO_POINTER(i));
260- dbusmenu_menuitem_child_append(root, mi);
261-
262 return FALSE;
263 }
264
265@@ -257,6 +224,12 @@
266 {
267 g_type_init();
268
269+ /* Setting up i18n and gettext. Apparently, we need
270+ all of these. */
271+ setlocale (LC_ALL, "");
272+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
273+ textdomain (GETTEXT_PACKAGE);
274+
275 DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
276 DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
277 GError * error = NULL;
278
279=== modified file 'src/users-service.c'
280--- src/users-service.c 2009-09-03 18:46:44 +0000
281+++ src/users-service.c 2009-09-16 16:34:26 +0000
282@@ -20,6 +20,8 @@
283 with this program. If not, see <http://www.gnu.org/licenses/>.
284 */
285
286+#include <config.h>
287+
288 #include <unistd.h>
289
290 #include <glib/gi18n.h>
291@@ -107,10 +109,42 @@
292 return;
293 }
294
295+/* A fun little function to actually lock the screen. If,
296+ that's what you want, let's do it! */
297+static void
298+lock_screen (DbusmenuMenuitem * mi, gpointer data)
299+{
300+ g_debug("Lock Screen");
301+
302+ DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
303+ g_return_if_fail(session_bus != NULL);
304+
305+ DBusGProxy * proxy = dbus_g_proxy_new_for_name_owner(session_bus,
306+ "org.gnome.ScreenSaver",
307+ "/",
308+ "org.gnome.ScreenSaver",
309+ NULL);
310+ g_return_if_fail(proxy != NULL);
311+
312+ dbus_g_proxy_call_no_reply(proxy,
313+ "Lock",
314+ G_TYPE_INVALID,
315+ G_TYPE_INVALID);
316+
317+ g_object_unref(proxy);
318+
319+ return;
320+}
321+
322 static void
323 create_items (DbusmenuMenuitem * root) {
324 DbusmenuMenuitem * mi = NULL;
325
326+ mi = dbusmenu_menuitem_new();
327+ dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Lock Screen"));
328+ g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(lock_screen), NULL);
329+ dbusmenu_menuitem_child_append(root, mi);
330+
331 if (check_guest_session()) {
332 mi = dbusmenu_menuitem_new();
333 dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Guest Session"));
334@@ -120,7 +154,7 @@
335
336 if (check_new_session()) {
337 mi = dbusmenu_menuitem_new();
338- dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("New Session..."));
339+ dbusmenu_menuitem_property_set(mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch User..."));
340 dbusmenu_menuitem_child_append(root, mi);
341 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(activate_new_session), NULL);
342 }
343@@ -133,6 +167,12 @@
344 {
345 g_type_init();
346
347+ /* Setting up i18n and gettext. Apparently, we need
348+ all of these. */
349+ setlocale (LC_ALL, "");
350+ bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
351+ textdomain (GETTEXT_PACKAGE);
352+
353 session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
354 bus_proxy = dbus_g_proxy_new_for_name(session_bus, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
355 GError * error = NULL;

Subscribers

People subscribed via source and target branches

to all changes: