rpms/empathy/F-12 refcount-fix.patch, NONE, 1.1 empathy.spec, 1.87, 1.88

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	empathy.spec 
Added Files:
	refcount-fix.patch 
Log Message:
fix patch name


refcount-fix.patch:
 empathy-accounts-dialog.c |    6 ++++++
 1 file changed, 6 insertions(+)

--- NEW FILE refcount-fix.patch ---
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index a22704f..339b6c5 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -1774,6 +1772,9 @@ do_constructor (GType type,
 
       dialog_singleton = EMPATHY_ACCOUNTS_DIALOG (retval);
       g_object_add_weak_pointer (retval, (gpointer) &dialog_singleton);
+      /* We add an extra reference that we'll release when the dialog is
+       * destroyed (accounts_dialog_destroy_cb) */
+      g_object_ref (retval);
     }
 
   return retval;
@@ -1912,6 +1913,9 @@ empathy_accounts_dialog_show (GtkWindow *parent,
     }
 
   gtk_window_present (GTK_WINDOW (priv->window));
+  /* EmpathyAccountsDialog kepts a ref on itself until the dialog is
+   * destroyed so we can release the ref returned by the constructor now. */
+  g_object_unref (dialog);
 
   return priv->window;
 }



Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- empathy.spec	29 Oct 2009 23:11:50 -0000	1.87
+++ empathy.spec	29 Oct 2009 23:21:38 -0000	1.88
@@ -33,8 +33,10 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
-# upstream fix
+# upstream fix: https://bugzilla.gnome.org/show_bug.cgi?id=599431
 Patch6:         escape-notifications.patch
+# upstream fix: https://bugzilla.gnome.org/show_bug.cgi?id=600023
+Patch7:         refcount-fix.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -140,6 +142,7 @@ bindings to the libempathy and libempath
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
 %patch6 -p1 -b .escape-notifications
+%patch7 -p1 -b .refcounting-fix
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -242,6 +245,7 @@ fi
 %changelog
 * Thu Oct 29 2009 Matthias Clasen <mclasen at redhat.com> - 2.28.1.1-3
 - Escape notifications
+- Fix a crash due to refcounting issues
 
 * Mon Oct 26 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.1.1-2
 - Disable panel applets, since they are unmaintained and being dropped from Empathy.