[gentoo-commits] gentoo-x86 commit in x11-misc/glipper/files: glipper-1.0-binary-data.patch digest-glipper-1.0-r1

[Sven Wegener (swegener)]

swegener    08/01/03 18:38:30

  Added:                glipper-1.0-binary-data.patch digest-glipper-1.0-r1
  Log:
  Pull in a patch from upstream that should fix binary data clipboard items. This should fix bug #177461.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.1                  x11-misc/glipper/files/glipper-1.0-binary-data.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/glipper/files/glipper-1.0-binary-data.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/glipper/files/glipper-1.0-binary-data.patch?rev=1.1&content-type=text/plain

Index: glipper-1.0-binary-data.patch
===================================================================
This should fix the bug with Openoffice clipboard items

Index: glipper/Clipboards.py
===================================================================
RCS file: /cvsroot/glipper/glipper-ng/glipper/Clipboards.py,v
retrieving revision 1.16
retrieving revision 1.17
diff --unified -r1.16 -r1.17
--- glipper/Clipboards.py	30 Sep 2007 19:10:14 -0000	1.16
+++ glipper/Clipboards.py	28 Dec 2007 17:03:31 -0000	1.17
@@ -61,23 +61,39 @@
    
    def on_default_clipboard_owner_change(self, clipboard, event):
       if self.use_default_clipboard:
-         item = clipboard.wait_for_text()
-         
-         if item != None:
-            self.default_clipboard_text = item
-            self.emit('new-item', item)
-         elif self.default_clipboard_text != None:
-            clipboard.set_text(self.default_clipboard_text)
+         text = clipboard.wait_for_text()
+
+         if text != None:
+            self.default_clipboard_text = text
+            self.default_clipboard_image = None
+            self.emit('new-item', text)
+            return
+
+         targets = clipboard.wait_for_targets()
+
+         if targets == None:
+            if self.default_clipboard_text != None:
+               clipboard.set_text(self.default_clipboard_text)
+            elif self.default_clipboard_image != None:
+               clipboard.set_image(self.default_clipboard_image)
    
    def on_primary_clipboard_owner_change(self, clipboard, event):
       if self.use_primary_clipboard:
-         item = clipboard.wait_for_text()
-         
-         if item != None:
-            self.primary_clipboard_text = item
-            self.emit('new-item', item)
-         elif self.primary_clipboard_text != None:
-            clipboard.set_text(self.primary_clipboard_text)
+         text = clipboard.wait_for_text()
+
+         if text != None:
+            self.primary_clipboard_text = text
+            self.primary_clipboard_image = None
+            self.emit('new-item', text)
+            return
+
+         targets = clipboard.wait_for_targets()
+
+         if targets == None:
+            if self.primary_clipboard_text != None:
+               clipboard.set_text(self.primary_clipboard_text)
+            elif self.default_clipboard_image != None:
+               clipboard.set_image(self.primary_clipboard_image)
       
    def on_use_default_clipboard_changed (self, value):
       if value is None or value.type != gconf.VALUE_BOOL:



1.1                  x11-misc/glipper/files/digest-glipper-1.0-r1

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/glipper/files/digest-glipper-1.0-r1?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/glipper/files/digest-glipper-1.0-r1?rev=1.1&content-type=text/plain

Index: digest-glipper-1.0-r1
===================================================================
MD5 95315e62b950877611d4645a0b47e1ba glipper-1.0.tar.bz2 364805
RMD160 131b1c9e6ab1579b444fca47d5c3858bee8f3aef glipper-1.0.tar.bz2 364805
SHA256 6581f1ed074a98deafa492c0f4aec834b4733df8f4b6812511937ad31bf15ceb glipper-1.0.tar.bz2 364805



-- 
gentoo-commits@g.o mailing list