summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-02-18 13:55:18 -0800
committerStefano Karapetsas <[email protected]>2013-02-18 13:55:18 -0800
commit38baf9e50299cda55822256c1d8db5722593e554 (patch)
tree52424675d3e106fb3fb6f31e4ec125da5dab833d
parent38ef332671d38e8653887b75143d7f0a0f29f157 (diff)
parentd263541b686f36a8f61c00eaee4d852ce5e8a766 (diff)
downloadmate-notification-daemon-38baf9e50299cda55822256c1d8db5722593e554.tar.bz2
mate-notification-daemon-38baf9e50299cda55822256c1d8db5722593e554.tar.xz
Merge pull request #12 from glensc/libnotify
use libnotify, not libmatenotify
-rw-r--r--configure.ac2
-rw-r--r--src/capplet/mate-notification-properties.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 3996f77..28afdea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,7 @@ AC_SUBST(NOTIFICATION_DAEMON_LIBS)
dnl ---------------------------------------------------------------------------
dnl Requirements for the setup tool
dnl ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(NOTIFICATION_CAPPLET, glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GIO_VERSION gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libmatenotify dbus-1 dbus-glib-1)
+PKG_CHECK_MODULES(NOTIFICATION_CAPPLET, glib-2.0 >= $REQ_GLIB_VERSION gio-2.0 >= $REQ_GIO_VERSION gtk+-$GTK_API_VERSION >= $GTK_REQUIRED libnotify dbus-1 dbus-glib-1)
AC_SUBST(NOTIFICATION_CAPPLET_CFLAGS)
AC_SUBST(NOTIFICATION_CAPPLET_LIBS)
diff --git a/src/capplet/mate-notification-properties.c b/src/capplet/mate-notification-properties.c
index cffee24..89385ed 100644
--- a/src/capplet/mate-notification-properties.c
+++ b/src/capplet/mate-notification-properties.c
@@ -28,7 +28,7 @@
#include <gdk/gdk.h>
#include <gio/gio.h>
#include <string.h>
-#include <libmatenotify/notify.h>
+#include <libnotify/notify.h>
#include "stack.h"
@@ -472,7 +472,7 @@ static void notification_properties_dialog_preview(NotificationAppletDialog* dia
dialog->preview = NULL;
}
- dialog->preview = notify_notification_new(_("Notification Test"), _("Just a test"), "dialog-information", NULL);
+ dialog->preview = notify_notification_new(_("Notification Test"), _("Just a test"), "dialog-information");
if (!notify_notification_show(dialog->preview, &error))
{