aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-04 17:06:24 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-04 17:06:24 -0500
commitb63c0ea041fec172b3ceba900c0249408f66cf41 (patch)
tree707cac019ebc44ae1bd91b02cd105ce8fc9fa973
parent8e724cdfa041bbbba1f06896d5f4193a49c84852 (diff)
downloadayatana-indicator-session-b63c0ea041fec172b3ceba900c0249408f66cf41.tar.gz
ayatana-indicator-session-b63c0ea041fec172b3ceba900c0249408f66cf41.tar.bz2
ayatana-indicator-session-b63c0ea041fec172b3ceba900c0249408f66cf41.zip
remove the display menuitem; it's no longer in the spec
-rw-r--r--src/device-menu-mgr.c17
1 files changed, 3 insertions, 14 deletions
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
index 92f33b0..d0a22bb 100644
--- a/src/device-menu-mgr.c
+++ b/src/device-menu-mgr.c
@@ -58,7 +58,6 @@ static GSettings *lockdown_settings = NULL;
static GSettings *keybinding_settings = NULL;
static DbusmenuMenuitem *lock_menuitem = NULL;
static DbusmenuMenuitem *system_settings_menuitem = NULL;
-static DbusmenuMenuitem *display_settings_menuitem = NULL;
static DbusmenuMenuitem *login_settings_menuitem = NULL;
#ifdef HAVE_APT
static DbusmenuMenuitem *software_updates_menuitem = NULL;
@@ -456,16 +455,6 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self)
system_settings_menuitem,
0);
- display_settings_menuitem = dbusmenu_menuitem_new();
- dbusmenu_menuitem_property_set (display_settings_menuitem,
- DBUSMENU_MENUITEM_PROP_LABEL,
- _("Displays…"));
- g_signal_connect (G_OBJECT(display_settings_menuitem),
- DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
- G_CALLBACK(show_system_settings_with_context), "display");
- dbusmenu_menuitem_child_add_position(self->root_item,
- display_settings_menuitem,
- 1);
login_settings_menuitem = dbusmenu_menuitem_new();
dbusmenu_menuitem_property_set (login_settings_menuitem,
DBUSMENU_MENUITEM_PROP_LABEL,
@@ -476,7 +465,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self)
"login");
dbusmenu_menuitem_child_add_position(self->root_item,
login_settings_menuitem,
- 2);
+ 1);
#ifdef HAVE_APT
software_updates_menuitem = dbusmenu_menuitem_new();
dbusmenu_menuitem_property_set (software_updates_menuitem,
@@ -484,14 +473,14 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self)
_("Software Up to Date"));
dbusmenu_menuitem_child_add_position(self->root_item,
software_updates_menuitem,
- 3);
+ 2);
#endif /* HAVE_APT */
DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new();
dbusmenu_menuitem_property_set (separator1,
DBUSMENU_MENUITEM_PROP_TYPE,
DBUSMENU_CLIENT_TYPES_SEPARATOR);
- dbusmenu_menuitem_child_add_position (self->root_item, separator1, 4);
+ dbusmenu_menuitem_child_add_position (self->root_item, separator1, 3);
}
static void