aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2012-06-04 17:04:51 -0500
committerCharles Kerr <charles.kerr@canonical.com>2012-06-04 17:04:51 -0500
commit8e724cdfa041bbbba1f06896d5f4193a49c84852 (patch)
tree4e5d1101f24f9e33a7eacdb76633d27eed3163a1
parentd224ef8dba8de6971c4e4e281fbace4d14a1da6b (diff)
downloadayatana-indicator-session-8e724cdfa041bbbba1f06896d5f4193a49c84852.tar.gz
ayatana-indicator-session-8e724cdfa041bbbba1f06896d5f4193a49c84852.tar.bz2
ayatana-indicator-session-8e724cdfa041bbbba1f06896d5f4193a49c84852.zip
remove the webcam menuitem; it's no longer in the spec
-rw-r--r--src/device-menu-mgr.c42
1 files changed, 1 insertions, 41 deletions
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
index 0ec3ec2..92f33b0 100644
--- a/src/device-menu-mgr.c
+++ b/src/device-menu-mgr.c
@@ -63,7 +63,6 @@ static DbusmenuMenuitem *login_settings_menuitem = NULL;
#ifdef HAVE_APT
static DbusmenuMenuitem *software_updates_menuitem = NULL;
#endif /* HAVE_APT */
-static DbusmenuMenuitem *webcam_menuitem = NULL;
static DBusGProxyCall * suspend_call = NULL;
static DBusGProxyCall * hibernate_call = NULL;
@@ -90,10 +89,6 @@ static void show_system_settings_with_context (DbusmenuMenuitem * mi,
guint timestamp,
gchar * type);
-static void device_menu_mgr_show_cheese (DbusmenuMenuitem * mi,
- guint timestamp,
- gchar * type);
-
static void
machine_sleep_from_hibernate (DbusmenuMenuitem * mi,
guint timestamp,
@@ -447,26 +442,6 @@ show_system_settings_with_context (DbusmenuMenuitem * mi,
g_free(control_centre_command);
}
-static void device_menu_mgr_show_cheese (DbusmenuMenuitem * mi,
- guint timestamp,
- gchar * type)
-{
- GError * error = NULL;
- if (!g_spawn_command_line_async("cheese", &error))
- {
- g_warning("Unable to launch cheese: %s", error->message);
- g_error_free(error);
-#ifdef HAVE_APT
- if (!g_spawn_command_line_async("software-center cheese", &error))
- {
- g_warning ("Unable to launch software-centre cheese: %s",
- error->message);
- g_error_free(error);
- }
-#endif /* HAVE_APT */
- }
-}
-
static void
device_menu_mgr_build_settings_items (DeviceMenuMgr* self)
{
@@ -533,26 +508,11 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
device_heading,
5);
- webcam_menuitem = dbusmenu_menuitem_new();
- dbusmenu_menuitem_property_set (webcam_menuitem,
- DBUSMENU_MENUITEM_PROP_LABEL,
- _("Webcam"));
- g_signal_connect (G_OBJECT(webcam_menuitem),
- DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
- G_CALLBACK(device_menu_mgr_show_cheese),
- NULL);
- dbusmenu_menuitem_child_add_position (self->root_item,
- webcam_menuitem,
- 6);
- dbusmenu_menuitem_property_set_bool (webcam_menuitem,
- DBUSMENU_MENUITEM_PROP_VISIBLE,
- FALSE);
-
DbusmenuMenuitem * separator3 = dbusmenu_menuitem_new();
dbusmenu_menuitem_property_set (separator3,
DBUSMENU_MENUITEM_PROP_TYPE,
DBUSMENU_CLIENT_TYPES_SEPARATOR);
- dbusmenu_menuitem_child_add_position (self->root_item, separator3, 7);
+ dbusmenu_menuitem_child_add_position (self->root_item, separator3, 6);
}
static void