Merge lp:~ari-tczew/ubuntu/lucid/gnome-settings-daemon/lp-626379 into lp:ubuntu/lucid-proposed/gnome-settings-daemon

[Artur Rona]

[Martin Pitt (pitti)]

This was uploaded to lucid-proposed, but without using bzr branch merge.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-04-28 10:46:53 +0000
+++ debian/changelog	2010-11-21 13:47:55 +0000
@@ -1,3 +1,11 @@
+gnome-settings-daemon (2.30.1-0ubuntu1.1) lucid-proposed; urgency=low
+
+  [ Krzysztof Klimonda ]
+  * debian/patches/92_return_if_nitems_is_0.patch: (LP: #626379)
+    - Fix handle clipboard with KDE apps on Gnome, e.g. kolourpaint4.
+
+ -- Artur Rona <[e-mail]>  Sun, 21 Nov 2010 14:21:45 +0100
+
 gnome-settings-daemon (2.30.1-0ubuntu1) lucid-proposed; urgency=low
 
   * New upstream version (LP: #571250):
 
=== added file 'debian/patches/92_return_if_nitems_is_0.patch'
--- debian/patches/92_return_if_nitems_is_0.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/92_return_if_nitems_is_0.patch	2010-11-21 13:47:55 +0000
@@ -0,0 +1,24 @@
+From: Artur Rona <[e-mail]>
+Description: Fix handle clipboard with KDE apps on Gnome, e.g. kolourpaint4.
+Bug: https://bugzilla.gnome.org/628526
+Bug-Ubuntu: https://launchpad.net/bugs/626379
+Forwarded: yes
+Author: Krzysztof Klimonda <[e-mail]>
+
+Index: gnome-settings-daemon/plugins/clipboard/gsd-clipboard-manager.c
+===================================================================
+--- gnome-settings-daemon.orig/plugins/clipboard/gsd-clipboard-manager.c	2010-09-14 17:26:18.077966003 +0200
++++ gnome-settings-daemon/plugins/clipboard/gsd-clipboard-manager.c	2010-09-14 17:35:07.117966003 +0200
+@@ -599,8 +599,11 @@
+                                     &type, &format, &nitems, &remaining,
+                                     (unsigned char **) &multiple);
+ 
+-                if (type != XA_ATOM_PAIR)
++                if (type != XA_ATOM_PAIR || nitems == 0) {
++                        if (multiple)
++                                free (multiple);
+                         return;
++                }
+ 
+                 for (i = 0; i < nitems; i += 2) {
+                         rdata = (IncrConversion *) malloc (sizeof (IncrConversion));
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2010-04-28 10:46:53 +0000
+++ debian/patches/series	2010-11-21 13:47:55 +0000
@@ -15,4 +15,5 @@
 90_autoreconf.patch
 91_bugzilla_update_touchpad_icons.patch
 91_update_gvc_source.patch
+92_return_if_nitems_is_0.patch
 99_ltmain_as-needed.patch