Hello community,
here is the log from the commit of package notification-daemon for
openSUSE:Factory checked in at 2015-04-23 08:02:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/notification-daemon (Old)
and /work/SRC/openSUSE:Factory/.notification-daemon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "notification-daemon"
Changes:
--------
--- /work/SRC/openSUSE:Factory/notification-daemon/notification-daemon.changes
2015-04-03 14:33:45.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.notification-daemon.new/notification-daemon.changes
2015-04-23 08:02:17.000000000 +0200
@@ -1,0 +2,8 @@
+Wed Apr 15 06:45:59 UTC 2015 - [email protected]
+
+- Update to version 3.16.1:
+ + Fix timeout, based on patch by Jakub Adam.
+ + Properly check if GVariant is string.
+ + Fix crash in hint_to_boolean.
+
+-------------------------------------------------------------------
Old:
----
notification-daemon-3.16.0.tar.xz
New:
----
notification-daemon-3.16.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ notification-daemon.spec ++++++
--- /var/tmp/diff_new_pack.VQPsvy/_old 2015-04-23 08:02:18.000000000 +0200
+++ /var/tmp/diff_new_pack.VQPsvy/_new 2015-04-23 08:02:18.000000000 +0200
@@ -17,7 +17,7 @@
Name: notification-daemon
-Version: 3.16.0
+Version: 3.16.1
Release: 0
Summary: Notification Daemon
License: GPL-2.0+
++++++ notification-daemon-3.16.0.tar.xz -> notification-daemon-3.16.1.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notification-daemon-3.16.0/NEWS
new/notification-daemon-3.16.1/NEWS
--- old/notification-daemon-3.16.0/NEWS 2015-03-26 15:50:26.000000000 +0100
+++ new/notification-daemon-3.16.1/NEWS 2015-04-14 23:15:24.000000000 +0200
@@ -1,3 +1,9 @@
+Version 3.16.1
+==============
+- Fix timeout, based on patch by Jakub Adam. (Alberts Muktupāvels)
+- Properly check if GVariant is string. (Alberts Muktupāvels)
+- Fix crash in hint_to_boolean. (Alberts Muktupāvels)
+
Version 3.16.0
==============
- Free memory returned by g_find_program_in_path. (Dmitry Shachnev)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notification-daemon-3.16.0/autogen.sh
new/notification-daemon-3.16.1/autogen.sh
--- old/notification-daemon-3.16.0/autogen.sh 2015-03-19 12:56:41.000000000
+0100
+++ new/notification-daemon-3.16.1/autogen.sh 2015-04-14 17:49:03.000000000
+0200
@@ -4,8 +4,6 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-PKG_NAME="Notification Daemon"
-
(test -f $srcdir/configure.ac \
&& test -d $srcdir/src) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
@@ -13,10 +11,9 @@
exit 1
}
-
which gnome-autogen.sh || {
echo "You need to install gnome-common"
exit 1
}
-USE_GNOME2_MACROS=1 . gnome-autogen.sh
+. gnome-autogen.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notification-daemon-3.16.0/configure
new/notification-daemon-3.16.1/configure
--- old/notification-daemon-3.16.0/configure 2015-03-26 15:51:48.000000000
+0100
+++ new/notification-daemon-3.16.1/configure 2015-04-14 23:16:17.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for notification-daemon 3.16.0.
+# Generated by GNU Autoconf 2.69 for notification-daemon 3.16.1.
#
# Report bugs to
<https://bugzilla.gnome.org/enter_bug.cgi?product=notification-daemon>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='notification-daemon'
PACKAGE_TARNAME='notification-daemon'
-PACKAGE_VERSION='3.16.0'
-PACKAGE_STRING='notification-daemon 3.16.0'
+PACKAGE_VERSION='3.16.1'
+PACKAGE_STRING='notification-daemon 3.16.1'
PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=notification-daemon'
PACKAGE_URL=''
@@ -1392,7 +1392,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures notification-daemon 3.16.0 to adapt to many kinds of
systems.
+\`configure' configures notification-daemon 3.16.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1463,7 +1463,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of notification-daemon 3.16.0:";;
+ short | recursive ) echo "Configuration of notification-daemon 3.16.1:";;
esac
cat <<\_ACEOF
@@ -1591,7 +1591,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-notification-daemon configure 3.16.0
+notification-daemon configure 3.16.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2014,7 +2014,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by notification-daemon $as_me 3.16.0, which was
+It was created by notification-daemon $as_me 3.16.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2884,7 +2884,7 @@
# Define the identity of the package.
PACKAGE='notification-daemon'
- VERSION='3.16.0'
+ VERSION='3.16.1'
cat >>confdefs.h <<_ACEOF
@@ -14162,7 +14162,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by notification-daemon $as_me 3.16.0, which was
+This file was extended by notification-daemon $as_me 3.16.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14228,7 +14228,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-notification-daemon config.status 3.16.0
+notification-daemon config.status 3.16.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notification-daemon-3.16.0/configure.ac
new/notification-daemon-3.16.1/configure.ac
--- old/notification-daemon-3.16.0/configure.ac 2015-03-26 15:47:38.000000000
+0100
+++ new/notification-daemon-3.16.1/configure.ac 2015-04-14 23:12:23.000000000
+0200
@@ -3,7 +3,7 @@
dnl ################################################################
dnl # Initialize autoconf
dnl ################################################################
-AC_INIT([notification-daemon],[3.16.0],[https://bugzilla.gnome.org/enter_bug.cgi?product=notification-daemon],[notification-daemon])
+AC_INIT([notification-daemon],[3.16.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=notification-daemon],[notification-daemon])
AC_PREREQ(2.63)
AC_CONFIG_HEADERS([config.h])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notification-daemon-3.16.0/src/nd-bubble.c
new/notification-daemon-3.16.1/src/nd-bubble.c
--- old/notification-daemon-3.16.0/src/nd-bubble.c 2015-03-20
13:52:29.000000000 +0100
+++ new/notification-daemon-3.16.1/src/nd-bubble.c 2015-04-14
22:47:37.000000000 +0200
@@ -29,6 +29,8 @@
#define ND_BUBBLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o),
ND_TYPE_BUBBLE, NdBubblePrivate))
+#define EXPIRATION_TIME_DEFAULT -1
+#define EXPIRATION_TIME_NEVER_EXPIRES 0
#define TIMEOUT_SEC 5
#define WIDTH 400
@@ -395,12 +397,22 @@
static void
add_timeout (NdBubble *bubble)
{
+ int timeout = nd_notification_get_timeout(bubble->priv->notification);
+
if (bubble->priv->timeout_id != 0) {
g_source_remove (bubble->priv->timeout_id);
+ bubble->priv->timeout_id = 0;
}
- bubble->priv->timeout_id = g_timeout_add_seconds (TIMEOUT_SEC,
-
(GSourceFunc)timeout_bubble,
- bubble);
+
+ if (timeout == EXPIRATION_TIME_NEVER_EXPIRES)
+ return;
+
+ if (timeout == EXPIRATION_TIME_DEFAULT)
+ timeout = TIMEOUT_SEC * 1000;
+
+ bubble->priv->timeout_id = g_timeout_add (timeout,
+ (GSourceFunc) timeout_bubble,
+ bubble);
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/notification-daemon-3.16.0/src/nd-notification.c
new/notification-daemon-3.16.1/src/nd-notification.c
--- old/notification-daemon-3.16.0/src/nd-notification.c 2015-03-19
12:56:41.000000000 +0100
+++ new/notification-daemon-3.16.1/src/nd-notification.c 2015-04-14
20:12:26.000000000 +0200
@@ -194,6 +194,8 @@
value); /* steals value */
}
+ notification->timeout = timeout;
+
g_signal_emit (notification, signals[CHANGED], 0);
g_get_current_time (¬ification->update_time);
@@ -243,6 +245,8 @@
return TRUE;
} else if (g_variant_is_of_type (value, G_VARIANT_TYPE_BYTE)) {
return (g_variant_get_byte (value) != 0);
+ } else if (g_variant_is_of_type (value, G_VARIANT_TYPE_BOOLEAN)) {
+ return g_variant_get_boolean (value);
} else {
g_assert_not_reached ();
}
@@ -324,6 +328,13 @@
return notification->icon;
}
+int
+nd_notification_get_timeout (NdNotification *notification)
+{
+ g_return_val_if_fail (ND_IS_NOTIFICATION (notification), -1);
+
+ return notification->timeout;
+}
static GdkPixbuf *
scale_pixbuf (GdkPixbuf *pixbuf,
@@ -488,7 +499,7 @@
pixbuf = _notify_daemon_pixbuf_from_data_hint (data, size);
} else if ((data = (GVariant *) g_hash_table_lookup
(notification->hints, "image-path"))
|| (data = (GVariant *) g_hash_table_lookup
(notification->hints, "image_path"))) {
- if (g_variant_is_of_type (data, G_VARIANT_TYPE ("(s)"))) {
+ if (g_variant_is_of_type (data, G_VARIANT_TYPE_STRING)) {
const char *path;
path = g_variant_get_string (data, NULL);
pixbuf = _notify_daemon_pixbuf_from_path (path, size);
