Merge branch 'master' of github.com:mate-desktop/mate-notification-daemon

7 files changed, 6 insertions, 69 deletions

diff --git a/configure.ac b/configure.ac
index fd0c32a..4c20f40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create configure.
 dnl ################################################################
 dnl # Initialize autoconf
 dnl ################################################################
-AC_INIT([mate-notification-daemon], [1.6.0], [http://www.mate-desktop.org])
+AC_INIT([mate-notification-daemon], [1.7.0], [http://www.mate-desktop.org])
 AC_PREREQ(2.63)
 
 AC_CONFIG_HEADERS([config.h])
diff --git a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
deleted file mode 100644
index ee1fbdc..0000000
--- a/distro/archlinux/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-pkgname=mate-notification-daemon
-pkgver=2011.12.01
-pkgrel=1
-pkgdesc="Notification daemon for MATE"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libmatenotify' 'libmatewnck' 'gtk2')
-makedepends=('intltool')
-conflicts=('notification-daemon')
-provides=('notification-daemon')
-url="http://matsusoft.com.ar/projects/mate/"
-groups=('mate')
-options=('!libtool' '!emptydirs')
-install=mate-notification-daemon.install
-source=()
-sha256sums=()
-
-
-
-build() {
-    cd "${srcdir}/../../../"
-
-    ./autogen.sh \
-        --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static \
-        --libexecdir=/usr/lib/mate-notification-daemon \
-        --disable-schemas-install || return 1
-
-    make || return 1
-}
-
-package() {
-    cd "${srcdir}/../../../"
-
-    make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
-
-    # hax! still conflicts with libnotify
-    #ln -s mate-notify-send ${pkgdir}/usr/bin/notify-send
-
-    install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
-    mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas || return 1
-    rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
-}
diff --git a/distro/archlinux/mate-notification-daemon.install b/distro/archlinux/mate-notification-daemon.install
deleted file mode 100644
index 67875d2..0000000
--- a/distro/archlinux/mate-notification-daemon.install
+++ /dev/null
@@ -1,18 +0,0 @@
-pkgname=mate-notification-daemon
-
-post_install() {
-	usr/sbin/mateconfpkg --install ${pkgname}
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-	pre_remove $1
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-	usr/sbin/mateconfpkg --uninstall ${pkgname}
-}
diff --git a/src/capplet/mate-notification-properties.1 b/src/capplet/mate-notification-properties.1
index c263aee..2053aa4 100644
--- a/src/capplet/mate-notification-properties.1
+++ b/src/capplet/mate-notification-properties.1
@@ -12,7 +12,7 @@ mate-notification-properties \- Set up the options for desktop notifications
 This manual page documents briefly the \fBmate-notification-properties\fR
 command.
 .PP
-\fBmate-notification-properties\fR is an utility to set up various
+\fBmate-notification-properties\fR is a utility to set up various
 options related to desktop notifications. 
 
 .SH "AUTHOR"
@@ -21,5 +21,5 @@ options related to desktop notifications.
 written by Jonh Wendell <[email protected]> and Perberos <[email protected]>.
 
 This manual page was written by Francois Wendling <[email protected]> for the
-notification-properties in Debian GNU/Linux system (but may be used by others)
+notification-properties in Debian project (but may be used by others)
 and adapted for MATE by Stefano Karapetsas <[email protected]>.
diff --git a/src/capplet/mate-notification-properties.desktop.in b/src/capplet/mate-notification-properties.desktop.in
index f7b6b61..2bbdace 100644
--- a/src/capplet/mate-notification-properties.desktop.in
+++ b/src/capplet/mate-notification-properties.desktop.in
@@ -8,4 +8,4 @@ Type=Application
 StartupNotify=true
 Categories=GTK;Settings;DesktopSettings;
 OnlyShowIn=MATE;
-
+Keywords=MATE;Notification;Theme;
diff --git a/src/themes/coco/coco-theme.c b/src/themes/coco/coco-theme.c
index 7e98881..2825500 100644
--- a/src/themes/coco/coco-theme.c
+++ b/src/themes/coco/coco-theme.c
@@ -714,7 +714,7 @@ set_notification_hints(GtkWindow *nw, GHashTable *hints)
 
 	value = (GValue *)g_hash_table_lookup(hints, "urgency");
 
-	if (value != NULL)
+	if (value != NULL && G_VALUE_HOLDS_UCHAR(value))
 	{
 		windata->urgency = g_value_get_uchar(value);
 
diff --git a/src/themes/nodoka/nodoka-theme.c b/src/themes/nodoka/nodoka-theme.c
index 143a44c..2a0e56a 100644
--- a/src/themes/nodoka/nodoka-theme.c
+++ b/src/themes/nodoka/nodoka-theme.c
@@ -1173,7 +1173,7 @@ set_notification_hints(GtkWindow *nw, GHashTable *hints)
 
 	value = (GValue *)g_hash_table_lookup(hints, "urgency");
 
-	if (value != NULL)
+	if (value != NULL && G_VALUE_HOLDS_UCHAR(value))
 	{
 		windata->urgency = g_value_get_uchar(value);