[arch-commits] Commit in cinnamon-screensaver/trunk (2 files)
Balló György
bgyorgy at nymeria.archlinux.org
Mon Apr 29 23:12:10 UTC 2013
Date: Tuesday, April 30, 2013 @ 01:12:10
Author: bgyorgy
Revision: 89552
upgpkg: cinnamon-screensaver 1.7.2-1
Update to version 1.7.2
Modified:
cinnamon-screensaver/trunk/PKGBUILD
cinnamon-screensaver/trunk/fix-dbus-compatibility.patch
------------------------------+
PKGBUILD | 8 -
fix-dbus-compatibility.patch | 170 -----------------------------------------
2 files changed, 4 insertions(+), 174 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-29 23:08:15 UTC (rev 89551)
+++ PKGBUILD 2013-04-29 23:12:10 UTC (rev 89552)
@@ -4,8 +4,8 @@
# Jan de Groot <jgc at archlinux.org>
pkgname=cinnamon-screensaver
-pkgver=1.7.1
-pkgrel=6
+pkgver=1.7.2
+pkgrel=1
pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
arch=('i686' 'x86_64')
license=('GPL')
@@ -20,12 +20,12 @@
cinnamon-screensaver.pam
configure.patch
fix-dbus-compatibility.patch)
-sha256sums=('055abbc24305dad5efa609b354e01fdc367792ccac5383df4b28090ab0bf64e1'
+sha256sums=('c04d2c9c85729b5ae5635202b89084ea23e5211c50cf2dcce11869ffb2acce9f'
'2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa'
'335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a'
'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a'
- '50fa77bafc666f1aa32945a6d06d4e7c5e50bce1d98738de74075fb634cf6197')
+ 'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6')
build() {
cd $pkgname-$pkgver
Modified: fix-dbus-compatibility.patch
===================================================================
--- fix-dbus-compatibility.patch 2013-04-29 23:08:15 UTC (rev 89551)
+++ fix-dbus-compatibility.patch 2013-04-29 23:12:10 UTC (rev 89552)
@@ -147,173 +147,3 @@
--
1.8.1.6
-
-From 7141e8ce04921ab6d46648cba20c691b8d8f8e0b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sat, 2 Mar 2013 08:11:45 +0100
-Subject: [PATCH 3/4] Revert "Fixed away_message shown as "(null)" (using a
- prefix to explicitly mark custom away messages)"
-
-This reverts commit bf1f42b9f9a673091b0f7bf1118781b2d95c88fd.
----
- src/cinnamon-screensaver-command.c | 9 +-------
- src/gs-window-x11.c | 43 ++++++++++++--------------------------
- 2 files changed, 14 insertions(+), 38 deletions(-)
-
-diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c
-index 5c90916..dbcac8a 100644
---- a/src/cinnamon-screensaver-command.c
-+++ b/src/cinnamon-screensaver-command.c
-@@ -310,14 +310,7 @@
- }
-
- if (do_lock) {
-- if (g_strcmp0 (away_message, "DEFAULT") == 0) {
-- reply = screensaver_send_message_string (connection, "LockMessage", away_message);
-- }
-- else {
-- gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message);
-- reply = screensaver_send_message_string (connection, "LockMessage", custom_message);
-- g_free (custom_message);
-- }
-+ reply = screensaver_send_message_string (connection, "LockMessage", away_message);
- if (reply == NULL) {
- g_message ("Did not receive a reply from the screensaver.");
- goto done;
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index 6858509..0e3bb6f 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -2132,38 +2132,21 @@ enum {
- return utf8_name;
- }
-
--static gchar *
--str_replace(const char *string, const char *delimiter, const char *replacement)
--{
-- gchar **split;
-- gchar *ret;
-- g_return_val_if_fail(string != NULL, NULL);
-- g_return_val_if_fail(delimiter != NULL, NULL);
-- g_return_val_if_fail(replacement != NULL, NULL);
-- split = g_strsplit(string, delimiter, 0);
-- ret = g_strjoinv(replacement, split);
-- g_strfreev(split);
-- return ret;
--}
--
- static void
- update_clock (GSWindow *window)
--{
-- char *markup;
-- char *away_message;
--
-- if (window->priv->away_message != NULL && g_str_has_prefix (window->priv->away_message, "CUSTOM###") && g_strcmp0(window->priv->away_message, "") != 0) {
-- away_message = str_replace(window->priv->away_message, "CUSTOM###", "");
-- away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), away_message);
-- }
-- else {
-- away_message = g_strdup_printf (_("%s"), window->priv->default_message);
-- }
--
-- markup = g_strdup_printf ("%s\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#FFFFFF\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message);
-- gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
-- g_free (markup);
-- g_free (away_message);
-+{
-+ char *markup;
-+ char *away_message;
-+ if (g_strcmp0(window->priv->away_message, "DEFAULT") == 0 || g_strcmp0(window->priv->away_message, "") == 0) {
-+ away_message = g_strdup_printf (_("%s"), window->priv->default_message);
-+ }
-+ else {
-+ away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), window->priv->away_message);
-+ }
-+ markup = g_strdup_printf ("%s\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#FFFFFF\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message);
-+ gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
-+ g_free (markup);
-+ g_free (away_message);
- }
-
- static void
---
-1.8.1.6
-
-
-From 1ed6a959746e115a7f33de2134921c6572185ebd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sat, 2 Mar 2013 08:13:04 +0100
-Subject: [PATCH 4/4] Simplify away message handling
-
----
- src/cinnamon-screensaver-command.c | 19 ++++++++++++-------
- src/gs-window-x11.c | 7 +++----
- 2 files changed, 15 insertions(+), 11 deletions(-)
-
-diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c
-index dbcac8a..4836f81 100644
---- a/src/cinnamon-screensaver-command.c
-+++ b/src/cinnamon-screensaver-command.c
-@@ -41,7 +41,7 @@
- static gboolean do_query = FALSE;
- static gboolean do_time = FALSE;
-
--static gchar *away_message = "DEFAULT";
-+static gchar *away_message;
-
- static GOptionEntry entries [] = {
- { "exit", 0, 0, G_OPTION_ARG_NONE, &do_quit,
-@@ -114,7 +114,7 @@
- static GDBusMessage *
- screensaver_send_message_string (GDBusConnection *connection,
- const char *name,
-- gboolean value)
-+ gchar *value)
- {
- GDBusMessage *message, *reply;
- GError *error;
-@@ -310,12 +310,17 @@
- }
-
- if (do_lock) {
-- reply = screensaver_send_message_string (connection, "LockMessage", away_message);
-- if (reply == NULL) {
-- g_message ("Did not receive a reply from the screensaver.");
-- goto done;
-+ if (away_message) {
-+ reply = screensaver_send_message_string (connection, "LockMessage", away_message);
-+ if (reply == NULL) {
-+ g_message ("Did not receive a reply from the screensaver.");
-+ goto done;
-+ }
-+ g_object_unref (reply);
-+ } else {
-+ reply = screensaver_send_message_void (connection, "Lock", FALSE);
-+ g_assert (reply == NULL);
- }
-- g_object_unref (reply);
- }
-
- if (do_activate) {
-diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
-index 0e3bb6f..22f5471 100644
---- a/src/gs-window-x11.c
-+++ b/src/gs-window-x11.c
-@@ -2137,11 +2137,10 @@ enum {
- {
- char *markup;
- char *away_message;
-- if (g_strcmp0(window->priv->away_message, "DEFAULT") == 0 || g_strcmp0(window->priv->away_message, "") == 0) {
-- away_message = g_strdup_printf (_("%s"), window->priv->default_message);
-- }
-- else {
-+ if (window->priv->away_message && g_strcmp0(window->priv->away_message, "") != 0) {
- away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), window->priv->away_message);
-+ } else {
-+ away_message = g_strdup_printf (_("%s"), window->priv->default_message);
- }
- markup = g_strdup_printf ("%s\n<b><span font_desc=\"Ubuntu 10\" foreground=\"#FFFFFF\">%s</span></b>", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message);
- gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup);
---
-1.8.1.6
-
More information about the arch-commits
mailing list