Update to 2.45.4

This commit is contained in:
David King 2015-07-21 08:32:50 +01:00
parent 33edb32972
commit 2dcc4a3c39
3 changed files with 6 additions and 44 deletions

View File

@ -1,38 +0,0 @@
From c612fcab0fb2d3f0bdaf011d5b566dc949dbd18a Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Mon, 22 Jun 2015 19:56:38 +0200
Subject: [PATCH] gapplication: Initialize backend before withdrawing
notifications
Make sure to initialize the notification backend in
g_application_withdraw_notification() the same way as is done in
g_application_send_notification().
This makes it possible for an app to withdraw notifications it has sent
in a previous execution of the application.
https://bugzilla.gnome.org/show_bug.cgi?id=750625
---
gio/gapplication.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/gio/gapplication.c b/gio/gapplication.c
index be7127a..37a8258 100644
--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -2715,8 +2715,10 @@ g_application_withdraw_notification (GApplication *application,
g_return_if_fail (G_IS_APPLICATION (application));
g_return_if_fail (id != NULL);
- if (application->priv->notifications)
- g_notification_backend_withdraw_notification (application->priv->notifications, id);
+ if (application->priv->notifications == NULL)
+ application->priv->notifications = g_notification_backend_new_default (application);
+
+ g_notification_backend_withdraw_notification (application->priv->notifications, id);
}
/* Busy binding {{{1 */
--
2.4.3

View File

@ -2,15 +2,13 @@
Summary: A library of handy utility functions Summary: A library of handy utility functions
Name: glib2 Name: glib2
Version: 2.45.3 Version: 2.45.4
Release: 2%{?dist} Release: 1%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.gtk.org URL: http://www.gtk.org
#VCS: git:git://git.gnome.org/glib #VCS: git:git://git.gnome.org/glib
Source: http://download.gnome.org/sources/glib/2.45/glib-%{version}.tar.xz Source: http://download.gnome.org/sources/glib/2.45/glib-%{version}.tar.xz
# Backported from upstream
Patch0: 0001-gapplication-Initialize-backend-before-withdrawing-n.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: gettext BuildRequires: gettext
@ -83,7 +81,6 @@ the functionality of the installed glib2 package.
%prep %prep
%setup -q -n glib-%{version} %setup -q -n glib-%{version}
%patch0 -p1
%build %build
# Support builds of both git snapshots and tarballs packed with autogoo # Support builds of both git snapshots and tarballs packed with autogoo
@ -221,6 +218,9 @@ gio-querymodules-%{__isa_bits} %{_libdir}/gio/modules
%{_datadir}/installed-tests %{_datadir}/installed-tests
%changelog %changelog
* Tue Jul 21 2015 David King <amigadave@amigadave.com> - 2.45.4-1
- Update to 2.45.4
* Wed Jun 24 2015 Kalev Lember <klember@redhat.com> - 2.45.3-2 * Wed Jun 24 2015 Kalev Lember <klember@redhat.com> - 2.45.3-2
- Backport a patch to fix notification withdrawing in gnome-software - Backport a patch to fix notification withdrawing in gnome-software

View File

@ -1 +1 @@
fa6273d970d8f1026cbd47f4649349e0 glib-2.45.3.tar.xz 1d7e531bb84500fff5a804dc5f6f37d6 glib-2.45.4.tar.xz