gimmie r699 - in trunk: . gimmie

[orph svn gnome org]

Author: orph
Date: Mon Jan 12 12:25:49 2009
New Revision: 699
URL: http://svn.gnome.org/viewvc/gimmie?rev=699&view=rev

Log:
2009-01-12  Alex Graveley  <alex beatniksoftware com>

	* gimmie/gimmie_computer.py: Disable gnomecups, which have always
	been crash-happy.
	(DevicesSource.__init__): Missing icon stock_bluetooth ->
	bluetooth.
	(PrinterSourceCups/Gtk.__init__): Missing icon
	gnome-dev-printer-new -> gtk.STOCK_PRINT.



Modified:
   trunk/ChangeLog
   trunk/gimmie/gimmie_computer.py

Modified: trunk/gimmie/gimmie_computer.py
==============================================================================
--- trunk/gimmie/gimmie_computer.py	(original)
+++ trunk/gimmie/gimmie_computer.py	Mon Jan 12 12:25:49 2009
@@ -9,14 +9,18 @@
 import gtk
 import gnomevfs
 
+# NOTE: libgnomecups bindings have been no end of trouble, always disabled for now.
+#try:
+#    import gnomecups
+#except ImportError:
+#    gnomecups = None
+gnomecups = None
+
 try:
-    import gnomecups
+    # gtkunixprint is new in PyGTK 2.10
+    import gtkunixprint
 except ImportError:
-    gnomecups = None
-    try:
-        import gtkunixprint
-    except ImportError:
-        gtkunixprint = None
+    gtkunixprint = None
 
 import gdmclient
 
@@ -203,7 +207,7 @@
         
         self.add_bluetooth = Item(name=_("Add Bluetooth..."),
                                   comment=_("Access a wireless device"),
-                                  icon="stock_bluetooth",
+                                  icon="bluetooth",
                                   special=True)
         self.add_bluetooth.do_open = lambda: self._add_bluetooth()
 
@@ -350,7 +354,7 @@
 
         self.add_printer = Item(name=_("Add Printer..."),
                                 comment=_("Setup attached or networked printer"),
-                                icon="gnome-dev-printer-new",
+                                icon=gtk.STOCK_PRINT,
                                 special=True)
         self.add_printer.do_open = lambda: launcher.launch_command("gnome-cups-add")
 
@@ -467,7 +471,7 @@
 
         self.add_item = Item(name=_("Add Printer..."),
                              comment=_("Setup attached or networked printer"),
-                             icon="gnome-dev-printer-new",
+                             icon=gtk.STOCK_PRINT,
                              special=True)
         self.add_item.do_open = lambda: launcher.launch_command("gnome-cups-add")