diff options
| author | Christoph Korn <korn@ubuntu> | 2009-09-02 16:17:44 +0200 |
|---|---|---|
| committer | Christoph Korn <korn@ubuntu> | 2009-09-02 16:17:44 +0200 |
| commit | 1f0874253406566587d4e42a9ee2f4617a5c66d9 (patch) | |
| tree | cd8a07328b4a7fcdf836e6596c311a0640e2cf2d /src/gtk-dialog | |
| parent | 41f1b3206ab13b008aed6670dc42636049c9590d (diff) | |
| download | ayatana-indicator-session-1f0874253406566587d4e42a9ee2f4617a5c66d9.tar.gz ayatana-indicator-session-1f0874253406566587d4e42a9ee2f4617a5c66d9.tar.bz2 ayatana-indicator-session-1f0874253406566587d4e42a9ee2f4617a5c66d9.zip | |
These patches introduce a gconf key whether the logout/restart/shutdown confirmations
should be shown or not.
Also the menu items should be suffixed by '...' accordingly.
However this only works after a restart.
Bugs which get fixed are:
https://bugs.launchpad.net/indicator-session/+bug/422025
https://bugs.launchpad.net/ubuntu/+source/indicator-session/+bug/421693
https://bugs.launchpad.net/ubuntu/+source/indicator-session/+bug/419472
Diffstat (limited to 'src/gtk-dialog')
| -rw-r--r-- | src/gtk-dialog/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gtk-dialog/gtk-logout-helper.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am index 9aa0097..90a6209 100644 --- a/src/gtk-dialog/Makefile.am +++ b/src/gtk-dialog/Makefile.am @@ -5,9 +5,11 @@ gtk_logout_helper_SOURCES = \ gtk-logout-helper.c \ ck-pk-helper.c \ ck-pk-helper.h \ + gconf-helper.c \ + gconf-helper.h \ logout-dialog.c \ logout-dialog.h -gtk_logout_helper_CFLAGS = $(GTKLOGOUTHELPER_CFLAGS) -Wall -Werror -gtk_logout_helper_LDADD = $(GTKLOGOUTHELPER_LIBS) +gtk_logout_helper_CFLAGS = $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror +gtk_logout_helper_LDADD = $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS) diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-dialog/gtk-logout-helper.c index 5d87148..13991ca 100644 --- a/src/gtk-dialog/gtk-logout-helper.c +++ b/src/gtk-dialog/gtk-logout-helper.c @@ -6,6 +6,7 @@ Copyright 2009 Canonical Ltd. Authors: Ted Gould <ted@canonical.com> + Christoph Korn <c_korn@gmx.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3, as published @@ -26,6 +27,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <dbus/dbus-glib.h> #include "logout-dialog.h" #include "ck-pk-helper.h" +#include "gconf-helper.h" static void session_action (LogoutDialogAction action) @@ -132,7 +134,7 @@ main (int argc, char * argv[]) } GtkWidget * dialog = NULL; - if (!pk_require_auth(type)) { + if (!pk_require_auth(type) && !supress_confirmations()) { dialog = logout_dialog_new(type); } |