[Python-apps-commits] r1821 - in packages/screenlets/trunk/debian (3 files)

[gilir-guest at users.alioth.debian.org]

    Date: Tuesday, September 16, 2008 @ 23:22:39
  Author: gilir-guest
Revision: 1821

Add 2 patchs to fix crash when there is no gtk-bookmarks file.

Added:
  packages/screenlets/trunk/debian/patches/05-places-no-bookmark.patch
  packages/screenlets/trunk/debian/patches/06-main-menu-no-bookmark.patch
Modified:
  packages/screenlets/trunk/debian/changelog

Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog	2008-09-16 23:07:10 UTC (rev 1820)
+++ packages/screenlets/trunk/debian/changelog	2008-09-16 23:22:39 UTC (rev 1821)
@@ -1,13 +1,17 @@
 screenlets (0.1.2-3) unstable; urgency=low
 
-  * debian/patches/04-install-wallclock-in-home.patch
-   - Install WallpaperClock in ~/.screenlets instead of /usr/share
-     (Closes: #497127).
+  * debian/patches
+   - 04-install-wallclock-in-home.patch : install WallpaperClock in
+     ~/.screenlets instead of /usr/share (Closes: #497127).
+   - 05-places-no-bookmark.patch : don't crash Places Screenlets if there is
+     no bookmark.
+   - 06-main-menu-no-bookmark.patch : don't crash Main Menu Screenlets if there is
+     no bookmark.
   * debian/rules
    - Remove feedparser.py in FeedReader Screenlet, already in
      python-feedparser.
 
- -- Julien Lavergne <julien.lavergne at gmail.com>  Thu, 11 Sep 2008 22:55:34 +0200
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Wed, 17 Sep 2008 01:20:05 +0200
 
 screenlets (0.1.2-2) unstable; urgency=low
 

Added: packages/screenlets/trunk/debian/patches/05-places-no-bookmark.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/05-places-no-bookmark.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/05-places-no-bookmark.patch	2008-09-16 23:22:39 UTC (rev 1821)
@@ -0,0 +1,17 @@
+diff -ur screenlets-0.1.2.orig/src/share/screenlets/Places/PlacesScreenlet.py screenlets-0.1.2/src/share/screenlets/Places/PlacesScreenlet.py
+--- screenlets-0.1.2.orig/src/share/screenlets/Places/PlacesScreenlet.py	2008-06-04 14:31:27.000000000 +0200
++++ screenlets-0.1.2/src/share/screenlets/Places/PlacesScreenlet.py	2008-09-17 01:15:40.000000000 +0200
+@@ -110,7 +110,11 @@
+ 
+ 
+ 		
+-		self.places =  [(os.environ['HOME'],'Home')]+ [(utils.get_desktop_dir(),'Desktop')] + utils.LoadBookmarks()
++		self.places =  [(os.environ['HOME'], 'Home'),
++						(utils.get_desktop_dir(),'Desktop')]
++		bookmarks = utils.LoadBookmarks()
++		if bookmarks is not None:
++			self.places.extend(bookmarks)
+ 		#self.mounts = utils.readMountFile('/proc/mounts')
+ 		
+ 		if self.height != 20 + (len(self.places)*20) +20:
+Seulement dans screenlets-0.1.2/src/share/screenlets/Places: PlacesScreenlet.py~

Added: packages/screenlets/trunk/debian/patches/06-main-menu-no-bookmark.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/06-main-menu-no-bookmark.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/06-main-menu-no-bookmark.patch	2008-09-16 23:22:39 UTC (rev 1821)
@@ -0,0 +1,16 @@
+diff -ur screenlets-0.1.2.orig/src/share/screenlets/MainMenu/menus.py screenlets-0.1.2/src/share/screenlets/MainMenu/menus.py
+--- screenlets-0.1.2.orig/src/share/screenlets/MainMenu/menus.py	2008-06-04 14:31:27.000000000 +0200
++++ screenlets-0.1.2/src/share/screenlets/MainMenu/menus.py	2008-09-17 00:52:30.000000000 +0200
+@@ -19,7 +19,10 @@
+     """
+     model = gtk.ListStore(gtk.gdk.Pixbuf, gobject.TYPE_STRING)
+     book_loc = os.path.expanduser("~") + "/.gtk-bookmarks"
+-    bookmark_list = open(book_loc,"r")
++    if os.path.exists(book_loc):
++        bookmark_list = open(book_loc,"r")
++    else:
++        bookmark_list =[]
+     bookmarks = {}
+     model_list = []
+     home = [theme.load_icon('user-home',24,0),"Home"]
+Seulement dans screenlets-0.1.2/src/share/screenlets/MainMenu: menus.py~