[Python-apps-commits] r8886 - in packages/glipper/trunk/debian (4 files)

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

    Date: Friday, June 22, 2012 @ 22:24:20
  Author: josernesto-guest
Revision: 8886

Added debian/patches/ctrl_c_item-is-None.patch

Added:
  packages/glipper/trunk/debian/patches/
  packages/glipper/trunk/debian/patches/ctrl_c_item-is-None.patch
  packages/glipper/trunk/debian/patches/series
Modified:
  packages/glipper/trunk/debian/changelog

Modified: packages/glipper/trunk/debian/changelog
===================================================================
--- packages/glipper/trunk/debian/changelog	2012-06-21 06:50:16 UTC (rev 8885)
+++ packages/glipper/trunk/debian/changelog	2012-06-22 22:24:20 UTC (rev 8886)
@@ -1,3 +1,11 @@
+glipper (2.3-3) unstable; urgency=medium
+
+  [ Bradley M. Froehle ]
+  * debian/patches:
+    - Add ctrl_c_item-is-None.patch (LP: #904367)
+
+ -- Jose Ernesto Davila Pantoja <josernestodavila at ubuntu.com>  Tue, 19 Jun 2012 10:12:27 -0600
+
 glipper (2.3-2) unstable; urgency=medium
 
   * debian/rules:

Added: packages/glipper/trunk/debian/patches/ctrl_c_item-is-None.patch
===================================================================
--- packages/glipper/trunk/debian/patches/ctrl_c_item-is-None.patch	                        (rev 0)
+++ packages/glipper/trunk/debian/patches/ctrl_c_item-is-None.patch	2012-06-22 22:24:20 UTC (rev 8886)
@@ -0,0 +1,29 @@
+Description: Problems when ctrl_c_item is None
+  The latest source was crashing with:
+  Traceback (most recent call last):
+    File "/home/garrison/Code/github/glipper.bzr/glipper/AppIndicator.py", line 144, in on_history_changed
+      self.update_menu(history_list)
+    File "/home/garrison/Code/github/glipper.bzr/glipper/AppIndicator.py", line 79, in update_menu
+      menu_item = gtk.CheckMenuItem(format_item(item), False)
+    File "/home/garrison/Code/github/glipper.bzr/glipper/AppIndicator.py", line 185, in format_item
+      i = item.replace("\n", " ")
+  AttributeError: 'NoneType' object has no attribute 'replace'
+  .
+  The attached patch seems to prevent crashing, though I'm still trying to pin
+  down an issue which occurs after clearing the history, or launching with no
+  history, wherein the first clip change always pushes ctrl_c_item to the
+  history, regardless of which clipboard was used.
+Bug-Ubuntu: https://launchpad.net/bugs/904367
+Author: Garrison Hoffman <garrison at codefix.net>
+Last-Update: 2011-12-14
+--- a/glipper/History.py
++++ b/glipper/History.py
+@@ -65,7 +65,7 @@
+ 				self.history = self.history[0:self.max_elements]
+ 			
+ 			ctrl_c_item = get_glipper_clipboards().get_default_clipboard_text()
+-			if ctrl_c_item not in self.history:
++			if ctrl_c_item is not None and ctrl_c_item not in self.history:
+ 				self.history[-1] = ctrl_c_item
+ 		
+ 		# if item is None, emit changed anyway because 

Added: packages/glipper/trunk/debian/patches/series
===================================================================
--- packages/glipper/trunk/debian/patches/series	                        (rev 0)
+++ packages/glipper/trunk/debian/patches/series	2012-06-22 22:24:20 UTC (rev 8886)
@@ -0,0 +1 @@
+ctrl_c_item-is-None.patch