summaryrefslogtreecommitdiff
path: root/plugins/xrandr
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-02-18 13:55:46 -0800
committerStefano Karapetsas <[email protected]>2013-02-18 13:55:46 -0800
commit0f21ea2e034a258a69a194b8a9ed46cb57f20f5d (patch)
tree5e42635341a58e948508f09e2ba2aa37a7487daf /plugins/xrandr
parent6f12750fb05e6284b4356a6648a47ce202ff2d39 (diff)
parent9ee6ae64330b0f0066ef07a663e4d1bca6510f2c (diff)
downloadmate-settings-daemon-0f21ea2e034a258a69a194b8a9ed46cb57f20f5d.tar.bz2
mate-settings-daemon-0f21ea2e034a258a69a194b8a9ed46cb57f20f5d.tar.xz
Merge pull request #40 from glensc/libnotify
use libnotify 0.7, not libmatenotify
Diffstat (limited to 'plugins/xrandr')
-rw-r--r--plugins/xrandr/Makefile.am4
-rw-r--r--plugins/xrandr/msd-xrandr-manager.c11
2 files changed, 7 insertions, 8 deletions
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index b4afb93..55c01fe 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -54,7 +54,7 @@ libxrandr_la_CPPFLAGS = \
libxrandr_la_CFLAGS = \
$(SETTINGS_PLUGIN_CFLAGS) \
- $(LIBMATENOTIFY_CFLAGS) \
+ $(LIBNOTIFY_CFLAGS) \
$(MATE_DESKTOP_CFLAGS) \
$(AM_CFLAGS)
@@ -63,7 +63,7 @@ libxrandr_la_LDFLAGS = \
libxrandr_la_LIBADD = \
$(SETTINGS_PLUGIN_LIBS) \
- $(LIBMATENOTIFY_LIBS) \
+ $(LIBNOTIFY_LIBS) \
$(MATE_DESKTOP_LIBS)
plugin_in_files = \
diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
index f7f1f88..13a1b19 100644
--- a/plugins/xrandr/msd-xrandr-manager.c
+++ b/plugins/xrandr/msd-xrandr-manager.c
@@ -46,8 +46,8 @@
#include <libmateui/mate-rr.h>
#include <libmateui/mate-rr-labeler.h>
-#ifdef HAVE_LIBMATENOTIFY
-#include <libmatenotify/notify.h>
+#ifdef HAVE_LIBNOTIFY
+#include <libnotify/notify.h>
#endif
#include "mate-settings-profile.h"
@@ -1079,7 +1079,7 @@ generate_fn_f7_configs (MsdXrandrManager *mgr)
static void
error_message (MsdXrandrManager *mgr, const char *primary_text, GError *error_to_display, const char *secondary_text)
{
-#ifdef HAVE_LIBMATENOTIFY
+#ifdef HAVE_LIBNOTIFY
MsdXrandrManagerPrivate *priv = mgr->priv;
NotifyNotification *notification;
@@ -1093,8 +1093,7 @@ error_message (MsdXrandrManager *mgr, const char *primary_text, GError *error_to
else
notification = notify_notification_new (primary_text,
error_to_display ? error_to_display->message : secondary_text,
- MSD_XRANDR_ICON_NAME,
- NULL);
+ MSD_XRANDR_ICON_NAME);
notify_notification_show (notification, NULL); /* NULL-GError */
#else
@@ -1107,7 +1106,7 @@ error_message (MsdXrandrManager *mgr, const char *primary_text, GError *error_to
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
-#endif /* HAVE_LIBMATENOTIFY */
+#endif /* HAVE_LIBNOTIFY */
}
static void