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
=== modified file 'configure.ac'
--- configure.ac 2009-08-27 18:33:41 +0000
+++ configure.ac 2009-09-02 14:17:44 +0000
@@ -8,6 +8,8 @@
88
9AM_MAINTAINER_MODE9AM_MAINTAINER_MODE
1010
11IT_PROG_INTLTOOL([0.35.0])
12
11AC_ISC_POSIX13AC_ISC_POSIX
12AC_PROG_CC14AC_PROG_CC
13AM_PROG_CC_C_O15AM_PROG_CC_C_O
@@ -56,6 +58,16 @@
56AC_SUBST(GTKLOGOUTHELPER_CFLAGS)58AC_SUBST(GTKLOGOUTHELPER_CFLAGS)
57AC_SUBST(GTKLOGOUTHELPER_LIBS)59AC_SUBST(GTKLOGOUTHELPER_LIBS)
5860
61AC_PATH_PROG(GCONFTOOL, gconftool-2)
62dnl Specify the gconf configuration source,
63dnl default to xml::$(sysconfdir)/gconf/gconf.xml.defaults
64
65AM_GCONF_SOURCE_2
66
67PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.0)
68AC_SUBST(GCONF_CFLAGS)
69AC_SUBST(GCONF_LIBS)
70
59###########################71###########################
60# Check to see if we're local72# Check to see if we're local
61###########################73###########################
@@ -115,6 +127,7 @@
115data/icons/scalable/Makefile127data/icons/scalable/Makefile
116data/icons/scalable/status/Makefile128data/icons/scalable/status/Makefile
117data/icons/scalable/actions/Makefile129data/icons/scalable/actions/Makefile
130po/Makefile.in
118])131])
119132
120###########################133###########################
121134
=== modified file 'data/Makefile.am'
--- data/Makefile.am 2009-08-07 19:10:15 +0000
+++ data/Makefile.am 2009-09-02 14:17:44 +0000
@@ -9,9 +9,37 @@
9%.service: %.service.in9%.service: %.service.in
10 sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@10 sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
1111
12##############################
13# GConf Schema
14##############################
15
16schemadir = \
17 $(GCONF_SCHEMA_FILE_DIR)
18
19schema_in_files = \
20 indicator-session.schemas.in
21
22schema_DATA = \
23 $(schema_in_files:.schemas.in=.schemas)
24
25@INTLTOOL_SCHEMAS_RULE@
26
27
12#$(dbus_services_DATA): $(service_in_files) Makefile28#$(dbus_services_DATA): $(service_in_files) Makefile
13# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@29# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
1430
15EXTRA_DIST = $(service_in_files)31EXTRA_DIST = \
1632 $(service_in_files) \
17CLEANFILES = $(dbus_services_DATA)33 $(schema_in_files)
34
35CLEANFILES = \
36 $(dbus_services_DATA) \
37 $(schema_DATA)
38
39if GCONF_SCHEMAS_INSTALL
40install-data-local:
41 GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
42 gconftool-2 --makefile-install-rule $(schema_DATA)
43else
44install-data-local:
45endif
1846
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2009-08-25 21:21:44 +0000
+++ src/Makefile.am 2009-09-02 14:17:44 +0000
@@ -84,9 +84,9 @@
84# Session Stuff84# Session Stuff
85#################85#################
8686
87indicator_session_service_SOURCES = session-service.c87indicator_session_service_SOURCES = session-service.c gtk-dialog/gconf-helper.c
88indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror88indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
89indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS)89indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS)
9090
91###############91###############
92# Other Stuff92# Other Stuff
9393
=== modified file 'src/gtk-dialog/Makefile.am'
--- src/gtk-dialog/Makefile.am 2009-07-21 21:20:31 +0000
+++ src/gtk-dialog/Makefile.am 2009-09-02 14:17:44 +0000
@@ -5,9 +5,11 @@
5 gtk-logout-helper.c \5 gtk-logout-helper.c \
6 ck-pk-helper.c \6 ck-pk-helper.c \
7 ck-pk-helper.h \7 ck-pk-helper.h \
8 gconf-helper.c \
9 gconf-helper.h \
8 logout-dialog.c \10 logout-dialog.c \
9 logout-dialog.h11 logout-dialog.h
1012
11gtk_logout_helper_CFLAGS = $(GTKLOGOUTHELPER_CFLAGS) -Wall -Werror13gtk_logout_helper_CFLAGS = $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror
12gtk_logout_helper_LDADD = $(GTKLOGOUTHELPER_LIBS)14gtk_logout_helper_LDADD = $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS)
1315
1416
=== modified file 'src/gtk-dialog/gtk-logout-helper.c'
--- src/gtk-dialog/gtk-logout-helper.c 2009-08-07 22:52:48 +0000
+++ src/gtk-dialog/gtk-logout-helper.c 2009-09-02 14:17:44 +0000
@@ -6,6 +6,7 @@
66
7Authors:7Authors:
8 Ted Gould <ted@canonical.com>8 Ted Gould <ted@canonical.com>
9 Christoph Korn <c_korn@gmx.de>
910
10This program is free software: you can redistribute it and/or modify it 11This program is free software: you can redistribute it and/or modify it
11under the terms of the GNU General Public License version 3, as published 12under the terms of the GNU General Public License version 3, as published
@@ -26,6 +27,7 @@
26#include <dbus/dbus-glib.h>27#include <dbus/dbus-glib.h>
27#include "logout-dialog.h"28#include "logout-dialog.h"
28#include "ck-pk-helper.h"29#include "ck-pk-helper.h"
30#include "gconf-helper.h"
2931
30static void32static void
31session_action (LogoutDialogAction action)33session_action (LogoutDialogAction action)
@@ -132,7 +134,7 @@
132 }134 }
133135
134 GtkWidget * dialog = NULL;136 GtkWidget * dialog = NULL;
135 if (!pk_require_auth(type)) { 137 if (!pk_require_auth(type) && !supress_confirmations()) {
136 dialog = logout_dialog_new(type);138 dialog = logout_dialog_new(type);
137 }139 }
138140
139141
=== modified file 'src/session-service.c'
--- src/session-service.c 2009-08-07 22:52:48 +0000
+++ src/session-service.c 2009-09-02 14:17:44 +0000
@@ -31,6 +31,8 @@
3131
32#include "dbus-shared-names.h"32#include "dbus-shared-names.h"
3333
34#include "gtk-dialog/gconf-helper.h"
35
34#define DKP_ADDRESS "org.freedesktop.DeviceKit.Power"36#define DKP_ADDRESS "org.freedesktop.DeviceKit.Power"
35#define DKP_OBJECT "/org/freedesktop/DeviceKit/Power"37#define DKP_OBJECT "/org/freedesktop/DeviceKit/Power"
36#define DKP_INTERFACE "org.freedesktop.DeviceKit.Power"38#define DKP_INTERFACE "org.freedesktop.DeviceKit.Power"
@@ -223,7 +225,11 @@
223 DbusmenuMenuitem * mi = NULL;225 DbusmenuMenuitem * mi = NULL;
224226
225 mi = dbusmenu_menuitem_new();227 mi = dbusmenu_menuitem_new();
226 dbusmenu_menuitem_property_set(mi, "label", _("Log Out"));228 if (supress_confirmations()) {
229 dbusmenu_menuitem_property_set(mi, "label", _("Log Out"));
230 } else {
231 dbusmenu_menuitem_property_set(mi, "label", _("Log Out ..."));
232 }
227 dbusmenu_menuitem_child_append(root, mi);233 dbusmenu_menuitem_child_append(root, mi);
228 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "logout");234 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "logout");
229235
@@ -240,12 +246,20 @@
240 g_signal_connect(G_OBJECT(hibernate_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(sleep), "Hibernate");246 g_signal_connect(G_OBJECT(hibernate_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(sleep), "Hibernate");
241247
242 mi = dbusmenu_menuitem_new();248 mi = dbusmenu_menuitem_new();
243 dbusmenu_menuitem_property_set(mi, "label", _("Restart"));249 if (supress_confirmations()) {
250 dbusmenu_menuitem_property_set(mi, "label", _("Restart"));
251 } else {
252 dbusmenu_menuitem_property_set(mi, "label", _("Restart ..."));
253 }
244 dbusmenu_menuitem_child_append(root, mi);254 dbusmenu_menuitem_child_append(root, mi);
245 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "restart");255 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "restart");
246256
247 mi = dbusmenu_menuitem_new();257 mi = dbusmenu_menuitem_new();
248 dbusmenu_menuitem_property_set(mi, "label", _("Shutdown"));258 if (supress_confirmations()) {
259 dbusmenu_menuitem_property_set(mi, "label", _("Shutdown"));
260 } else {
261 dbusmenu_menuitem_property_set(mi, "label", _("Shutdown ..."));
262 }
249 dbusmenu_menuitem_child_append(root, mi);263 dbusmenu_menuitem_child_append(root, mi);
250 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown");264 g_signal_connect(G_OBJECT(mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown");
251265

Subscribers

People subscribed via source and target branches