Session Menu

Merge lp:~c-korn/indicator-session/gconf-key into lp:indicator-session/0.1

  1. gconf-key
  2. Merge into trunk
Proposed by Ted Gould
Status: Rejected
Rejected by: Ted Gould
Proposed branch: lp:~c-korn/indicator-session/gconf-key
Merge into: lp:indicator-session/0.1
Diff against target: None lines
To merge this branch: bzr merge lp:~c-korn/indicator-session/gconf-key
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+11058@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

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-08-27 18:33:41 +0000
3+++ configure.ac 2009-09-02 14:17:44 +0000
4@@ -8,6 +8,8 @@
5
6 AM_MAINTAINER_MODE
7
8+IT_PROG_INTLTOOL([0.35.0])
9+
10 AC_ISC_POSIX
11 AC_PROG_CC
12 AM_PROG_CC_C_O
13@@ -56,6 +58,16 @@
14 AC_SUBST(GTKLOGOUTHELPER_CFLAGS)
15 AC_SUBST(GTKLOGOUTHELPER_LIBS)
16
17+AC_PATH_PROG(GCONFTOOL, gconftool-2)
18+dnl Specify the gconf configuration source,
19+dnl default to xml::$(sysconfdir)/gconf/gconf.xml.defaults
20+
21+AM_GCONF_SOURCE_2
22+
23+PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.0)
24+AC_SUBST(GCONF_CFLAGS)
25+AC_SUBST(GCONF_LIBS)
26+
27 ###########################
28 # Check to see if we're local
29 ###########################
30@@ -115,6 +127,7 @@
31 data/icons/scalable/Makefile
32 data/icons/scalable/status/Makefile
33 data/icons/scalable/actions/Makefile
34+po/Makefile.in
35 ])
36
37 ###########################
38
39=== modified file 'data/Makefile.am'
40--- data/Makefile.am 2009-08-07 19:10:15 +0000
41+++ data/Makefile.am 2009-09-02 14:17:44 +0000
42@@ -9,9 +9,37 @@
43 %.service: %.service.in
44 sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
45
46+##############################
47+# GConf Schema
48+##############################
49+
50+schemadir = \
51+ $(GCONF_SCHEMA_FILE_DIR)
52+
53+schema_in_files = \
54+ indicator-session.schemas.in
55+
56+schema_DATA = \
57+ $(schema_in_files:.schemas.in=.schemas)
58+
59+@INTLTOOL_SCHEMAS_RULE@
60+
61+
62 #$(dbus_services_DATA): $(service_in_files) Makefile
63 # sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
64
65-EXTRA_DIST = $(service_in_files)
66-
67-CLEANFILES = $(dbus_services_DATA)
68+EXTRA_DIST = \
69+ $(service_in_files) \
70+ $(schema_in_files)
71+
72+CLEANFILES = \
73+ $(dbus_services_DATA) \
74+ $(schema_DATA)
75+
76+if GCONF_SCHEMAS_INSTALL
77+install-data-local:
78+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
79+ gconftool-2 --makefile-install-rule $(schema_DATA)
80+else
81+install-data-local:
82+endif
83
84=== modified file 'src/Makefile.am'
85--- src/Makefile.am 2009-08-25 21:21:44 +0000
86+++ src/Makefile.am 2009-09-02 14:17:44 +0000
87@@ -84,9 +84,9 @@
88 # Session Stuff
89 #################
90
91-indicator_session_service_SOURCES = session-service.c
92-indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
93-indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS)
94+indicator_session_service_SOURCES = session-service.c gtk-dialog/gconf-helper.c
95+indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
96+indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS)
97
98 ###############
99 # Other Stuff
100
101=== modified file 'src/gtk-dialog/Makefile.am'
102--- src/gtk-dialog/Makefile.am 2009-07-21 21:20:31 +0000
103+++ src/gtk-dialog/Makefile.am 2009-09-02 14:17:44 +0000
104@@ -5,9 +5,11 @@
105 gtk-logout-helper.c \
106 ck-pk-helper.c \
107 ck-pk-helper.h \
108+ gconf-helper.c \
109+ gconf-helper.h \
110 logout-dialog.c \
111 logout-dialog.h
112
113-gtk_logout_helper_CFLAGS = $(GTKLOGOUTHELPER_CFLAGS) -Wall -Werror
114-gtk_logout_helper_LDADD = $(GTKLOGOUTHELPER_LIBS)
115+gtk_logout_helper_CFLAGS = $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror
116+gtk_logout_helper_LDADD = $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS)
117
118
119=== modified file 'src/gtk-dialog/gtk-logout-helper.c'
120--- src/gtk-dialog/gtk-logout-helper.c 2009-08-07 22:52:48 +0000
121+++ src/gtk-dialog/gtk-logout-helper.c 2009-09-02 14:17:44 +0000
122@@ -6,6 +6,7 @@
123
124 Authors:
125 Ted Gould <ted@canonical.com>
126+ Christoph Korn <c_korn@gmx.de>
127
128 This program is free software: you can redistribute it and/or modify it
129 under the terms of the GNU General Public License version 3, as published
130@@ -26,6 +27,7 @@
131 #include <dbus/dbus-glib.h>
132 #include "logout-dialog.h"
133 #include "ck-pk-helper.h"
134+#include "gconf-helper.h"
135
136 static void
137 session_action (LogoutDialogAction action)
138@@ -132,7 +134,7 @@
139 }
140
141 GtkWidget * dialog = NULL;
142- if (!pk_require_auth(type)) {
143+ if (!pk_require_auth(type) && !supress_confirmations()) {
144 dialog = logout_dialog_new(type);
145 }
146
147
148=== modified file 'src/session-service.c'
149--- src/session-service.c 2009-08-07 22:52:48 +0000
150+++ src/session-service.c 2009-09-02 14:17:44 +0000
151@@ -31,6 +31,8 @@
152
153 #include "dbus-shared-names.h"
154
155+#include "gtk-dialog/gconf-helper.h"
156+
157 #define DKP_ADDRESS "org.freedesktop.DeviceKit.Power"
158 #define DKP_OBJECT "/org/freedesktop/DeviceKit/Power"
159 #define DKP_INTERFACE "org.freedesktop.DeviceKit.Power"
160@@ -223,7 +225,11 @@
161 DbusmenuMenuitem * mi = NULL;
162
163 mi = dbusmenu_menuitem_new();
164- dbusmenu_menuitem_property_set(mi, "label", _("Log Out"));
165+ if (supress_confirmations()) {
166+ dbusmenu_menuitem_property_set(mi, "label", _("Log Out"));
167+ } else {
168+ dbusmenu_menuitem_property_set(mi, "label", _("Log Out ..."));
169+ }
170 dbusmenu_menuitem_child_append(root, mi);
171 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "logout");
172
173@@ -240,12 +246,20 @@
174 g_signal_connect(G_OBJECT(hibernate_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(sleep), "Hibernate");
175
176 mi = dbusmenu_menuitem_new();
177- dbusmenu_menuitem_property_set(mi, "label", _("Restart"));
178+ if (supress_confirmations()) {
179+ dbusmenu_menuitem_property_set(mi, "label", _("Restart"));
180+ } else {
181+ dbusmenu_menuitem_property_set(mi, "label", _("Restart ..."));
182+ }
183 dbusmenu_menuitem_child_append(root, mi);
184 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "restart");
185
186 mi = dbusmenu_menuitem_new();
187- dbusmenu_menuitem_property_set(mi, "label", _("Shutdown"));
188+ if (supress_confirmations()) {
189+ dbusmenu_menuitem_property_set(mi, "label", _("Shutdown"));
190+ } else {
191+ dbusmenu_menuitem_property_set(mi, "label", _("Shutdown ..."));
192+ }
193 dbusmenu_menuitem_child_append(root, mi);
194 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown");
195

Subscribers

People subscribed via source and target branches