From 19bb53f6ab134bce6c7551cabe45b408d114307e Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 25 Mar 2011 16:34:08 +0000 Subject: [PATCH] Update to 2.91.93 --- .gitignore | 1 + ...gs-daemon-2.91.91-fix-updates-plugin.patch | 64 ------------------- gnome-settings-daemon.spec | 5 +- sources | 2 +- 4 files changed, 6 insertions(+), 66 deletions(-) delete mode 100644 gnome-settings-daemon-2.91.91-fix-updates-plugin.patch diff --git a/.gitignore b/.gitignore index 01a0063..33bc7c4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ gnome-settings-daemon-2.31.6.tar.bz2 /gnome-settings-daemon-2.91.90.tar.bz2 /gnome-settings-daemon-2.91.91.tar.bz2 /gnome-settings-daemon-2.91.92.tar.bz2 +/gnome-settings-daemon-2.91.93.tar.bz2 diff --git a/gnome-settings-daemon-2.91.91-fix-updates-plugin.patch b/gnome-settings-daemon-2.91.91-fix-updates-plugin.patch deleted file mode 100644 index ca95455..0000000 --- a/gnome-settings-daemon-2.91.91-fix-updates-plugin.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c -index d869712..64373bd 100644 ---- a/plugins/updates/gsd-updates-manager.c -+++ b/plugins/updates/gsd-updates-manager.c -@@ -350,15 +350,16 @@ notify_normal_updates_maybe (GsdUpdatesManager *manager, GPtrArray *array) - NotifyNotification *notification; - - /* find out if enough time has passed since the last notification */ -- time_now = g_get_real_time (); -+ time_now = g_get_real_time () / 1000000; - freq_updates_notify = g_settings_get_int (manager->priv->settings_gsd, - GSD_SETTINGS_FREQUENCY_UPDATES_NOTIFICATION); - g_settings_get (manager->priv->settings_gsd, - GSD_SETTINGS_LAST_UPDATES_NOTIFICATION, - "t", &time_last_notify); -- if ((guint64) freq_updates_notify < time_now - time_last_notify) { -- g_debug ("not showing non-critical notification as already shown %i days ago", -- (guint) (time_now - time_last_notify) / (24 * 60 * 60)); -+ if (time_last_notify > 0 && -+ (guint64) freq_updates_notify > time_now - time_last_notify) { -+ g_debug ("not showing non-critical notification as already shown %i hours ago", -+ (guint) (time_now - time_last_notify) / (60 * 60)); - return; - } - -@@ -835,6 +836,7 @@ get_updates_finished_cb (GObject *object, - if (update == GSD_UPDATE_TYPE_SECURITY) { - if (security_array->len == 0) { - g_debug ("policy security, but none available"); -+ notify_normal_updates_maybe (manager, array); - goto out; - } - -@@ -1405,7 +1407,7 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, - set_install_root (manager); - - /* load introspection from file */ -- file = g_file_new_for_path (DATADIR "/dbus-1/interfaces/org.gnome.ColorManager.xml"); -+ file = g_file_new_for_path (DATADIR "/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml"); - ret = g_file_load_contents (file, NULL, &introspection_data, NULL, NULL, error); - if (!ret) - goto out; -diff --git a/plugins/updates/gsd-updates-refresh.c b/plugins/updates/gsd-updates-refresh.c -index 9193358..15e6917 100644 ---- a/plugins/updates/gsd-updates-refresh.c -+++ b/plugins/updates/gsd-updates-refresh.c -@@ -506,7 +506,7 @@ session_presence_signal_cb (GDBusProxy *proxy, - if (g_strcmp0 (signal_name, "StatusChanged") != 0) - return; - -- /* map stauts code into boolean */ -+ /* map status code into boolean */ - g_variant_get (parameters, "(u)", &status); - refresh->priv->session_idle = (status == PRESENCE_STATUS_IDLE); - g_debug ("setting is_idle %i", -@@ -578,7 +578,7 @@ gsd_updates_refresh_init (GsdUpdatesRefresh *refresh) - refresh); - status = g_dbus_proxy_get_cached_property (refresh->priv->proxy_session, - "status"); -- g_variant_get (status, "(u)", &status_code); -+ g_variant_get (status, "u", &status_code); - refresh->priv->session_idle = (status_code == PRESENCE_STATUS_IDLE); - g_variant_unref (status); - } diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 309a90f..295cfe6 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -1,5 +1,5 @@ Name: gnome-settings-daemon -Version: 2.91.92 +Version: 2.91.93 Release: 1%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications @@ -193,6 +193,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh %changelog +* Fri Mar 25 2011 Bastien Nocera 2.91.93-1 +- Update to 2.91.93 + * Mon Mar 21 2011 Matthias Clasen 2.91.92-1 - Update 2.91.92 diff --git a/sources b/sources index c65aa06..91ce341 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -174414410a6bafbadc364cc15bfaf3ec gnome-settings-daemon-2.91.92.tar.bz2 +840fc84829f4a9587546ad40dd2da39c gnome-settings-daemon-2.91.93.tar.bz2