From d01d3a708cd5b3ec7438e9f3105ad19c693a5053 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Mon, 4 Jun 2012 17:02:42 -0500
Subject: remove the printer settings menuitem; it's no longer in the spec

---
 src/device-menu-mgr.c | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

(limited to 'src/device-menu-mgr.c')

diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
index d081937..a04cfe4 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  *printers_menuitem = NULL;
 static DbusmenuMenuitem  *scanners_menuitem = NULL;
 static DbusmenuMenuitem  *webcam_menuitem = NULL;
 
@@ -432,19 +431,6 @@ show_session_properties (DbusmenuMenuitem * mi,
   }  
 }                                   
 
-static void
-show_printer_properties (DbusmenuMenuitem * mi,
-                         guint timestamp,
-                         gchar * type)
-{
-  GError * error = NULL;
-  if (!g_spawn_command_line_async("system-config-printer", &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,
@@ -572,17 +558,6 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
                                         device_heading,
                                         5);
 
-  printers_menuitem = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set (printers_menuitem,
-                                  DBUSMENU_MENUITEM_PROP_LABEL,
-                                  _("Printers"));
-  g_signal_connect (G_OBJECT(printers_menuitem),
-                    DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-                    G_CALLBACK(show_printer_properties),
-                    "printers");
-  dbusmenu_menuitem_child_add_position(self->root_item,
-                                       printers_menuitem,
-                                       6);
   scanners_menuitem = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (scanners_menuitem,
                                   DBUSMENU_MENUITEM_PROP_LABEL,
@@ -593,7 +568,7 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
                     NULL);
   dbusmenu_menuitem_child_add_position (self->root_item,
                                         scanners_menuitem,
-                                        7);
+                                        6);
   dbusmenu_menuitem_property_set_bool (scanners_menuitem,
                                        DBUSMENU_MENUITEM_PROP_VISIBLE,
                                        FALSE);
@@ -608,7 +583,7 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
                     NULL);
   dbusmenu_menuitem_child_add_position (self->root_item,
                                         webcam_menuitem,
-                                        8);
+                                        7);
   dbusmenu_menuitem_property_set_bool (webcam_menuitem,
                                        DBUSMENU_MENUITEM_PROP_VISIBLE,
                                        FALSE);
@@ -617,7 +592,7 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
   dbusmenu_menuitem_property_set (separator3,
                                   DBUSMENU_MENUITEM_PROP_TYPE,
                                   DBUSMENU_CLIENT_TYPES_SEPARATOR);
-  dbusmenu_menuitem_child_add_position (self->root_item, separator3, 9);
+  dbusmenu_menuitem_child_add_position (self->root_item, separator3, 8);
 }
 
 static void
-- 
cgit v1.2.3