[empathy/f18] Fix GNOME #687762
Debarshi Ray
rishi at fedoraproject.org
Mon Nov 12 13:25:29 UTC 2012
commit 239fc866058b687dad0de276ce8802a64863ab6e
Author: Debarshi Ray <debarshir at gnome.org>
Date: Mon Nov 12 14:25:23 2012 +0100
Fix GNOME #687762
...-Don-t-unref-properties-before-creating-t.patch | 35 ++++++++++++++++++++
empathy.spec | 7 +++-
2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-auth-client-Don-t-unref-properties-before-creating-t.patch b/0001-auth-client-Don-t-unref-properties-before-creating-t.patch
new file mode 100644
index 0000000..2ecc8e3
--- /dev/null
+++ b/0001-auth-client-Don-t-unref-properties-before-creating-t.patch
@@ -0,0 +1,35 @@
+From 547efabcc71b16044e7776d41262c0f66aaf6eb1 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at src.gnome.org>
+Date: Tue, 6 Nov 2012 15:31:06 +0100
+Subject: [PATCH] auth-client: Don't unref properties before creating the
+ certificate
+
+Fixes: https://bugzilla.gnome.org/687762
+---
+ libempathy/empathy-server-tls-handler.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libempathy/empathy-server-tls-handler.c b/libempathy/empathy-server-tls-handler.c
+index 7a6bdf1..d58155f 100644
+--- a/libempathy/empathy-server-tls-handler.c
++++ b/libempathy/empathy-server-tls-handler.c
+@@ -148,14 +148,14 @@ tls_handler_init_async (GAsyncInitable *initable,
+ "&o", &cert_object_path);
+ bus_name = tp_proxy_get_bus_name (TP_PROXY (priv->channel));
+
+- g_variant_unref (properties);
+-
+ DEBUG ("Creating an TpTLSCertificate for path %s, bus name %s",
+ cert_object_path, bus_name);
+
+ priv->certificate = tp_tls_certificate_new (TP_PROXY (priv->channel),
+ cert_object_path, &error);
+
++ g_variant_unref (properties);
++
+ if (error != NULL)
+ {
+ DEBUG ("Unable to create the TpTLSCertificate: error %s",
+--
+1.8.0
+
diff --git a/empathy.spec b/empathy.spec
index db2ca48..447d4dd 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -17,7 +17,7 @@
Name: empathy
Version: 3.6.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Instant Messaging Client for GNOME
License: GPLv2+
@@ -29,6 +29,7 @@ Patch0: 0001-empathy-call-Clean-up-the-TfChannel-before-resetting.patch
Patch1: 0002-empathy-call-Free-the-FsElementAddedNotifiers-on-fs-.patch
Patch2: 0001-Implement-Google-OAUTH2-authentication-for-GOA-accou.patch
Patch3: 0002-auth-client-Support-X-TELEPATHY-PASSWORD-for-GOA-acc.patch
+Patch4: 0001-auth-client-Don-t-unref-properties-before-creating-t.patch
BuildRequires: enchant-devel >= %{enchant_version}
BuildRequires: iso-codes-devel
@@ -91,6 +92,7 @@ rm data/empathy.desktop
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
@@ -199,6 +201,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%{_datadir}/adium/message-styles/PlanetGNOME.AdiumMessageStyle/Contents/Resources/main.css
%changelog
+* Mon Nov 12 2012 Debarshi Ray <rishi at fedoraproject.org> - 3.6.1-4
+- Fix GNOME #687762
+
* Wed Nov 7 2012 Debarshi Ray <rishi at fedoraproject.org> - 3.6.1-3
- Fix GNOME #652546 and #687690
More information about the scm-commits
mailing list