rpms/evolution/devel evolution-2.9.5-change-msgport-semantics.patch, NONE, 1.1 evolution.spec, 1.223, 1.224

[fedora-cvs-commits redhat com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16017

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.9.5-change-msgport-semantics.patch 
Log Message:

* Wed Jan 10 2007 Matthew Barnes <mbarnes redhat com> - 2.9.5-2.fc7
- Add patch for GNOME bug #359979 (change EMsgPort semantics).


evolution-2.9.5-change-msgport-semantics.patch:
 em-sync-stream.c |    5 +++--
 mail-session.c   |    3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE evolution-2.9.5-change-msgport-semantics.patch ---
--- evolution-2.9.5/mail/em-sync-stream.c.change-msgport-semantics	2007-01-10 11:11:19.000000000 -0500
+++ evolution-2.9.5/mail/em-sync-stream.c	2007-01-10 11:16:08.000000000 -0500
@@ -214,6 +214,7 @@
 {
 	struct _EMSyncStreamPrivate *p = emss->priv;
 	struct _write_msg msg;
+	EMsg *reply_msg;
 
 	d(printf("%p: launching sync op %d\n", emss, op));
 
@@ -226,9 +227,9 @@
 	msg.n = n;
 
 	e_msgport_put(p->data_port, &msg.msg);
-	e_msgport_wait(p->reply_port);
+	reply_msg = e_msgport_wait(p->reply_port);
+	g_assert(reply_msg == &msg.msg);
 
-	g_assert(e_msgport_get(msg.msg.reply_port) == &msg.msg);
 	d(printf("%p: returned sync op %d\n", emss, op));
 }
 
--- evolution-2.9.5/mail/mail-session.c.change-msgport-semantics	2007-01-10 11:11:19.000000000 -0500
+++ evolution-2.9.5/mail/mail-session.c	2007-01-10 11:16:08.000000000 -0500
@@ -386,8 +386,7 @@
 	}
 
 	if (cancel) {
-		e_msgport_wait(user_message_reply);
-		r = (struct _user_message_msg *)e_msgport_get(user_message_reply);
+		r = (struct _user_message_msg *)e_msgport_wait(user_message_reply);
 		g_assert(m == r);
 
 		ret = m->result;


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- evolution.spec	9 Jan 2007 02:53:59 -0000	1.223
+++ evolution.spec	10 Jan 2007 17:15:05 -0000	1.224
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 2.9.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -160,6 +160,9 @@
 # GNOME bug #218898
 Patch42: evolution-2.9.4-view-message-source.patch
 
+# GNOME bug #359979
+Patch43: evolution-2.9.5-change-msgport-semantics.patch
+
 ## Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -306,6 +309,7 @@
 %patch40 -p1 -b .meeting-list-view
 %patch41 -p1 -b .gtk-color-button
 %patch42 -p1 -b .view-message-source
+%patch43 -p1 -b .change-msgport-semantics
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -721,7 +725,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
-* Mon Jan 08 2008 Matthew Barnes <mbarnes redhat com> - 2.9.5-1.fc7
+* Wed Jan 10 2007 Matthew Barnes <mbarnes redhat com> - 2.9.5-2.fc7
+- Add patch for GNOME bug #359979 (change EMsgPort semantics).
+
+* Mon Jan 08 2007 Matthew Barnes <mbarnes redhat com> - 2.9.5-1.fc7
 - Update to 2.9.5
 - Remove pilot-link-0.12 patch (fixed upstream).
 - Remove patch for RH bug #215466 and #218589 (fixed upstream).