rpms/evolution/F-8 evolution-2.12.3-no-drag-finish.patch, NONE, 1.1 evolution.spec, 1.306, 1.307

Milan Crha (mcrha) fedora-extras-commits at redhat.com
Mon Mar 3 18:25:57 UTC 2008


Author: mcrha

Update of /cvs/pkgs/rpms/evolution/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10756

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.12.3-no-drag-finish.patch 
Log Message:
* Mon Mar 03 2008 Milan Crha <mcrha at redhat.com> - 2.12.3-2.fc8
- Add patch for GNOME bug #351672 (dragging IMAP messages locks X)



evolution-2.12.3-no-drag-finish.patch:

--- NEW FILE evolution-2.12.3-no-drag-finish.patch ---
diff -up evolution-2.12.3/mail/em-folder-tree.c.no-drag-finish evolution-2.12.3/mail/em-folder-tree.c
--- evolution-2.12.3/mail/em-folder-tree.c.no-drag-finish	2008-03-03 18:34:41.000000000 +0100
+++ evolution-2.12.3/mail/em-folder-tree.c	2008-03-03 18:34:45.000000000 +0100
@@ -927,23 +927,6 @@ emft_drop_async__exec (struct _DragDataR
 }
 
 static void
-emft_drop_async__done (struct _DragDataReceivedAsync *m)
-{
-	gboolean success, delete;
-	
-	/* ?? */
-	if (m->aborted) {
-		success = FALSE;
-		delete = FALSE;
-	} else {
-		success = !camel_exception_is_set (&m->base.ex);
-		delete = success && m->move && !m->moved;
-	}
-	
-	gtk_drag_finish (m->context, success, delete, GDK_CURRENT_TIME);
-}
-
-static void
 emft_drop_async__free (struct _DragDataReceivedAsync *m)
 {
 	g_object_unref(m->context);
@@ -958,7 +941,7 @@ static MailMsgInfo emft_drop_async_info 
 	sizeof (struct _DragDataReceivedAsync),
 	(MailMsgDescFunc) emft_drop_async__desc,
 	(MailMsgExecFunc) emft_drop_async__exec,
-	(MailMsgDoneFunc) emft_drop_async__done,
+	NULL,
 	(MailMsgFreeFunc) emft_drop_async__free
 };
 


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-8/evolution.spec,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -r1.306 -r1.307
--- evolution.spec	7 Jan 2008 17:31:48 -0000	1.306
+++ evolution.spec	3 Mar 2008 18:25:07 -0000	1.307
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -123,6 +123,9 @@
 # GNOME bug #454465
 Patch37: evolution-2.12.1-source-changed-event.patch
 
+# GNOME bug #351672
+Patch38: evolution-2.12.3-no-drag-finish.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -265,6 +268,7 @@
 %patch35 -p1 -b .mail-attachment
 %patch36 -p1 -b .icon-names
 %patch37 -p1 -b .source-changed-event
+%patch38 -p1 -b .no-drag-finish
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -715,6 +719,9 @@
 %dir %{_datadir}/omf/evolution
 
 %changelog
+* Mon Mar 03 2008 Milan Crha <mcrha at redhat.com> - 2.12.3-2.fc8
+- Add patch for GNOME bug #351672 (dragging IMAP messages locks X)
+
 * Mon Jan 07 2008 Milan Crha <mcrha at redhat.com> - 2.12.3-1.fc8
 - Update to 2.12.3
 - Removed patch for RH bug #215467 / GNOME bug #380644 (fixed upstream).




More information about the fedora-extras-commits mailing list