From c60d4ff528281702e454eb4c3bd4d8d3f179c956 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 5 Jun 2012 14:28:12 -0500 Subject: make logout_mi and shutdown_mi local variables rather than global ones so that their pointer values won't persist between test sessions --- src/device-menu-mgr.c | 6 +++--- 1 file 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); -- cgit v1.2.3