From 1238a8d0586c54b89cba0c9b03a26260b8df8d2f Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 11 Nov 2011 13:04:51 +0000 Subject: [PATCH] Update to 3.2.2 --- .gitignore | 1 + gnome-settings-daemon.spec | 15 +++-- gsd-printer-object-registration.patch | 93 --------------------------- sources | 2 +- 4 files changed, 11 insertions(+), 100 deletions(-) delete mode 100644 gsd-printer-object-registration.patch diff --git a/.gitignore b/.gitignore index ea3112b..c206e9b 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ gnome-settings-daemon-2.31.6.tar.bz2 /gnome-settings-daemon-3.1.92.tar.xz /gnome-settings-daemon-3.2.0.tar.xz /gnome-settings-daemon-3.2.1.tar.xz +/gnome-settings-daemon-3.2.2.tar.xz diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 3dc0d3c..bc6ade6 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,15 +1,16 @@ Name: gnome-settings-daemon -Version: 3.2.1 -Release: 4%{?dist} +Version: 3.2.2 +Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications Group: System Environment/Daemons License: GPLv2+ URL: http://download.gnome.org/sources/%{name} #VCS: git:git://git.gnome.org/gnome-settings-daemon -Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz + +# Fedora specific patch Patch0: gsd-calculator.patch -Patch1: gsd-printer-object-registration.patch Requires(pre): GConf2 >= 2.14 Requires(preun): GConf2 >= 2.14 @@ -60,8 +61,7 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 -b .gsd-printer +%patch0 -p1 -b .calc # autoreconf -i -f @@ -217,6 +217,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh %changelog +* Fri Nov 11 2011 Bastien Nocera 3.2.2-1 +- Update to 3.2.2 + * Wed Oct 26 2011 Fedora Release Engineering - 3.2.1-4 - Rebuilt for glibc bug#747377 diff --git a/gsd-printer-object-registration.patch b/gsd-printer-object-registration.patch deleted file mode 100644 index d64f54e..0000000 --- a/gsd-printer-object-registration.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/plugins/print-notifications/gsd-printer.c b/plugins/print-notifications/gsd-printer.c -index c1c2235..63481e1 100644 ---- a/plugins/print-notifications/gsd-printer.c -+++ b/plugins/print-notifications/gsd-printer.c -@@ -1140,14 +1140,20 @@ on_npn_bus_acquired (GDBusConnection *connection, - const gchar *name, - gpointer user_data) - { -+ GError *error = NULL; -+ - npn_registration_id = g_dbus_connection_register_object (connection, - SCP_DBUS_NPN_PATH, - npn_introspection_data->interfaces[0], - &interface_vtable, - NULL, - NULL, -- NULL); -- g_assert (npn_registration_id > 0); -+ &error); -+ -+ if (npn_registration_id == 0) { -+ g_warning ("Failed to register object: %s\n", error->message); -+ g_error_free (error); -+ } - } - - static void -@@ -1155,14 +1161,20 @@ on_pdi_bus_acquired (GDBusConnection *connection, - const gchar *name, - gpointer user_data) - { -+ GError *error = NULL; -+ - pdi_registration_id = g_dbus_connection_register_object (connection, - SCP_DBUS_PDI_PATH, -- npn_introspection_data->interfaces[0], -+ pdi_introspection_data->interfaces[0], - &interface_vtable, - NULL, - NULL, -- NULL); -- g_assert (npn_registration_id > 0); -+ &error); -+ -+ if (pdi_registration_id == 0) { -+ g_warning ("Failed to register object: %s\n", error->message); -+ g_error_free (error); -+ } - } - - static void -@@ -1351,12 +1363,22 @@ main (int argc, char *argv[]) - notify_init ("gnome-settings-daemon-printer"); - - npn_introspection_data = -- g_dbus_node_info_new_for_xml (npn_introspection_xml, NULL); -- g_assert (npn_introspection_data != NULL); -+ g_dbus_node_info_new_for_xml (npn_introspection_xml, &error); -+ -+ if (npn_introspection_data == NULL) { -+ g_warning ("Error parsing introspection XML: %s\n", error->message); -+ g_error_free (error); -+ goto error; -+ } - - pdi_introspection_data = -- g_dbus_node_info_new_for_xml (pdi_introspection_xml, NULL); -- g_assert (pdi_introspection_data != NULL); -+ g_dbus_node_info_new_for_xml (pdi_introspection_xml, &error); -+ -+ if (pdi_introspection_data == NULL) { -+ g_warning ("Error parsing introspection XML: %s\n", error->message); -+ g_error_free (error); -+ goto error; -+ } - - connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); - -@@ -1426,4 +1448,14 @@ main (int argc, char *argv[]) - g_dbus_node_info_unref (pdi_introspection_data); - - return 0; -+ -+error: -+ -+ if (npn_introspection_data) -+ g_dbus_node_info_unref (npn_introspection_data); -+ -+ if (pdi_introspection_data) -+ g_dbus_node_info_unref (pdi_introspection_data); -+ -+ return 1; - } diff --git a/sources b/sources index 598f400..8186a97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a410fc235418ac74c5a79cb0fd5a3199 gnome-settings-daemon-3.2.1.tar.xz +eb21af36feace3529965ebe17a063d63 gnome-settings-daemon-3.2.2.tar.xz