[gnome-documents] Fix #735341

Elad Alfassa elad at fedoraproject.org
Sat Sep 3 10:43:27 UTC 2011


commit 65cd4c69cfc11645b1b578044e735669a9cecf43
Author: Elad Alfassa <elad at fedoraproject.org>
Date:   Sat Sep 3 13:42:07 2011 +0300

    Fix #735341

 ...ix-account.get_id-is-not-a-function-error.patch |   36 ++++++++++++++++++++
 gnome-documents.spec                               |    8 +++-
 2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/0001-Fix-account.get_id-is-not-a-function-error.patch b/0001-Fix-account.get_id-is-not-a-function-error.patch
new file mode 100644
index 0000000..041a941
--- /dev/null
+++ b/0001-Fix-account.get_id-is-not-a-function-error.patch
@@ -0,0 +1,36 @@
+From d84abb894a3cb6d8fe4244a47d7d450920677b22 Mon Sep 17 00:00:00 2001
+From: Michel Alexandre Salim <salimma at fedoraproject.org>
+Date: Sat, 3 Sep 2011 12:26:56 +0200
+Subject: [PATCH] Access Account fields directly, not through getter functions
+
+Per David Zeuthen
+(https://bugzilla.redhat.com/show_bug.cgi?id=735341#c2):
+
+gdbus-codegen(1) now uses (skip) annotation on generated C property
+getters - it is better, and thread-safe, to access the GObject property
+directly via e.g. account_id
+
+Signed-off-by: Michel Alexandre Salim <salimma at fedoraproject.org>
+---
+ src/sources.js |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sources.js b/src/sources.js
+index 629ff35..f703cd1 100644
+--- a/src/sources.js
++++ b/src/sources.js
+@@ -48,8 +48,8 @@ Source.prototype = {
+             this.object = params.object;
+ 
+             let account = this.object.get_account();
+-            this.id = account.get_id();
+-            this.name = account.get_provider_name();
++            this.id = account.id;
++            this.name = account.provider_name;
+         } else {
+             this.id = params.id;
+             this.name = params.name;
+-- 
+1.7.6.1
+
+
diff --git a/gnome-documents.spec b/gnome-documents.spec
index 1b5f190..5f63fd8 100644
--- a/gnome-documents.spec
+++ b/gnome-documents.spec
@@ -1,11 +1,12 @@
 Name:           gnome-documents
 Version:        0.1.90
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A document manager application for GNOME
 
 License:        GPLv2+
 URL:            https://live.gnome.org/Design/Apps/Documents
 Source0:        http://ftp.acc.umu.se/pub/GNOME/sources/%{name}/0.1/%{name}-%{version}.tar.xz
+Patch0:         0001-Fix-account.get_id-is-not-a-function-error.patch
 
 BuildRequires:  intltool
 BuildRequires:  libgdata-devel
@@ -32,7 +33,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 %configure --disable-static
@@ -76,6 +77,9 @@ fi
 %{_datadir}/gir-1.0
 
 %changelog
+* Sat Sep 03 2011 Elad Alfassa <elad at fedoraproject.org> - 0.1.90-2
+- Fix #735341
+
 * Fri Sep 02 2011 Elad Alfassa <elad at fedoraproject.org> - 0.1.90-1
 - Initial packaging.
 


More information about the scm-commits mailing list