Merge lp:~lucian.grijincu/usb-creator/search-desktop-for-iso into lp:usb-creator

[Lucian Adrian Grijincu]

Fix for https://launchpad.net/bugs/761646.
Search Desktop for iso files too.

[Dimitri John Ledkov (xnox)]

Thank you for this merge proposal.
As this is an Ubuntu native package we keep a single changelog in debian/changelog such that bugs will be closed upon upload.
You can use: dch and debcommit. To edit the debian/changelog & make a commit with the same message and correct --fixes passed to bzr.

I have used the following changelog entry:
  * Search Desktop in addition to Downloads directory for ISOs. Thanks to
    Lucian Adrian Grijincu (LP: #761646)

I had to also fix up the glib -> GLib, since usb-creator has now been ported to python-gi. But that's ok, since the merge proposal has been lingering for a while here.

Thanks a lot.

review: Approve

=== modified file 'usbcreator/frontends/gtk/frontend.py'
--- usbcreator/frontends/gtk/frontend.py	2011-02-15 17:16:21 +0000
+++ usbcreator/frontends/gtk/frontend.py	2011-04-15 13:13:35 +0000
@@ -155,12 +155,13 @@
             self.backend.add_image(img)
             self.source_vbox.hide()
 
-        download_dir = glib.get_user_special_dir(glib.USER_DIRECTORY_DOWNLOAD)
-        if download_dir and os.path.isdir(download_dir):
-            # TODO evand 2009-10-22: File type detection based on file(1).
-            for fname in os.listdir(download_dir):
-                if fname.endswith('.iso') or fname.endswith('.img'):
-                    self.backend.add_image(os.path.join(download_dir, fname))
+        for search_dir_id in [glib.USER_DIRECTORY_DOWNLOAD, glib.USER_DIRECTORY_DESKTOP]:
+            search_dir = glib.get_user_special_dir(search_dir_id)
+            if search_dir and os.path.isdir(search_dir):
+                # TODO evand 2009-10-22: File type detection based on file(1).
+                for fname in os.listdir(search_dir):
+                    if fname.endswith('.iso') or fname.endswith('.img'):
+                        self.backend.add_image(os.path.join(search_dir, fname))
 
         # Sets first pre-populated image as current in the backend
         self.selection_changed_source(self.source_treeview.get_selection())