[claws-mail] 3.8.0-3 merge fix for expanded mimeview drag'n'drop (#783399)

[Michael Schwendt]

commit edf816ec9cf91facaeb3e58d3dec46c569298b0d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Sun Jan 22 01:56:45 2012 +0100

    3.8.0-3
    merge fix for expanded mimeview drag'n'drop (#783399)

 claws-mail-3.8.0cvs15.patch |   67 +++++++++++++++++++++++++++++++++++++++++++
 claws-mail.spec             |   10 ++++++-
 2 files changed, 76 insertions(+), 1 deletions(-)
---
diff --git a/claws-mail-3.8.0cvs15.patch b/claws-mail-3.8.0cvs15.patch
new file mode 100644
index 0000000..b3981b9
--- /dev/null
+++ b/claws-mail-3.8.0cvs15.patch
@@ -0,0 +1,67 @@
+Index: src/mimeview.c
+===================================================================
+RCS file: //claws/src/mimeview.c,v
+retrieving revision 1.83.2.187
+retrieving revision 1.83.2.188
+diff -u -r1.83.2.187 -r1.83.2.188
+--- src/mimeview.c	29 Dec 2011 23:16:22 -0000	1.83.2.187
++++ src/mimeview.c	20 Jan 2012 22:30:03 -0000	1.83.2.188
+@@ -89,10 +89,6 @@
+ 
+ static void mimeview_selected		(GtkTreeSelection	*selection,
+ 					 MimeView	*mimeview);
+-static void mimeview_start_drag 	(GtkWidget	*widget,
+-					 gint		 button,
+-					 GdkEvent	*event,
+-					 MimeView	*mimeview);
+ static gint mimeview_button_pressed	(GtkWidget	*widget,
+ 					 GdkEventButton	*event,
+ 					 MimeView	*mimeview);
+@@ -337,16 +333,16 @@
+ 
+ 	gtk_widget_show(ctree);
+ 	gtk_container_add(GTK_CONTAINER(scrolledwin), ctree);
++	gtk_drag_source_set(ctree, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, 
++			    mimeview_mime_types, 1, GDK_ACTION_COPY);
+ 
+ 	g_signal_connect(G_OBJECT(selection), "changed",
+ 			 G_CALLBACK(mimeview_selected), mimeview);
+-	g_signal_connect(G_OBJECT(ctree), "button-release-event",
++	g_signal_connect(G_OBJECT(ctree), "button_release_event",
+ 			 G_CALLBACK(mimeview_button_pressed), mimeview);
+-	g_signal_connect(G_OBJECT(ctree), "key-press-event",
++	g_signal_connect(G_OBJECT(ctree), "key_press_event",
+ 			 G_CALLBACK(mimeview_key_pressed), mimeview);
+-	g_signal_connect(G_OBJECT (ctree),"drag-begin",
+-			 G_CALLBACK (mimeview_start_drag), mimeview);
+-	g_signal_connect(G_OBJECT(ctree), "drag-data-get",
++	g_signal_connect(G_OBJECT(ctree), "drag_data_get",
+ 			 G_CALLBACK(mimeview_drag_data_get), mimeview);
+ 
+ 	mime_notebook = gtk_notebook_new();
+@@ -1449,24 +1445,6 @@
+ 	}
+ }
+ 
+-static void mimeview_start_drag(GtkWidget *widget, gint button,
+-				GdkEvent *event, MimeView *mimeview)
+-{
+-	GdkDragContext *context;
+-	MimeInfo *partinfo;
+-
+-	cm_return_if_fail(mimeview != NULL);
+-
+-	partinfo = mimeview_get_selected_part(mimeview);
+-	if (partinfo == NULL || 
+-	    partinfo->disposition == DISPOSITIONTYPE_INLINE)
+-		return;
+-
+-	context = gtk_drag_begin(widget, mimeview->target_list,
+-				 GDK_ACTION_COPY, button, event);
+-	gtk_drag_set_icon_default(context);
+-}
+-
+ static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
+ 				    MimeView *mimeview)
+ {
+
diff --git a/claws-mail.spec b/claws-mail.spec
index 9ae8a4e..02d4397 100644
--- a/claws-mail.spec
+++ b/claws-mail.spec
@@ -2,13 +2,16 @@
 
 Name:           claws-mail
 Version:        3.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Email client and news reader based on GTK+
 Group:          Applications/Internet
 License:        GPLv3+
 URL:            http://claws-mail.org
 Source0:        http://downloads.sourceforge.net/sylpheed-claws/%{name}-%{version}.tar.bz2
 
+# 783399, upstream 2582
+Patch0: claws-mail-3.8.0cvs15.patch
+
 BuildRequires:  flex, bison
 BuildRequires:  glib2-devel >= 2.6.2
 BuildRequires:  gtk2-devel >= 2.10.0
@@ -113,6 +116,7 @@ mails, verify signatures or sign and encrypt your own mails.
 
 %prep
 %setup -q
+%patch0 -p0 -b .cvs15-mimeview
 
 # guard for pluginapi
 SOURCEAPI=$(grep -A 1 VERSION_NUMERIC src/common/version.h | tr -d '\n' | perl -ne 's/[\\\s]//g; m/(\d+),(\d+),(\d+),(\d+)/; print("$1.$2.$3.$4");')
@@ -228,6 +232,10 @@ fi
 %{_libdir}/claws-mail/plugins/smime.deps
 
 %changelog
+* Sun Jan 22 2012 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.8.0-3
+- merge fix for expanded mimeview drag'n'drop (#783399)
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild