rpms/empathy/devel empathy-svn380-fix-contact-DnD.patch, NONE, 1.1 empathy.spec, 1.11, 1.12
Peter Gordon (pgordon)
fedora-extras-commits at redhat.com
Fri Oct 19 18:36:29 UTC 2007
Author: pgordon
Update of /cvs/extras/rpms/empathy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31380/devel
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
@@ -1624,11 +1624,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/devel/empathy.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- empathy.spec 16 Oct 2007 22:58:59 -0000 1.11
+++ empathy.spec 19 Oct 2007 18:35:57 -0000 1.12
@@ -10,7 +10,7 @@
Name: empathy
Version: 0.14
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: GNOME Instant Messaging Client
Group: Applications/Communications
@@ -18,6 +18,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
@@ -100,6 +101,7 @@
%prep
%setup -q
+%patch0 -p0 -b .fix-contact-DnD
%build
@@ -207,6 +209,14 @@
%changelog
+* Fri Oct 19 2007 Peter Gordon <peter at thecodergeek.com> - 0.14-5
+- 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.14-4
- Depend on Salut and Gabble to enable XMPP by default. Otherwise, Empathy
is essentially useless due to the need to install an external connection
More information about the fedora-extras-commits
mailing list