aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-05 14:28:12 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-05 14:28:12 -0500
commitc60d4ff528281702e454eb4c3bd4d8d3f179c956 (patch)
treef46f9243a5cc112e879e762b4ac4597e7c266fde /src
parent91f89a3dcb55902dbd91632aae0c5c902fe0b46a (diff)
downloadayatana-indicator-session-c60d4ff528281702e454eb4c3bd4d8d3f179c956.tar.gz
ayatana-indicator-session-c60d4ff528281702e454eb4c3bd4d8d3f179c956.tar.bz2
ayatana-indicator-session-c60d4ff528281702e454eb4c3bd4d8d3f179c956.zip
make logout_mi and shutdown_mi local variables rather than global ones so that their pointer values won't persist between test sessions
Diffstat (limited to 'src')
-rw-r--r--src/device-menu-mgr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
index c982495..904a9f2 100644
--- a/src/device-menu-mgr.c
+++ b/src/device-menu-mgr.c
@@ -57,9 +57,6 @@ static DbusmenuMenuitem *system_settings_menuitem = NULL;
static DBusGProxyCall * suspend_call = NULL;
static DBusGProxyCall * hibernate_call = NULL;
-static DbusmenuMenuitem * logout_mi = NULL;
-static DbusmenuMenuitem * shutdown_mi = NULL;
-
static gboolean can_hibernate = TRUE;
static gboolean can_suspend = TRUE;
static gboolean allow_hibernate = TRUE;
@@ -454,6 +451,9 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
static void
device_menu_mgr_build_static_items (DeviceMenuMgr* self, gboolean greeter_mode)
{
+ DbusmenuMenuitem * logout_mi = NULL;
+ DbusmenuMenuitem * shutdown_mi = NULL;
+
// Static Setting items
if (!greeter_mode) {
device_menu_mgr_build_settings_items (self);