[Pkg-xfce-commits] r4110 - goodies/trunk/xfce4-clipman-plugin/debian/patches

[Yves-Alexis Perez]

Author: corsac
Date: 2010-05-30 16:47:59 +0000 (Sun, 30 May 2010)
New Revision: 4110

Modified:
   goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
Log:
update patch to remove fuzz


Modified: goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch
===================================================================
--- goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch	2010-05-30 16:37:48 UTC (rev 4109)
+++ goodies/trunk/xfce4-clipman-plugin/debian/patches/0001-daemon-Fix-possible-NULL-values-bug-6119-6120.patch	2010-05-30 16:47:59 UTC (rev 4110)
@@ -10,18 +10,18 @@
  1 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/daemon/gsd-clipboard-manager.c b/daemon/gsd-clipboard-manager.c
-index 494bb44..1edc068 100644
+index e5c85a4..1027dea 100644
 --- a/daemon/gsd-clipboard-manager.c
 +++ b/daemon/gsd-clipboard-manager.c
-@@ -119,7 +119,7 @@ default_clipboard_get_func (GtkClipboard *clipboard,
+@@ -121,7 +121,7 @@ default_clipboard_get_func (GtkClipboard *clipboard,
          GtkSelectionData *selection_data_cache = NULL;
  
          list = manager->priv->default_cache;
 -        for (; list->next != NULL; list = list->next) {
 +        for (; list != NULL && list->next != NULL; list = list->next) {
                  selection_data_cache = list->data;
-                 if (gtk_selection_data_get_target (selection_data) ==
-                     gtk_selection_data_get_target (selection_data_cache)) {
+                 if (selection_data->target == selection_data_cache->target) {
+                         break;
 @@ -154,8 +154,11 @@ default_clipboard_restore (GsdClipboardManager *manager)
          GtkSelectionData *sdata;
          GSList           *list;
@@ -34,7 +34,7 @@
 +        target_list = gtk_target_list_new (NULL, 0);
          for (; list->next != NULL; list = list->next) {
                  sdata = list->data;
-                 gtk_target_list_add (target_list,
+                 gtk_target_list_add (target_list, sdata->target, 0, 0);
 -- 
 1.6.3.3