summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-01-18 15:51:16 +0100
committerStefano Karapetsas <[email protected]>2014-01-18 15:51:16 +0100
commit9af8d0b1003aaa525b736854219ed381e2a18fc6 (patch)
treeaecea73dc3190137c6d1583aa4e454f115aa84ff /src
parent6f8a1ae9a3908667d3ea21aa9987b7fee412a3ba (diff)
parent48d19cb30fab1d5a638f8ba42bc54315fafce434 (diff)
downloadmate-notification-daemon-9af8d0b1003aaa525b736854219ed381e2a18fc6.tar.bz2
mate-notification-daemon-9af8d0b1003aaa525b736854219ed381e2a18fc6.tar.xz
Merge branch 'master' of github.com:mate-desktop/mate-notification-daemon
Diffstat (limited to 'src')
-rw-r--r--src/capplet/mate-notification-properties.14
-rw-r--r--src/capplet/mate-notification-properties.desktop.in2
-rw-r--r--src/themes/coco/coco-theme.c2
-rw-r--r--src/themes/nodoka/nodoka-theme.c2
4 files changed, 5 insertions, 5 deletions
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);