rpms/empathy/F-7 empathy-svn380-fix-contact-DnD.patch, NONE, 1.1 empathy.spec, 1.5, 1.6

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/extras/rpms/empathy/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6272/F-7

Modified Files:
	empathy.spec 
Added Files:
	empathy-svn380-fix-contact-DnD.patch 
Log Message:
Add patch from upstream SVN for GNOME bug 483168 (crash with DnD of contact to conversation window).

empathy-svn380-fix-contact-DnD.patch:

--- NEW FILE empathy-svn380-fix-contact-DnD.patch ---
diff -U0 ./ChangeLog.old ./ChangeLog
--- ./ChangeLog.old	2007-10-19 10:01:30.000000000 -0700
+++ ./ChangeLog	2007-10-19 10:02:29.000000000 -0700
@@ -0,0 +1,4 @@
+2007-10-19  Xavier Claessens  <xclaesse at gmail.com>
+	* libempathy-gtk/empathy-chat-window.c: If EmpathyChat object does not
+	exist when DnD a contact, create one. Fixes bug #483168.
+
diff -up ./libempathy-gtk/empathy-chat-window.c.old ./libempathy-gtk/empathy-chat-window.c
--- ./libempathy-gtk/empathy-chat-window.c.old	2007-10-19 10:02:50.000000000 -0700
+++ ./libempathy-gtk/empathy-chat-window.c	2007-10-19 10:04:48.000000000 -0700
@@ -1607,11 +1607,17 @@ chat_window_drag_data_received (GtkWidge
 		
 		account = empathy_contact_get_account (contact);
 		chat = empathy_chat_window_find_chat (account, id);
+		if (chat) {
+			g_object_ref (chat);
+		} else {
+			chat = EMPATHY_CHAT (empathy_private_chat_new_with_contact (contact));
+		}		
 		old_window = empathy_chat_get_window (chat);
 		
 		if (old_window) {
 			if (old_window == window) {
 				gtk_drag_finish (context, TRUE, FALSE, time);
+				g_object_unref(chat);
 				return;
 			}
 			


Index: empathy.spec
===================================================================
RCS file: /cvs/extras/rpms/empathy/F-7/empathy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- empathy.spec	16 Oct 2007 23:45:45 -0000	1.5
+++ empathy.spec	19 Oct 2007 19:02:26 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		empathy
 Version:	0.12
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GNOME Instant Messaging Client
 
 Group:		Applications/Communications
@@ -8,6 +8,7 @@
 URL:		http://live.gnome.org/Empathy
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
+Patch0: 	%{name}-svn380-fix-contact-DnD.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	aspell-devel
@@ -61,6 +62,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .fix-contact-DnD
 
 
 %build
@@ -151,6 +153,14 @@
 
 
 %changelog
+* Fri Oct 19 2007 Peter Gordon <peter at thecodergeek.com> - 0.12-3
+- Backport upstream patch to fixes crashes when using drag-and-drop of a
+  contact from the buddy list to the current conversation window to initiate a
+  conversation:
+    + svn380-fix-contact-DnD.patch 
+- Resolves: GNOME bug 483168 (crash in Empathy Instant Messenger: I had
+  dragged a contact ...) 
+
 * Tue Oct 16 2007 Peter Gordon <peter at thecodergeek.com> - 0.12-2
 - Depend on Salut and Gabble to enable XMPP by default. Otherwise, Empathy
   is essentially useless due to the need to install an external connection