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

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

    Date: Thursday, May 15, 2008 @ 19:30:40
  Author: gilir-guest
Revision: 1059

* Fix bug in manager if feedparser is not installed
* Fix sticky mode in Xfce desktop

Added:
  packages/screenlets/trunk/debian/patches/02_RSS_fix_import.patch
  packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch
Modified:
  packages/screenlets/trunk/debian/changelog

Modified: packages/screenlets/trunk/debian/changelog
===================================================================
--- packages/screenlets/trunk/debian/changelog	2008-05-13 12:14:59 UTC (rev 1058)
+++ packages/screenlets/trunk/debian/changelog	2008-05-15 19:30:40 UTC (rev 1059)
@@ -1,3 +1,13 @@
+screenlets (0.1.1-2) UNRELEASED; urgency=low
+
+  * debian/patches
+   - 02_RSS_fix_import.patch : Don't crash the manager if python-feedparser
+     is not installed.
+   - 03-sticky-on-XFCE.patch : Keep sticky mode on restart for XFCE. 
+     Thanks Luca Niccoli for the patch (Closes: #480672)
+
+ -- Julien Lavergne <julien.lavergne at gmail.com>  Wed, 14 May 2008 00:19:40 +0200
+
 screenlets (0.1.1-1) unstable; urgency=low
 
   * New upstream release (Closes: #477313)

Added: packages/screenlets/trunk/debian/patches/02_RSS_fix_import.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/02_RSS_fix_import.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/02_RSS_fix_import.patch	2008-05-15 19:30:40 UTC (rev 1059)
@@ -0,0 +1,32 @@
+=== modified file 'src/share/screenlets/ClearRss/ClearRssScreenlet.py'
+--- src/share/screenlets/ClearRss/ClearRssScreenlet.py	2008-04-26 17:52:49 +0000
++++ src/share/screenlets/ClearRss/ClearRssScreenlet.py	2008-05-13 18:09:22 +0000
+@@ -17,18 +17,19 @@
+ import sys
+ import gtk
+ import gobject
+-from screenlets import DefaultMenuItem
++from screenlets import DefaultMenuItem, utils
+ from screenlets.options import IntOption, BoolOption, StringOption, FontOption, ColorOption, FloatOption
+ import os
++
++is_manager = utils.is_manager_running_me()
+ try:
+ 	import feedparser
+-except ImportError:
+-	dialog = gtk.MessageDialog(buttons=gtk.BUTTONS_CLOSE)
+-	dialog.set_markup("You don't have Feedparser installed! \nInstall python-feedparser or copy feedparser.py from rss/ folder to your screenlets folder.")
+-	dialog.run()
+-	dialog.destroy()
+-	print("You don't have Feedparser installed! \nInstall python-feedparser or copy feedparser.py from rss/ folder to your screenlets folder.")
+-	sys.exit()
++except:
++	if not is_manager:
++		screenlets.show_message(None,'You don\'t have Feedparser installed! \nInstall python-feedparser or copy feedparser.py from rss/ folder to your screenlets folder.')
++		sys.exit()
++	else:
++		print 'You don\'t have Feedparser installed! \nInstall python-feedparser or copy feedparser.py from rss/ folder to your screenlets folder.'
+ 
+ class ClearRssScreenlet(screenlets.Screenlet):
+ 	"""Screenlet for reading RSS and Atom feeds , with the ability to scroll through all of the rss txt , ability to visit the rss news site"""
+

Added: packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch
===================================================================
--- packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch	                        (rev 0)
+++ packages/screenlets/trunk/debian/patches/03-sticky-on-XFCE.patch	2008-05-15 19:30:40 UTC (rev 1059)
@@ -0,0 +1,17 @@
+--- /usr/share/pyshared/screenlets/__init__.py	2008-05-07 14:54:09.000000000 +0200
++++ src/lib/__init__patched.py	2008-05-11 15:53:53.000000000 +0200
+@@ -1138,12 +1138,13 @@
+ 		self.window.present()			
+ 		
+ 		
+-		# the keep above and keep bellow must be reset after the window is shown this is absolutly necessary 
++		# the is sticky, keep above and keep below must be reset after the window is shown this is absolutly necessary 
+ 		self.window.hide()
+ 		self.window.move(self.x, self.y)
+ 		self.window.present()	
+ 		self.has_started = True	
+ 		self.is_dragged = False
++		self.is_sticky = self.is_sticky
+ 		self.keep_above= self.keep_above
+ 		self.keep_below= self.keep_below
+ 		self.skip_taskbar = self.skip_taskbar