From 85e9bcfb399e489eaa6fbf467f940baa69239bf2 Mon Sep 17 00:00:00 2001
From: Conor Curran <conor.curran@canonical.com>
Date: Wed, 3 Aug 2011 18:01:32 +0100
Subject: refactor of the udev mgr - working nicely

---
 src/device-menu-mgr.c | 6 +++---
 src/sane-rules.h      | 5 +++++
 src/udev-mgr.c        | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
index 2c559ee..1be113c 100644
--- a/src/device-menu-mgr.c
+++ b/src/device-menu-mgr.c
@@ -547,7 +547,7 @@ device_menu_mgr_build_static_items (DeviceMenuMgr* self)
   scanners_menuitem = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (scanners_menuitem,
                                   DBUSMENU_MENUITEM_PROP_LABEL,
-                                  _("HP Scanners"));
+                                  _("Scanners"));
   g_signal_connect (G_OBJECT(scanners_menuitem),
                     DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
                     G_CALLBACK(show_system_settings_with_context),
@@ -562,11 +562,11 @@ device_menu_mgr_build_static_items (DeviceMenuMgr* self)
   webcam_menuitem = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (webcam_menuitem,
                                   DBUSMENU_MENUITEM_PROP_LABEL,
-                                  _("HP Webcam"));
+                                  _("Webcam"));
   g_signal_connect (G_OBJECT(webcam_menuitem),
                     DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
                     G_CALLBACK(show_system_settings_with_context),
-                    "HP Webcam");
+                    "Webcam");
   dbusmenu_menuitem_child_add_position (self->root_item,
                                         webcam_menuitem,
                                         10);
diff --git a/src/sane-rules.h b/src/sane-rules.h
index 4c36698..871565b 100644
--- a/src/sane-rules.h
+++ b/src/sane-rules.h
@@ -2,6 +2,7 @@
 void populate_usb_scanners (GHashTable* scanners)
 {
   GList* hp = NULL;
+
   hp = g_list_append (hp, g_strdup ("0101"));
   hp = g_list_append (hp, g_strdup ("0105"));
   hp = g_list_append (hp, g_strdup ("0201"));
@@ -308,6 +309,10 @@ void populate_usb_scanners (GHashTable* scanners)
                        g_list_copy(nikon));
 
   GList* epson = NULL;
+
+  // for testing (its a printer not a scanner!)  
+  //epson = g_list_append (epson, g_strdup ("0001"));
+  
   epson = g_list_append (epson, g_strdup("0101"));
   epson = g_list_append (epson, g_strdup("0103"));
   epson = g_list_append (epson, g_strdup("0104"));
diff --git a/src/udev-mgr.c b/src/udev-mgr.c
index 5c650b6..6ddd97d 100644
--- a/src/udev-mgr.c
+++ b/src/udev-mgr.c
@@ -203,8 +203,7 @@ udev_mgr_handle_webcam (UdevMgr* self,
     }
     g_hash_table_insert (self->webcams_present,
                          g_strdup (product),
-                         g_strdup (vendor));
-                               
+                         g_strdup (vendor));                               
   }
   udev_mgr_update_menuitems (self);  
 }                        
@@ -267,6 +266,7 @@ udev_mgr_check_if_usb_device_is_supported (UdevMgr* self,
                                            UdevMgrDeviceAction action)
 {
   const gchar* vendor = NULL;
+  debug_device (self, device, action);    
   
 	vendor = g_udev_device_get_property (device, "ID_VENDOR_ID");
   
-- 
cgit v1.2.3