aboutsummaryrefslogtreecommitdiff
path: root/src/device-menu-mgr.c
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-04 17:09:10 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-04 17:09:10 -0500
commit7a2f7f702c12558905b52335cf34b4fd9cf60233 (patch)
tree19bc2ff599f96880a1a425ed4c9a87cfc3652eb2 /src/device-menu-mgr.c
parentb63c0ea041fec172b3ceba900c0249408f66cf41 (diff)
downloadayatana-indicator-session-7a2f7f702c12558905b52335cf34b4fd9cf60233.tar.gz
ayatana-indicator-session-7a2f7f702c12558905b52335cf34b4fd9cf60233.tar.bz2
ayatana-indicator-session-7a2f7f702c12558905b52335cf34b4fd9cf60233.zip
remove the startup applications menuitem; it's no longer in the spec
Diffstat (limited to 'src/device-menu-mgr.c')
-rw-r--r--src/device-menu-mgr.c29
1 files changed, 2 insertions, 27 deletions
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
index d0a22bb..654e967 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 *login_settings_menuitem = NULL;
#ifdef HAVE_APT
static DbusmenuMenuitem *software_updates_menuitem = NULL;
#endif /* HAVE_APT */
@@ -409,19 +408,6 @@ show_dialog (DbusmenuMenuitem * mi, guint timestamp, gchar * type)
}
static void
-show_session_properties (DbusmenuMenuitem * mi,
- guint timestamp,
- gchar * type)
-{
- GError * error = NULL;
- if (!g_spawn_command_line_async("gnome-session-properties", &error))
- {
- g_warning("Unable to show dialog: %s", error->message);
- g_error_free(error);
- }
-}
-
-static void
show_system_settings_with_context (DbusmenuMenuitem * mi,
guint timestamp,
gchar * type)
@@ -455,17 +441,6 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self)
system_settings_menuitem,
0);
- login_settings_menuitem = dbusmenu_menuitem_new();
- dbusmenu_menuitem_property_set (login_settings_menuitem,
- DBUSMENU_MENUITEM_PROP_LABEL,
- _("Startup Applications…"));
- g_signal_connect (G_OBJECT(login_settings_menuitem),
- DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
- G_CALLBACK(show_session_properties),
- "login");
- dbusmenu_menuitem_child_add_position(self->root_item,
- login_settings_menuitem,
- 1);
#ifdef HAVE_APT
software_updates_menuitem = dbusmenu_menuitem_new();
dbusmenu_menuitem_property_set (software_updates_menuitem,
@@ -473,14 +448,14 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self)
_("Software Up to Date"));
dbusmenu_menuitem_child_add_position(self->root_item,
software_updates_menuitem,
- 2);
+ 1);
#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, 3);
+ dbusmenu_menuitem_child_add_position (self->root_item, separator1, 2);
}
static void