aboutsummaryrefslogtreecommitdiff
path: root/src/gtk-dialog
diff options
context:
space:
mode:
authorChristoph Korn <c_korn@gmx.de>2009-09-08 21:26:38 +0200
committerChristoph Korn <c_korn@gmx.de>2009-09-08 21:26:38 +0200
commit7c1f28e80e07e3a352947fd089f9b1d127ff77b8 (patch)
treee9098bb24adf23610e9ff086fc8b462d7f9aa701 /src/gtk-dialog
parent3211a5e810fbbe830a237127092d221018f4f6a2 (diff)
downloadayatana-indicator-session-7c1f28e80e07e3a352947fd089f9b1d127ff77b8.tar.gz
ayatana-indicator-session-7c1f28e80e07e3a352947fd089f9b1d127ff77b8.tar.bz2
ayatana-indicator-session-7c1f28e80e07e3a352947fd089f9b1d127ff77b8.zip
The menu now immediately is updated when the gconf-key about the
logout/shutdown/restart confirmations is changed.
Diffstat (limited to 'src/gtk-dialog')
-rw-r--r--src/gtk-dialog/Makefile.am4
-rw-r--r--src/gtk-dialog/gconf-helper.c49
-rw-r--r--src/gtk-dialog/gconf-helper.h21
3 files changed, 66 insertions, 8 deletions
diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am
index 90a6209..9cdc18e 100644
--- a/src/gtk-dialog/Makefile.am
+++ b/src/gtk-dialog/Makefile.am
@@ -10,6 +10,6 @@ gtk_logout_helper_SOURCES = \
logout-dialog.c \
logout-dialog.h
-gtk_logout_helper_CFLAGS = $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror
-gtk_logout_helper_LDADD = $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS)
+gtk_logout_helper_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror
+gtk_logout_helper_LDADD = $(SESSIONSERVICE_LIBS) $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS)
diff --git a/src/gtk-dialog/gconf-helper.c b/src/gtk-dialog/gconf-helper.c
index 0bd21ad..7fc40d6 100644
--- a/src/gtk-dialog/gconf-helper.c
+++ b/src/gtk-dialog/gconf-helper.c
@@ -1,6 +1,5 @@
/*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
+A small wrapper utility for connecting to gconf.
Copyright 2009 Canonical Ltd.
@@ -23,10 +22,52 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <gconf/gconf-client.h>
+#include <glib/gi18n.h>
+
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
+
+#include <libdbusmenu-glib/server.h>
+#include <libdbusmenu-glib/menuitem.h>
+
#include "gconf-helper.h"
+static GConfClient * gconf_client = NULL;
+
gboolean
supress_confirmations (void) {
- GConfClient *client = gconf_client_get_default ();
- return gconf_client_get_bool (client, SUPPRESS_KEY, NULL) ;
+ if(!gconf_client) {
+ gconf_client = gconf_client_get_default ();
+ }
+ return gconf_client_get_bool (gconf_client, SUPPRESS_KEY, NULL) ;
+}
+
+static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpointer data) {
+ RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = (RestartShutdownLogoutMenuItems*) data;
+ GConfValue * value = gconf_entry_get_value (entry);
+ const gchar * key = gconf_entry_get_key (entry);
+
+ if(strcmp (key, SUPPRESS_KEY) == 0) {
+ if (gconf_value_get_bool (value)) {
+ dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));
+ dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart"));
+ dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown"));
+ } else {
+ dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out ..."));
+ dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart ..."));
+ dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown ..."));
+ }
+ }
}
+
+void
+update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) {
+ if(!gconf_client) {
+ gconf_client = gconf_client_get_default ();
+ }
+ gconf_client_add_dir (gconf_client, GLOBAL_DIR,
+ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
+ gconf_client_notify_add (gconf_client, SUPPRESS_KEY,
+ update_menu_entries_callback, restart_shutdown_logout_mi, NULL, NULL);
+}
+
diff --git a/src/gtk-dialog/gconf-helper.h b/src/gtk-dialog/gconf-helper.h
index 1d78fd8..951bb0f 100644
--- a/src/gtk-dialog/gconf-helper.h
+++ b/src/gtk-dialog/gconf-helper.h
@@ -1,6 +1,5 @@
/*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
+A small wrapper utility for connecting to gconf.
Copyright 2009 Canonical Ltd.
@@ -26,8 +25,26 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include <gconf/gconf-client.h>
+#include <glib/gi18n.h>
+
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-bindings.h>
+
+#include <libdbusmenu-glib/server.h>
+#include <libdbusmenu-glib/menuitem.h>
+
#define SUPPRESS_KEY "/apps/indicator-session/suppress_logout_restart_shutdown"
+#define GLOBAL_DIR "/apps/indicator-session"
+
+typedef struct _RestartShutdownLogoutMenuItems
+{
+ DbusmenuMenuitem * logout_mi;
+ DbusmenuMenuitem * restart_mi;
+ DbusmenuMenuitem * shutdown_mi;
+}
+RestartShutdownLogoutMenuItems;
+void update_menu_entries(RestartShutdownLogoutMenuItems*);
gboolean supress_confirmations (void);
#endif /* __GCONF_HELPER__ */