rpms/file-roller/devel sticky-dnd.patch, NONE, 1.1 file-roller.spec, 1.156, 1.157 sources, 1.93, 1.94 cab.patch, 1.1, NONE

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/file-roller/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22437

Modified Files:
	file-roller.spec sources 
Added Files:
	sticky-dnd.patch 
Removed Files:
	cab.patch 
Log Message:
Copy F12 work over


sticky-dnd.patch:
 eggtreemultidnd.c |   37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

--- NEW FILE sticky-dnd.patch ---
--- file-roller-2.28.1/src/eggtreemultidnd.c	2009-10-19 13:53:45.000000000 -0400
+++ hacked/src/eggtreemultidnd.c	2009-10-29 23:23:12.660790804 -0400
@@ -179,8 +179,14 @@
   priv_data->event_list = NULL;
   priv_data->pending_event = FALSE;
 
-  g_signal_handler_disconnect (widget, priv_data->motion_notify_handler);
-  g_signal_handler_disconnect (widget, priv_data->button_release_handler);
+  if (priv_data->motion_notify_handler) {
+    g_signal_handler_disconnect (widget, priv_data->motion_notify_handler);
+    priv_data->motion_notify_handler = 0;
+  }
+  if (priv_data->button_release_handler) {
+    g_signal_handler_disconnect (widget, priv_data->button_release_handler);
+    priv_data->button_release_handler = 0;
+  }
 }
 
 
@@ -401,16 +407,23 @@
 	priv_data->event_list = g_slist_append (priv_data->event_list,
 						gdk_event_copy ((GdkEvent*)event));
 
-      priv_data->motion_notify_handler =
-	g_signal_connect (G_OBJECT (tree_view),
-			  "motion_notify_event",
-			  G_CALLBACK (egg_tree_multi_drag_motion_event),
-			  NULL);
-      priv_data->button_release_handler =
-	g_signal_connect (G_OBJECT (tree_view),
-			  "button_release_event",
-			  G_CALLBACK (egg_tree_multi_drag_button_release_event),
-			  NULL);
+      if (priv_data->motion_notify_handler == 0)
+        {
+          priv_data->motion_notify_handler =
+	    g_signal_connect (G_OBJECT (tree_view),
+	  		      "motion_notify_event",
+			      G_CALLBACK (egg_tree_multi_drag_motion_event),
+			      NULL);
+        }
+
+      if (priv_data->button_release_handler == 0)
+        {
+          priv_data->button_release_handler =
+	    g_signal_connect (G_OBJECT (tree_view),
+	 		      "button_release_event",
+			      G_CALLBACK (egg_tree_multi_drag_button_release_event),
+			      NULL);
+        }
 
       if (priv_data->drag_data_get_handler == 0)
 	{


Index: file-roller.spec
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -p -r1.156 -r1.157
--- file-roller.spec	22 Sep 2009 00:51:25 -0000	1.156
+++ file-roller.spec	2 Nov 2009 05:55:51 -0000	1.157
@@ -10,13 +10,16 @@
 
 Summary:	Tool for viewing and creating archives
 Name:		file-roller
-Version:	2.28.0
-Release: 	1%{?dist}
+Version:	2.28.1
+Release: 	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Archiving
 URL:		http://download.gnome.org/sources/file-roller/
 Source:		http://download.gnome.org/sources/file-roller/2.28/file-roller-%{version}.tar.bz2
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=590606
+Patch0:		sticky-dnd.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -51,6 +54,7 @@ such as tar or zip files.
 
 %prep
 %setup -q
+%patch0 -p1 -b .sticky-dnd
 
 %build
 %configure --disable-scrollkeeper --disable-static
@@ -127,6 +131,15 @@ fi
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
 
 %changelog
+* Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-2
+- Fix sticky DND
+
+* Mon Oct 19 2009 Matthias Clasen <mclasen at redhat.com> 2.28.1-1
+- Update to 2.28.1
+
+* Thu Oct  1 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-2
+- Respect button-images setting
+
 * Mon Sep 21 2009 Matthias Clasen <mclasen at redhat.com> 2.28.0-1
 - Update to 2.28.0
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/file-roller/devel/sources,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -p -r1.93 -r1.94
--- sources	22 Sep 2009 00:51:25 -0000	1.93
+++ sources	2 Nov 2009 05:55:52 -0000	1.94
@@ -1 +1 @@
-dcb0c887d5d287a28ebb5c0ea69bedfa  file-roller-2.28.0.tar.bz2
+fcba40a9aa04386dec961a2f776777c5  file-roller-2.28.1.tar.bz2


--- cab.patch DELETED ---