diff --git a/.gitignore b/.gitignore index b74d033..d945c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /cinnamon-screensaver-2.4.0.git8de7ff0.tar.gz /cinnamon-screensaver-2.4.0.tar.gz /cinnamon-screensaver-2.4.1.tar.gz +/cinnamon-screensaver-2.4.2.tar.gz diff --git a/0001-gnome-wall-clock.c-Fix-regressions-from-b021f6f07ad8.patch b/0001-gnome-wall-clock.c-Fix-regressions-from-b021f6f07ad8.patch deleted file mode 100644 index 3c2a2a0..0000000 --- a/0001-gnome-wall-clock.c-Fix-regressions-from-b021f6f07ad8.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 24f73e0170f7bdb2fab34a1fd9b7bf72fa0ce1aa Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Sun, 29 Mar 2015 11:01:24 -0400 -Subject: [PATCH] gnome-wall-clock.c: Fix regressions from - b021f6f07ad8b4295ddd755eadf3e031f4456fe6 - -https://bugzilla.redhat.com/show_bug.cgi?id=1206907#c11 ---- - src/gnome-wall-clock.c | 56 ++++++++++++++++++++++++++++---------------------- - 1 file changed, 31 insertions(+), 25 deletions(-) - -diff --git a/src/gnome-wall-clock.c b/src/gnome-wall-clock.c -index c7beefc..a88f874 100644 ---- a/src/gnome-wall-clock.c -+++ b/src/gnome-wall-clock.c -@@ -38,7 +38,8 @@ struct _GnomeWallClockPrivate { - - GFileMonitor *tz_monitor; - -- GSettings *settings; -+ GSettings *desktop_settings; -+ GSettings *screensaver_settings; - gboolean use_custom; - gchar *custom_time; - gchar *custom_date; -@@ -68,15 +69,14 @@ static void - settings_changed_cb (GSettings *settings, const gchar *key, gpointer user_data) - { - GnomeWallClock *self = user_data; -- self->priv->use_custom = g_settings_get_boolean (self->priv->settings, "use-custom-format"); -- self->priv->custom_time = g_settings_get_string (self->priv->settings, "time-format"); -- self->priv->custom_date = g_settings_get_string (self->priv->settings, "date-format"); -- self->priv->font_time = g_settings_get_string (self->priv->settings, "font-time"); -- self->priv->font_date = g_settings_get_string (self->priv->settings, "font-date"); -- -- -- self->priv->show_date = g_settings_get_boolean (settings, "clock-show-date"); -- self->priv->use_24h = g_settings_get_boolean (settings, "clock-use-24h"); -+ self->priv->use_custom = g_settings_get_boolean (self->priv->screensaver_settings, "use-custom-format"); -+ self->priv->custom_time = g_settings_get_string (self->priv->screensaver_settings, "time-format"); -+ self->priv->custom_date = g_settings_get_string (self->priv->screensaver_settings, "date-format"); -+ self->priv->font_time = g_settings_get_string (self->priv->screensaver_settings, "font-time"); -+ self->priv->font_date = g_settings_get_string (self->priv->screensaver_settings, "font-date"); -+ -+ self->priv->show_date = g_settings_get_boolean (self->priv->desktop_settings, "clock-show-date"); -+ self->priv->use_24h = g_settings_get_boolean (self->priv->desktop_settings, "clock-use-24h"); - } - - static void -@@ -92,19 +92,20 @@ gnome_wall_clock_init (GnomeWallClock *self) - self->priv->tz_monitor = g_file_monitor_file (tz, 0, NULL, NULL); - g_object_unref (tz); - -- self->priv->settings = g_settings_new ("org.cinnamon.desktop.screensaver"); -- self->priv->use_custom = g_settings_get_boolean (self->priv->settings, "use-custom-format"); -- self->priv->custom_time = g_settings_get_string (self->priv->settings, "time-format"); -- self->priv->custom_date = g_settings_get_string (self->priv->settings, "date-format"); -- self->priv->font_time = g_settings_get_string (self->priv->settings, "font-time"); -- self->priv->font_date = g_settings_get_string (self->priv->settings, "font-date"); -+ self->priv->screensaver_settings = g_settings_new ("org.cinnamon.desktop.screensaver"); -+ self->priv->use_custom = g_settings_get_boolean (self->priv->screensaver_settings, "use-custom-format"); -+ self->priv->custom_time = g_settings_get_string (self->priv->screensaver_settings, "time-format"); -+ self->priv->custom_date = g_settings_get_string (self->priv->screensaver_settings, "date-format"); -+ self->priv->font_time = g_settings_get_string (self->priv->screensaver_settings, "font-time"); -+ self->priv->font_date = g_settings_get_string (self->priv->screensaver_settings, "font-date"); - -- self->priv->settings = g_settings_new ("org.cinnamon.desktop.interface"); -- self->priv->show_date = g_settings_get_boolean (self->priv->settings, "clock-show-date"); -- self->priv->use_24h = g_settings_get_boolean (self->priv->settings, "clock-use-24h"); -+ self->priv->desktop_settings = g_settings_new ("org.cinnamon.desktop.interface"); -+ self->priv->show_date = g_settings_get_boolean (self->priv->desktop_settings, "clock-show-date"); -+ self->priv->use_24h = g_settings_get_boolean (self->priv->desktop_settings, "clock-use-24h"); -+ -+ g_signal_connect (self->priv->screensaver_settings, "changed", G_CALLBACK (settings_changed_cb), self); -+ g_signal_connect (self->priv->desktop_settings, "changed", G_CALLBACK (settings_changed_cb), self); - -- g_signal_connect (self->priv->settings, "changed", G_CALLBACK (settings_changed_cb), self); -- - g_signal_connect (self->priv->tz_monitor, "changed", G_CALLBACK (on_tz_changed), self); - - update_clock (self); -@@ -125,11 +126,16 @@ gnome_wall_clock_dispose (GObject *object) - self->priv->tz_monitor = NULL; - } - -- if (self->priv->settings != NULL) { -- g_object_unref (self->priv->settings); -- self->priv->settings = NULL; -+ if (self->priv->desktop_settings != NULL) { -+ g_object_unref (self->priv->desktop_settings); -+ self->priv->desktop_settings = NULL; - } -- -+ -+ if (self->priv->screensaver_settings != NULL) { -+ g_object_unref (self->priv->screensaver_settings); -+ self->priv->screensaver_settings = NULL; -+ } -+ - G_OBJECT_CLASS (gnome_wall_clock_parent_class)->dispose (object); - } - --- -1.9.3 - diff --git a/0001-gs-window-x11.c-Fix-some-leaks-readability.patch b/0001-gs-window-x11.c-Fix-some-leaks-readability.patch deleted file mode 100644 index 0713732..0000000 --- a/0001-gs-window-x11.c-Fix-some-leaks-readability.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 327c12b5397641e4aaf56b968f9af3c53fe15839 Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Tue, 17 Mar 2015 20:20:16 -0400 -Subject: [PATCH 1/2] gs-window-x11.c: Fix some leaks, readability - ---- - src/gs-window-x11.c | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c -index dcdd90a..2716a2f 100644 ---- a/src/gs-window-x11.c -+++ b/src/gs-window-x11.c -@@ -2115,9 +2115,17 @@ update_clock (GSWindow *window) - char *markup; - - if (window->priv->away_message != NULL && g_strcmp0(window->priv->away_message, "") != 0) { -- markup = g_strdup_printf ("%s\n\n%s\n ~ %s", gnome_wall_clock_get_clock (window->priv->clock_tracker), g_markup_escape_text(window->priv->away_message, -1), get_user_display_name()); -+ gchar *user_name = get_user_display_name (); -+ markup = g_strdup_printf ("%s\n\n%s" -+ "\n ~ %s", -+ gnome_wall_clock_get_clock (window->priv->clock_tracker), -+ window->priv->away_message, user_name); -+ g_free (user_name); - } else { -- markup = g_strdup_printf ("%s\n\n%s", gnome_wall_clock_get_clock (window->priv->clock_tracker), window->priv->font_message, g_markup_escape_text(window->priv->default_message, -1)); -+ markup = g_strdup_printf ("%s\n\n%s", -+ gnome_wall_clock_get_clock (window->priv->clock_tracker), -+ window->priv->font_message, -+ window->priv->default_message); - } - - gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup); -@@ -2161,7 +2169,7 @@ gs_window_set_away_message (GSWindow *window, - g_free (window->priv->away_message); - - if (message) { -- window->priv->away_message = g_strdup (message); -+ window->priv->away_message = g_markup_escape_text (message, -1); - } else { - window->priv->away_message = NULL; - } -@@ -2174,6 +2182,7 @@ settings_changed_cb (GSettings *settings, const gchar *key, gpointer user_data) - { - GSWindow *window = user_data; - -+ g_clear_pointer (&window->priv->font_message, g_free); - window->priv->font_message = g_settings_get_string (window->priv->settings, "font-message"); - } - -@@ -2190,6 +2199,8 @@ gs_window_init (GSWindow *window) - window->priv->last_x = -1; - window->priv->last_y = -1; - -+ window->priv->settings = g_settings_new ("org.cinnamon.desktop.screensaver"); -+ - gtk_window_set_decorated (GTK_WINDOW (window), FALSE); - - gtk_window_set_skip_taskbar_hint (GTK_WINDOW (window), TRUE); -@@ -2235,7 +2246,9 @@ gs_window_init (GSWindow *window) - gtk_widget_set_size_request(window->priv->vbox,450, -1); - - // Default message -- window->priv->default_message = g_settings_get_string(g_settings_new ("org.cinnamon.desktop.screensaver"), "default-message"); -+ gchar *unesc = g_settings_get_string(window->priv->settings, "default-message"); -+ window->priv->default_message = g_markup_escape_text (unesc, -1); -+ g_free (unesc); - - // Clock -- need to find a way to make it appear on the bottom-left side of the background without shifting the position of the main dialog box - window->priv->clock = gtk_label_new (NULL); -@@ -2259,7 +2272,6 @@ gs_window_init (GSWindow *window) - gtk_widget_set_hexpand (grid, TRUE); - gtk_widget_set_vexpand (grid, TRUE); - -- window->priv->settings = g_settings_new ("org.cinnamon.desktop.screensaver"); - window->priv->font_message = g_settings_get_string (window->priv->settings, "font-message"); - - g_signal_connect (window->priv->settings, "changed", G_CALLBACK (settings_changed_cb), window); -@@ -2299,6 +2311,7 @@ gs_window_finalize (GObject *object) - g_free (window->priv->away_message); - g_free (window->priv->logout_command); - g_free (window->priv->keyboard_command); -+ g_free (window->priv->font_message); - - if (window->priv->clock_tracker) { - g_object_unref (window->priv->clock_tracker); -@@ -2326,6 +2339,8 @@ gs_window_finalize (GObject *object) - cairo_surface_destroy (window->priv->background_surface); - } - -+ g_clear_object (&window->priv->settings); -+ - G_OBJECT_CLASS (gs_window_parent_class)->finalize (object); - } - --- -2.1.0 - diff --git a/0002-gs-window-x11.c-Fix-black-background.patch b/0002-gs-window-x11.c-Fix-black-background.patch deleted file mode 100644 index 2ffbf7e..0000000 --- a/0002-gs-window-x11.c-Fix-black-background.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bfb41fb734c6c2525b9cee4b4c9f13ef7fa69305 Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Tue, 17 Mar 2015 21:02:37 -0400 -Subject: [PATCH 2/2] gs-window-x11.c: Fix black background - ---- - src/gs-window-x11.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c -index 2716a2f..27670a5 100644 ---- a/src/gs-window-x11.c -+++ b/src/gs-window-x11.c -@@ -2226,9 +2226,9 @@ gs_window_init (GSWindow *window) - - GtkWidget *grid = gtk_grid_new(); - -- GdkColor transparentColor = { 0, 0, 0, 0 }; -+ GdkRGBA transparent_color = { 0.0, 0.0, 0.0, 0.0 }; - -- gtk_widget_override_background_color(grid, GTK_STATE_NORMAL, &transparentColor); -+ gtk_widget_override_background_color(grid, GTK_STATE_NORMAL, &transparent_color); - gtk_widget_show (grid); - - window->priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); --- -2.1.0 - diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec index cc80f61..e6728bf 100644 --- a/cinnamon-screensaver.spec +++ b/cinnamon-screensaver.spec @@ -6,8 +6,8 @@ Summary: Cinnamon Screensaver Name: cinnamon-screensaver -Version: 2.4.1 -Release: 3%{?dist} +Version: 2.4.2 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ URL: http://cinnamon.linuxmint.com @@ -19,9 +19,6 @@ URL: http://cinnamon.linuxmint.com Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-screensaver/source/%{name}-%{version}.tar.gz Patch0: cinnamon-screensaver-2.20.0-selinux-permit.patch -Patch1: 0001-gs-window-x11.c-Fix-some-leaks-readability.patch -Patch2: 0002-gs-window-x11.c-Fix-black-background.patch -Patch3: 0001-gnome-wall-clock.c-Fix-regressions-from-b021f6f07ad8.patch BuildRequires: pkgconfig(dbus-glib-1) >= %{dbus_glib_version} BuildRequires: pkgconfig(cinnamon-desktop) >= 2.3.0 @@ -53,9 +50,6 @@ cinnamon-screensaver is a screen saver and locker. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 echo "ACLOCAL_AMFLAGS = -I m4" >> Makefile.am echo "AC_CONFIG_MACRO_DIR([m4])" >> configure.ac @@ -85,6 +79,9 @@ desktop-file-install \ %{_mandir}/man1/cinnamon-screensaver*.1.* %changelog +* Tue Mar 31 2015 Leigh Scott - 2.4.2-1 +- update to 2.4.2 + * Sun Mar 29 2015 Leigh Scott - 2.4.1-3 - fix bz 1206907 diff --git a/sources b/sources index 1748d1b..16ecb06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1bab4cc2579cbcbb28af95c262cad018 cinnamon-screensaver-2.4.1.tar.gz +c31feb28156245ddc66eb9137929915d cinnamon-screensaver-2.4.2.tar.gz