rpms/empathy/F-12 0001-dispatcher_request_handles_cb-use-request_data-dispa.patch, NONE, 1.1 empathy.spec, 1.83, 1.84

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11538

Modified Files:
	empathy.spec 
Added Files:
	0001-dispatcher_request_handles_cb-use-request_data-dispa.patch 
Log Message:
another crash fix


0001-dispatcher_request_handles_cb-use-request_data-dispa.patch:
 empathy-dispatcher.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-dispatcher_request_handles_cb-use-request_data-dispa.patch ---
>From 054f27602448890116a67447e07032eb228bc82c Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date: Mon, 26 Oct 2009 15:31:26 +0000
Subject: [PATCH] dispatcher_request_handles_cb: use request_data->dispatcher to get the self pointer

We don't pass a weak pointer to tp_cli_connection_call_request_handles
so we can't rely on it (#599612).
---
 libempathy/empathy-dispatcher.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 1cb4189..5d20a16 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1445,7 +1445,7 @@ dispatcher_request_handles_cb (TpConnection *connection,
 
   if (error != NULL)
     {
-      EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
+      EmpathyDispatcher *dispatcher = request_data->dispatcher;
       EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
       ConnectionData *cd;
 
-- 
1.6.5.1



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- empathy.spec	26 Oct 2009 00:15:24 -0000	1.83
+++ empathy.spec	26 Oct 2009 15:46:10 -0000	1.84
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -37,6 +37,7 @@ Patch5:		%{name}-broken-nm.patch
 Patch6: 0001-empathy-protocol-chooser-don-t-cache-TpConnectionMan.patch
 Patch7: 0002-empathy-chat-window-Don-t-update-the-Contact-menu-if.patch
 Patch8: 0003-Fix-crash-when-joining-a-chat-GTK_WIDGET_VISIBLE-is-.patch
+Patch9: 0001-dispatcher_request_handles_cb-use-request_data-dispa.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -144,6 +145,7 @@ bindings to the libempathy and libempath
 %patch6 -p1 -b .dont-cache-conman
 %patch7 -p1 -b .dont-update-contacts
 %patch8 -p1 -b .join-chat-crash
+%patch9 -p1 -b .room-typo-crash
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -252,6 +254,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Mon Oct 26 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-3
+- Another upstream crash fix
+
 * Sun Oct 25 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1-2
 - Include a number of crash fixes from the stable branch