[arch-commits] Commit in gnome-flashback/repos (10 files)
Balló György
bgyorgy at archlinux.org
Tue May 24 11:55:20 UTC 2016
Date: Tuesday, May 24, 2016 @ 13:55:20
Author: bgyorgy
Revision: 176218
archrelease: copy trunk to community-i686, community-x86_64
Added:
gnome-flashback/repos/community-i686/PKGBUILD
(from rev 176217, gnome-flashback/trunk/PKGBUILD)
gnome-flashback/repos/community-x86_64/PKGBUILD
(from rev 176217, gnome-flashback/trunk/PKGBUILD)
Deleted:
gnome-flashback/repos/community-i686/PKGBUILD
gnome-flashback/repos/community-i686/fix-theme.patch
gnome-flashback/repos/community-i686/git-fixes.patch
gnome-flashback/repos/community-i686/gnome-flashback.install
gnome-flashback/repos/community-x86_64/PKGBUILD
gnome-flashback/repos/community-x86_64/fix-theme.patch
gnome-flashback/repos/community-x86_64/git-fixes.patch
gnome-flashback/repos/community-x86_64/gnome-flashback.install
------------------------------------------+
/PKGBUILD | 60 ++++++++++++
community-i686/PKGBUILD | 46 ---------
community-i686/fix-theme.patch | 68 -------------
community-i686/git-fixes.patch | 142 -----------------------------
community-i686/gnome-flashback.install | 11 --
community-x86_64/PKGBUILD | 46 ---------
community-x86_64/fix-theme.patch | 68 -------------
community-x86_64/git-fixes.patch | 142 -----------------------------
community-x86_64/gnome-flashback.install | 11 --
9 files changed, 60 insertions(+), 534 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-05-24 11:55:10 UTC (rev 176217)
+++ community-i686/PKGBUILD 2016-05-24 11:55:20 UTC (rev 176218)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gnome-flashback
-pkgver=3.20.0
-pkgrel=3
-pkgdesc="GNOME Flashback session"
-arch=('i686' 'x86_64')
-url="https://wiki.gnome.org/Projects/GnomeFlashback"
-license=('GPL')
-depends=('gnome-bluetooth' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' 'gnome-themes-standard' 'libibus' 'metacity' 'nautilus')
-makedepends=('intltool')
-optdepends=('gnome-backgrounds: Default background'
- 'gnome-control-center: System settings'
- 'gnome-screensaver: Lock screen'
- 'network-manager-applet: Network management')
-install=$pkgname.install
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- git-fixes.patch
- fix-theme.patch)
-sha256sums=('0f065d8eb7ad8939734bab551cde39ddf327ada54ff38c32737f2f29dd7111c9'
- 'c7b09e506fbe7baa181cde8e52f3e135f76cdc587e0d8f6af7562f4987c2607d'
- '5fc12caeb38f4bbeffd2679397d62aa0e300464cbf88726d4b04d279742fa481')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Apply some fixes from git
- patch -Np1 -i ../git-fixes.patch
-
- # Small theme improvements
- # https://bugzilla.gnome.org/show_bug.cgi?id=764857
- patch -Np1 -i ../fix-theme.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-flashback/repos/community-i686/PKGBUILD (from rev 176217, gnome-flashback/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-05-24 11:55:20 UTC (rev 176218)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=gnome-flashback
+pkgver=3.20.1
+pkgrel=1
+pkgdesc="GNOME Flashback session"
+arch=('i686' 'x86_64')
+url="https://wiki.gnome.org/Projects/GnomeFlashback"
+license=('GPL')
+depends=('gnome-bluetooth' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' 'gnome-themes-standard' 'libibus' 'metacity' 'nautilus')
+makedepends=('intltool')
+optdepends=('gnome-backgrounds: Default background'
+ 'gnome-control-center: System settings'
+ 'gnome-screensaver: Lock screen'
+ 'network-manager-applet: Network management')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bd9af1b50c5fc74ed98e04fc9f75d6fa579e01f68ed35160746866b456d936ce')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+ --disable-schemas-compile
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-i686/fix-theme.patch
===================================================================
--- community-i686/fix-theme.patch 2016-05-24 11:55:10 UTC (rev 176217)
+++ community-i686/fix-theme.patch 2016-05-24 11:55:20 UTC (rev 176218)
@@ -1,68 +0,0 @@
-From b0982dce61cfe3b448d1b22445f78316e63a0c72 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sun, 10 Apr 2016 20:24:08 +0200
-Subject: [PATCH 1/2] theme/Adwaita: Improve contrast of the notification
- bubbles
-
-This makes the text more readable.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764857
----
- data/theme/Adwaita/gnome-flashback-dark.css | 4 ++++
- data/theme/Adwaita/gnome-flashback.css | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/data/theme/Adwaita/gnome-flashback-dark.css b/data/theme/Adwaita/gnome-flashback-dark.css
-index 0488183..1388641 100644
---- a/data/theme/Adwaita/gnome-flashback-dark.css
-+++ b/data/theme/Adwaita/gnome-flashback-dark.css
-@@ -57,3 +57,7 @@ gf-popup-window.solid {
-
- #gf-bubble {
- }
-+
-+#gf-bubble label {
-+ color: #ffffff;
-+}
-diff --git a/data/theme/Adwaita/gnome-flashback.css b/data/theme/Adwaita/gnome-flashback.css
-index 6eda9ee..418c5c5 100644
---- a/data/theme/Adwaita/gnome-flashback.css
-+++ b/data/theme/Adwaita/gnome-flashback.css
-@@ -57,3 +57,7 @@ gf-popup-window.solid {
-
- #gf-bubble {
- }
-+
-+#gf-bubble label {
-+ color: #000000;
-+}
---
-2.8.0
-
-From 3debf219f2ddc9805f2594eb9d251910f11d625b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sun, 10 Apr 2016 20:48:53 +0200
-Subject: [PATCH 2/2] theme/HighContrast: use regular icons
-
-HighContrast theme uses symbolic icons by default, but tray icons are invisible for some reason. Use regular icons instead.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764857
----
- data/theme/HighContrast/gnome-flashback.css | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/data/theme/HighContrast/gnome-flashback.css b/data/theme/HighContrast/gnome-flashback.css
-index e32fb7b..3e5ba79 100644
---- a/data/theme/HighContrast/gnome-flashback.css
-+++ b/data/theme/HighContrast/gnome-flashback.css
-@@ -57,3 +57,7 @@ gf-popup-window.solid {
-
- #gf-bubble {
- }
-+
-+image {
-+ -gtk-icon-style: regular;
-+}
---
-2.8.0
-
Deleted: community-i686/git-fixes.patch
===================================================================
--- community-i686/git-fixes.patch 2016-05-24 11:55:10 UTC (rev 176217)
+++ community-i686/git-fixes.patch 2016-05-24 11:55:20 UTC (rev 176218)
@@ -1,142 +0,0 @@
-From 67d7aa3cf56c0642b09a4016222b06c34cbac76d Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos at gmail.com>
-Date: Tue, 29 Mar 2016 21:56:28 +0200
-Subject: display-config: handle invalid previous configurations
-
-The previous configuration might not apply because the number of
-enabled outputs when trying to apply it might have changed. This isn't
-a bug so we shouldn't assert. Instead, we can handle it by falling
-back as we would if we didn't have a previous configuration to start
-with.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764286
----
- .../libdisplay-config/flashback-monitor-config.c | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/gnome-flashback/libdisplay-config/flashback-monitor-config.c b/gnome-flashback/libdisplay-config/flashback-monitor-config.c
-index f5faa1a..4886188 100644
---- a/gnome-flashback/libdisplay-config/flashback-monitor-config.c
-+++ b/gnome-flashback/libdisplay-config/flashback-monitor-config.c
-@@ -653,7 +653,11 @@ meta_monitor_config_assign_crtcs (MetaConfiguration *config,
- }
-
- all_outputs = flashback_monitor_manager_get_outputs (manager, &n_outputs);
-- g_assert (n_outputs == config->n_outputs);
-+ if (n_outputs != config->n_outputs)
-+ {
-+ g_hash_table_destroy (assignment.info);
-+ return FALSE;
-+ }
-
- for (i = 0; i < n_outputs; i++)
- {
-@@ -2050,18 +2054,19 @@ flashback_monitor_config_restore_previous (FlashbackMonitorConfig *config)
- /* The user chose to restore the previous configuration. In this
- * case, restore the previous configuration. */
- MetaConfiguration *prev_config = config_ref (config->previous);
-- apply_configuration (config, prev_config);
-+ gboolean ok = apply_configuration (config, prev_config);
- config_unref (prev_config);
-
- /* After this, self->previous contains the rejected configuration.
- * Since it was rejected, nuke it. */
- g_clear_pointer (&config->previous, (GDestroyNotify) config_unref);
-+
-+ if (ok)
-+ return;
- }
-- else
-- {
-- if (!flashback_monitor_config_apply_stored (config))
-- flashback_monitor_config_make_default (config);
-- }
-+
-+ if (!flashback_monitor_config_apply_stored (config))
-+ flashback_monitor_config_make_default (config);
- }
-
- gboolean
---
-cgit v0.12
-
-From 26592ac89d4b1fd05adac417040110473da6bade Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels at gmail.com>
-Date: Mon, 25 Apr 2016 21:57:40 +0300
-Subject: notifications: disconnect signal handler
-
-Regression from 302df76438ad7f7cba75c2fe949daffb9d701155.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=765128
----
- gnome-flashback/libnotifications/gf-bubble.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/gnome-flashback/libnotifications/gf-bubble.c b/gnome-flashback/libnotifications/gf-bubble.c
-index ce74fd1..a97ba15 100644
---- a/gnome-flashback/libnotifications/gf-bubble.c
-+++ b/gnome-flashback/libnotifications/gf-bubble.c
-@@ -47,6 +47,7 @@ typedef struct
- gboolean url_clicked_lock;
-
- guint timeout_id;
-+ gulong changed_id;
- } GfBubblePrivate;
-
- G_DEFINE_TYPE_WITH_PRIVATE (GfBubble, gf_bubble, GF_TYPE_POPUP_WINDOW)
-@@ -413,6 +414,12 @@ gf_bubble_dispose (GObject *object)
- priv->timeout_id = 0;
- }
-
-+ if (priv->changed_id != 0)
-+ {
-+ g_signal_handler_disconnect (priv->notification, priv->changed_id);
-+ priv->changed_id = 0;
-+ }
-+
- G_OBJECT_CLASS (gf_bubble_parent_class)->dispose (object);
- }
-
-@@ -665,9 +672,9 @@ gf_bubble_new_for_notification (NdNotification *notification)
- priv = gf_bubble_get_instance_private (bubble);
-
- priv->notification = g_object_ref (notification);
--
-- g_signal_connect (notification, "changed",
-- G_CALLBACK (notification_changed_cb), bubble);
-+ priv->changed_id = g_signal_connect (notification, "changed",
-+ G_CALLBACK (notification_changed_cb),
-+ bubble);
-
- update_bubble (bubble);
-
---
-cgit v0.12
-
-From 04689659874ebafbb8c3031a8e55e1ea6a7f7a74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels at gmail.com>
-Date: Mon, 25 Apr 2016 22:31:03 +0300
-Subject: notifications: use correct window type for GfBubble
-
-Regression from 302df76438ad7f7cba75c2fe949daffb9d701155.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=765128
----
- gnome-flashback/libnotifications/gf-bubble.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gnome-flashback/libnotifications/gf-bubble.c b/gnome-flashback/libnotifications/gf-bubble.c
-index eed0514..282c3ef 100644
---- a/gnome-flashback/libnotifications/gf-bubble.c
-+++ b/gnome-flashback/libnotifications/gf-bubble.c
-@@ -654,6 +654,7 @@ gf_bubble_new_for_notification (NdNotification *notification)
- bubble = g_object_new (GF_TYPE_BUBBLE,
- "resizable", FALSE,
- "title", _("Notification"),
-+ "type", GTK_WINDOW_POPUP,
- NULL);
-
- priv = gf_bubble_get_instance_private (bubble);
---
-cgit v0.12
-
Deleted: community-i686/gnome-flashback.install
===================================================================
--- community-i686/gnome-flashback.install 2016-05-24 11:55:10 UTC (rev 176217)
+++ community-i686/gnome-flashback.install 2016-05-24 11:55:20 UTC (rev 176218)
@@ -1,11 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-05-24 11:55:10 UTC (rev 176217)
+++ community-x86_64/PKGBUILD 2016-05-24 11:55:20 UTC (rev 176218)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gnome-flashback
-pkgver=3.20.0
-pkgrel=3
-pkgdesc="GNOME Flashback session"
-arch=('i686' 'x86_64')
-url="https://wiki.gnome.org/Projects/GnomeFlashback"
-license=('GPL')
-depends=('gnome-bluetooth' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' 'gnome-themes-standard' 'libibus' 'metacity' 'nautilus')
-makedepends=('intltool')
-optdepends=('gnome-backgrounds: Default background'
- 'gnome-control-center: System settings'
- 'gnome-screensaver: Lock screen'
- 'network-manager-applet: Network management')
-install=$pkgname.install
-source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- git-fixes.patch
- fix-theme.patch)
-sha256sums=('0f065d8eb7ad8939734bab551cde39ddf327ada54ff38c32737f2f29dd7111c9'
- 'c7b09e506fbe7baa181cde8e52f3e135f76cdc587e0d8f6af7562f4987c2607d'
- '5fc12caeb38f4bbeffd2679397d62aa0e300464cbf88726d4b04d279742fa481')
-
-prepare() {
- cd $pkgname-$pkgver
-
- # Apply some fixes from git
- patch -Np1 -i ../git-fixes.patch
-
- # Small theme improvements
- # https://bugzilla.gnome.org/show_bug.cgi?id=764857
- patch -Np1 -i ../fix-theme.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --disable-schemas-compile
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
Copied: gnome-flashback/repos/community-x86_64/PKGBUILD (from rev 176217, gnome-flashback/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-05-24 11:55:20 UTC (rev 176218)
@@ -0,0 +1,30 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+pkgname=gnome-flashback
+pkgver=3.20.1
+pkgrel=1
+pkgdesc="GNOME Flashback session"
+arch=('i686' 'x86_64')
+url="https://wiki.gnome.org/Projects/GnomeFlashback"
+license=('GPL')
+depends=('gnome-bluetooth' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' 'gnome-themes-standard' 'libibus' 'metacity' 'nautilus')
+makedepends=('intltool')
+optdepends=('gnome-backgrounds: Default background'
+ 'gnome-control-center: System settings'
+ 'gnome-screensaver: Lock screen'
+ 'network-manager-applet: Network management')
+source=(https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('bd9af1b50c5fc74ed98e04fc9f75d6fa579e01f68ed35160746866b456d936ce')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
+ --disable-schemas-compile
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: community-x86_64/fix-theme.patch
===================================================================
--- community-x86_64/fix-theme.patch 2016-05-24 11:55:10 UTC (rev 176217)
+++ community-x86_64/fix-theme.patch 2016-05-24 11:55:20 UTC (rev 176218)
@@ -1,68 +0,0 @@
-From b0982dce61cfe3b448d1b22445f78316e63a0c72 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sun, 10 Apr 2016 20:24:08 +0200
-Subject: [PATCH 1/2] theme/Adwaita: Improve contrast of the notification
- bubbles
-
-This makes the text more readable.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764857
----
- data/theme/Adwaita/gnome-flashback-dark.css | 4 ++++
- data/theme/Adwaita/gnome-flashback.css | 4 ++++
- 2 files changed, 8 insertions(+)
-
-diff --git a/data/theme/Adwaita/gnome-flashback-dark.css b/data/theme/Adwaita/gnome-flashback-dark.css
-index 0488183..1388641 100644
---- a/data/theme/Adwaita/gnome-flashback-dark.css
-+++ b/data/theme/Adwaita/gnome-flashback-dark.css
-@@ -57,3 +57,7 @@ gf-popup-window.solid {
-
- #gf-bubble {
- }
-+
-+#gf-bubble label {
-+ color: #ffffff;
-+}
-diff --git a/data/theme/Adwaita/gnome-flashback.css b/data/theme/Adwaita/gnome-flashback.css
-index 6eda9ee..418c5c5 100644
---- a/data/theme/Adwaita/gnome-flashback.css
-+++ b/data/theme/Adwaita/gnome-flashback.css
-@@ -57,3 +57,7 @@ gf-popup-window.solid {
-
- #gf-bubble {
- }
-+
-+#gf-bubble label {
-+ color: #000000;
-+}
---
-2.8.0
-
-From 3debf219f2ddc9805f2594eb9d251910f11d625b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
-Date: Sun, 10 Apr 2016 20:48:53 +0200
-Subject: [PATCH 2/2] theme/HighContrast: use regular icons
-
-HighContrast theme uses symbolic icons by default, but tray icons are invisible for some reason. Use regular icons instead.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764857
----
- data/theme/HighContrast/gnome-flashback.css | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/data/theme/HighContrast/gnome-flashback.css b/data/theme/HighContrast/gnome-flashback.css
-index e32fb7b..3e5ba79 100644
---- a/data/theme/HighContrast/gnome-flashback.css
-+++ b/data/theme/HighContrast/gnome-flashback.css
-@@ -57,3 +57,7 @@ gf-popup-window.solid {
-
- #gf-bubble {
- }
-+
-+image {
-+ -gtk-icon-style: regular;
-+}
---
-2.8.0
-
Deleted: community-x86_64/git-fixes.patch
===================================================================
--- community-x86_64/git-fixes.patch 2016-05-24 11:55:10 UTC (rev 176217)
+++ community-x86_64/git-fixes.patch 2016-05-24 11:55:20 UTC (rev 176218)
@@ -1,142 +0,0 @@
-From 67d7aa3cf56c0642b09a4016222b06c34cbac76d Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos at gmail.com>
-Date: Tue, 29 Mar 2016 21:56:28 +0200
-Subject: display-config: handle invalid previous configurations
-
-The previous configuration might not apply because the number of
-enabled outputs when trying to apply it might have changed. This isn't
-a bug so we shouldn't assert. Instead, we can handle it by falling
-back as we would if we didn't have a previous configuration to start
-with.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=764286
----
- .../libdisplay-config/flashback-monitor-config.c | 19 ++++++++++++-------
- 1 file changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/gnome-flashback/libdisplay-config/flashback-monitor-config.c b/gnome-flashback/libdisplay-config/flashback-monitor-config.c
-index f5faa1a..4886188 100644
---- a/gnome-flashback/libdisplay-config/flashback-monitor-config.c
-+++ b/gnome-flashback/libdisplay-config/flashback-monitor-config.c
-@@ -653,7 +653,11 @@ meta_monitor_config_assign_crtcs (MetaConfiguration *config,
- }
-
- all_outputs = flashback_monitor_manager_get_outputs (manager, &n_outputs);
-- g_assert (n_outputs == config->n_outputs);
-+ if (n_outputs != config->n_outputs)
-+ {
-+ g_hash_table_destroy (assignment.info);
-+ return FALSE;
-+ }
-
- for (i = 0; i < n_outputs; i++)
- {
-@@ -2050,18 +2054,19 @@ flashback_monitor_config_restore_previous (FlashbackMonitorConfig *config)
- /* The user chose to restore the previous configuration. In this
- * case, restore the previous configuration. */
- MetaConfiguration *prev_config = config_ref (config->previous);
-- apply_configuration (config, prev_config);
-+ gboolean ok = apply_configuration (config, prev_config);
- config_unref (prev_config);
-
- /* After this, self->previous contains the rejected configuration.
- * Since it was rejected, nuke it. */
- g_clear_pointer (&config->previous, (GDestroyNotify) config_unref);
-+
-+ if (ok)
-+ return;
- }
-- else
-- {
-- if (!flashback_monitor_config_apply_stored (config))
-- flashback_monitor_config_make_default (config);
-- }
-+
-+ if (!flashback_monitor_config_apply_stored (config))
-+ flashback_monitor_config_make_default (config);
- }
-
- gboolean
---
-cgit v0.12
-
-From 26592ac89d4b1fd05adac417040110473da6bade Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels at gmail.com>
-Date: Mon, 25 Apr 2016 21:57:40 +0300
-Subject: notifications: disconnect signal handler
-
-Regression from 302df76438ad7f7cba75c2fe949daffb9d701155.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=765128
----
- gnome-flashback/libnotifications/gf-bubble.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/gnome-flashback/libnotifications/gf-bubble.c b/gnome-flashback/libnotifications/gf-bubble.c
-index ce74fd1..a97ba15 100644
---- a/gnome-flashback/libnotifications/gf-bubble.c
-+++ b/gnome-flashback/libnotifications/gf-bubble.c
-@@ -47,6 +47,7 @@ typedef struct
- gboolean url_clicked_lock;
-
- guint timeout_id;
-+ gulong changed_id;
- } GfBubblePrivate;
-
- G_DEFINE_TYPE_WITH_PRIVATE (GfBubble, gf_bubble, GF_TYPE_POPUP_WINDOW)
-@@ -413,6 +414,12 @@ gf_bubble_dispose (GObject *object)
- priv->timeout_id = 0;
- }
-
-+ if (priv->changed_id != 0)
-+ {
-+ g_signal_handler_disconnect (priv->notification, priv->changed_id);
-+ priv->changed_id = 0;
-+ }
-+
- G_OBJECT_CLASS (gf_bubble_parent_class)->dispose (object);
- }
-
-@@ -665,9 +672,9 @@ gf_bubble_new_for_notification (NdNotification *notification)
- priv = gf_bubble_get_instance_private (bubble);
-
- priv->notification = g_object_ref (notification);
--
-- g_signal_connect (notification, "changed",
-- G_CALLBACK (notification_changed_cb), bubble);
-+ priv->changed_id = g_signal_connect (notification, "changed",
-+ G_CALLBACK (notification_changed_cb),
-+ bubble);
-
- update_bubble (bubble);
-
---
-cgit v0.12
-
-From 04689659874ebafbb8c3031a8e55e1ea6a7f7a74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Alberts=20Muktup=C4=81vels?= <alberts.muktupavels at gmail.com>
-Date: Mon, 25 Apr 2016 22:31:03 +0300
-Subject: notifications: use correct window type for GfBubble
-
-Regression from 302df76438ad7f7cba75c2fe949daffb9d701155.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=765128
----
- gnome-flashback/libnotifications/gf-bubble.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/gnome-flashback/libnotifications/gf-bubble.c b/gnome-flashback/libnotifications/gf-bubble.c
-index eed0514..282c3ef 100644
---- a/gnome-flashback/libnotifications/gf-bubble.c
-+++ b/gnome-flashback/libnotifications/gf-bubble.c
-@@ -654,6 +654,7 @@ gf_bubble_new_for_notification (NdNotification *notification)
- bubble = g_object_new (GF_TYPE_BUBBLE,
- "resizable", FALSE,
- "title", _("Notification"),
-+ "type", GTK_WINDOW_POPUP,
- NULL);
-
- priv = gf_bubble_get_instance_private (bubble);
---
-cgit v0.12
-
Deleted: community-x86_64/gnome-flashback.install
===================================================================
--- community-x86_64/gnome-flashback.install 2016-05-24 11:55:10 UTC (rev 176217)
+++ community-x86_64/gnome-flashback.install 2016-05-24 11:55:20 UTC (rev 176218)
@@ -1,11 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
More information about the arch-commits
mailing list