From 6affb73c37e0342c8c78de52db3e961f2a3e8c19 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 1 Dec 2009 15:04:07 +0000 Subject: [PATCH] remove obsoleted patch --- file-roller.spec | 4 ---- sticky-dnd.patch | 53 ------------------------------------------------ 2 files changed, 57 deletions(-) delete mode 100644 sticky-dnd.patch diff --git a/file-roller.spec b/file-roller.spec index 9f5e5fd..d784580 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -17,9 +17,6 @@ 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} @@ -54,7 +51,6 @@ such as tar or zip files. %prep %setup -q -%patch0 -p1 -b .sticky-dnd %build %configure --disable-scrollkeeper --disable-static diff --git a/sticky-dnd.patch b/sticky-dnd.patch deleted file mode 100644 index 75e0ec7..0000000 --- a/sticky-dnd.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- 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) - {