usb-creator-hackers team mailing list archive

[Michael Terry <michael.terry@xxxxxxxxxxxxx>]

Michael Terry has proposed merging lp:~mterry/usb-creator/no-python-gnome2 into lp:usb-creator.

Requested reviews:
  usb-creator hackers (usb-creator-hackers)

-- 
https://code.launchpad.net/~mterry/usb-creator/no-python-gnome2/+merge/40216
Your team usb-creator hackers is requested to review the proposed merge of lp:~mterry/usb-creator/no-python-gnome2 into lp:usb-creator.

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-23 08:18:16 +0000
+++ debian/changelog	2010-11-05 17:56:50 +0000
@@ -1,3 +1,11 @@
+usb-creator (0.2.26) natty; urgency=low
+
+  * debian/control, usbcreator/frontends/gtk:
+    - Remove python-gnome2 dependency by switching help_display_uri to
+      gtk.show_uri.  LP: #661289
+
+ -- Michael Terry <mterry@xxxxxxxxxx>  Fri, 05 Nov 2010 12:54:57 -0400
+
 usb-creator (0.2.25) maverick; urgency=low
 
   * Grow support for installing GRUB to USB sticks if it's detected in the image

=== modified file 'debian/control'
--- debian/control	2010-09-06 15:14:19 +0000
+++ debian/control	2010-11-05 17:56:50 +0000
@@ -30,7 +30,7 @@
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends},
  usb-creator-common (= ${source:Version}), python-gtk2 (>= 2.12),
- python-dbus, python-gnome2
+ python-dbus
 Description: create a startup disk using a CD or disc image (for GNOME)
  Startup Disk Creator converts a USB key or SD card into a volume from which you
  can start up and run Ubuntu. You can also store files and settings in any space

=== modified file 'usbcreator/frontends/gtk/frontend.py'
--- usbcreator/frontends/gtk/frontend.py	2010-09-06 13:25:24 +0000
+++ usbcreator/frontends/gtk/frontend.py	2010-11-05 17:56:50 +0000
@@ -24,7 +24,6 @@
 import glib
 import logging
 import pango
-from gnome import help_display_uri
 
 from usbcreator.frontends.base import Frontend
 from usbcreator.misc import *
@@ -120,7 +119,9 @@
         self.finished_exit.connect('clicked', lambda x: self.finished_dialog.hide())
         self.failed_exit.connect('clicked', lambda x: self.failed_exit.hide())
         self.progress_cancel_button.connect('clicked', lambda x: self.warning_dialog.show())
-        self.button_help.connect('clicked', lambda x: help_display_uri('ghelp:usb-creator'))
+        self.button_help.connect('clicked', lambda x: gtk.show_uri(self.button_help.get_screen(),
+                                                                   'ghelp:usb-creator',
+                                                                   gtk.get_current_event_time()))
 
         def format_value(scale, value):
             return format_mb_size(value)