rpms/gjs/F-13 dbus-Remove-additional-incorrect-variant-in-GetAll.patch, NONE, 1.1 gjs.spec, 1.7, 1.8

[Colin Walters]

Author: walters

Update of /cvs/pkgs/rpms/gjs/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21055

Modified Files:
	gjs.spec 
Added Files:
	dbus-Remove-additional-incorrect-variant-in-GetAll.patch 
Log Message:
* Mon Jun 07 2010 Colin Walters <walters at verbum.org> 0.6-2
- Add patch which fixes gnome-shell message tray


dbus-Remove-additional-incorrect-variant-in-GetAll.patch:
 dbus-exports.c |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

--- NEW FILE dbus-Remove-additional-incorrect-variant-in-GetAll.patch ---
>From d2c93adb9f4993053b5b911814a85b7a92ebc57b Mon Sep 17 00:00:00 2001
From: Colin Walters <walters at verbum.org>
Date: Thu, 3 Jun 2010 17:54:41 -0400
Subject: [PATCH] [dbus] Remove additional incorrect variant in GetAll

The code in GetAll was giving "v" as the signature to conform
individual property values to, and ignoring the specified property
signature, which is wrong.

Instead, open a variant container, and pass the correct signature
when formatting a value.

https://bugzilla.gnome.org/show_bug.cgi?id=619975
---
 modules/dbus-exports.c |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/dbus-exports.c b/modules/dbus-exports.c
index fcb0393..5bff0b2 100644
--- a/modules/dbus-exports.c
+++ b/modules/dbus-exports.c
@@ -1144,6 +1144,7 @@ handle_get_all_properties(JSContext      *context,
             jsval property_val;
             PropertyDetails details;
             DBusMessageIter entry_iter;
+            DBusMessageIter entry_value_iter;
             DBusSignatureIter sig_iter;
             jsval value;
 
@@ -1191,18 +1192,24 @@ handle_get_all_properties(JSContext      *context,
             dbus_message_iter_append_basic(&entry_iter, DBUS_TYPE_STRING,
                                            &details.name);
 
-            property_details_clear(&details);
 
-            dbus_signature_iter_init(&sig_iter, "v");
-            if (!gjs_js_one_value_to_dbus(context, value, &entry_iter,
+            dbus_message_iter_open_container(&entry_iter, DBUS_TYPE_VARIANT,
+                                             details.signature, &entry_value_iter);
+
+            dbus_signature_iter_init(&sig_iter, details.signature);
+            if (!gjs_js_one_value_to_dbus(context, value, &entry_value_iter,
                                           &sig_iter)) {
+                dbus_message_iter_abandon_container(&entry_iter, &entry_value_iter);
                 JS_RemoveRoot(context, &value);
+                property_details_clear(&details);
                 goto js_exception;
             }
+            dbus_message_iter_close_container(&entry_iter, &entry_value_iter);
 
             JS_RemoveRoot(context, &value);
 
             dbus_message_iter_close_container(&dict_iter, &entry_iter);
+            property_details_clear(&details);
         }
     }
 
-- 
1.7.0.1



Index: gjs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gjs/F-13/gjs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- gjs.spec	25 Mar 2010 10:51:24 -0000	1.7
+++ gjs.spec	7 Jun 2010 17:54:34 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           gjs
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Javascript Bindings for GNOME
 
 Group:          System Environment/Libraries
@@ -11,6 +11,8 @@ Group:          System Environment/Libra
 License:        MIT and (MPLv1.1 or GPLv2+ or LGPLv2+)
 URL:            http://live.gnome.org/Gjs/
 #VCS:           git://git.gnome.org/gjs
+# Cherrypicked from upstream vcs
+Patch1: dbus-Remove-additional-incorrect-variant-in-GetAll.patch
 Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,6 +37,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -80,6 +83,9 @@ rm -rf %{buildroot}
 %{_libdir}/*.so
 
 %changelog
+* Mon Jun 07 2010 Colin Walters <walters at verbum.org> 0.6-2
+- Add patch which fixes gnome-shell message tray
+
 * Wed Mar 24 2010 Peter Robinson <pbrobinson at gmail.com> 0.6-1
 - New upstream 0.6 stable release