aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-08-19 11:21:26 -0500
committerTed Gould <ted@gould.cx>2011-08-19 11:21:26 -0500
commitcb15da3ae85cbd185e4878aa0156e928db5d790e (patch)
tree3feef4311ef26be9d4bb05caa722bed047d85d2e
parent2fe4c360b2eb616cb43472b8e8e7b69bdefd349d (diff)
downloadayatana-indicator-session-cb15da3ae85cbd185e4878aa0156e928db5d790e.tar.gz
ayatana-indicator-session-cb15da3ae85cbd185e4878aa0156e928db5d790e.tar.bz2
ayatana-indicator-session-cb15da3ae85cbd185e4878aa0156e928db5d790e.zip
Comment out notifications so that we can get this compiling again.
-rw-r--r--src/gconf-helper.c10
-rw-r--r--src/gconf-helper.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gconf-helper.c b/src/gconf-helper.c
index f9e73ad..fad1275 100644
--- a/src/gconf-helper.c
+++ b/src/gconf-helper.c
@@ -20,8 +20,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <gio/gio.h>
-#include <gconf/gconf-client.h>
-
#include <glib/gi18n.h>
#include <dbus/dbus-glib.h>
@@ -33,13 +31,14 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "dbus-shared-names.h"
#include "gconf-helper.h"
-static GConfClient * gconf_client = NULL;
static GSettings* settings = NULL;
+#if 0
static guint confirmation_notify = 0;
static guint logout_notify = 0;
static guint restart_notify = 0;
static guint shutdown_notify = 0;
+#endif
static void
build_settings (void) {
@@ -73,6 +72,7 @@ show_shutdown (void) {
return !g_settings_get_boolean (settings, SHUTDOWN_KEY) ;
}
+#if 0
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);
@@ -123,9 +123,11 @@ update_shutdown_callback (GConfClient *client, guint cnxn_id, GConfEntry *entry
dbusmenu_menuitem_property_set_bool(mi, DBUSMENU_MENUITEM_PROP_VISIBLE, !gconf_value_get_bool(value));
}
}
+#endif
void
update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) {
+#if 0
/* If we don't have a client, build one. */
if(!gconf_client) {
gconf_client = gconf_client_get_default ();
@@ -166,7 +168,7 @@ update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi)
update_restart_callback, restart_shutdown_logout_mi->restart_mi, NULL, NULL);
shutdown_notify = gconf_client_notify_add (gconf_client, SHUTDOWN_KEY,
update_shutdown_callback, restart_shutdown_logout_mi->shutdown_mi, NULL, NULL);
-
+#endif
return;
}
diff --git a/src/gconf-helper.h b/src/gconf-helper.h
index 0d84dc6..b3b5151 100644
--- a/src/gconf-helper.h
+++ b/src/gconf-helper.h
@@ -23,8 +23,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef __GCONF_HELPER_H__
#define __GCONF_HELPER_H__ 1
-#include <gconf/gconf-client.h>
-
#include <glib/gi18n.h>
#include <dbus/dbus-glib.h>