From d39dce39122b4f2e02c5e169581daa9016d26bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Mon, 18 Feb 2013 22:05:47 +0200
Subject: use libnotify, not libmatenotify

---
 src/Makefile.am   | 6 +++---
 src/gpm-manager.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index a808b14..b5e7369 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,7 @@ INCLUDES =						\
 	$(KEYRING_CFLAGS)				\
 	$(UNIQUE_CFLAGS)				\
 	$(X11_CFLAGS)					\
-	$(LIBMATENOTIFY_CFLAGS)				\
+	$(LIBNOTIFY_CFLAGS)				\
 	$(CANBERRA_CFLAGS)				\
 	$(GSTREAMER_CFLAGS)				\
 	-DI_KNOW_THE_DEVICEKIT_POWER_API_IS_SUBJECT_TO_CHANGE \
@@ -189,7 +189,7 @@ mate_power_manager_LDADD =				\
 	$(DBUS_LIBS)					\
 	$(X11_LIBS)						\
 	$(CANBERRA_LIBS)				\
-	$(LIBMATENOTIFY_LIBS)				\
+	$(LIBNOTIFY_LIBS)				\
 	$(GPM_EXTRA_LIBS)				\
 	$(UPOWER_LIBS)					\
 	-lm
@@ -257,7 +257,7 @@ mate_power_self_test_LDADD =				\
 	$(UPOWER_LIBS)					\
 	$(DBUS_LIBS)					\
 	$(X11_LIBS)						\
-	$(LIBMATENOTIFY_LIBS)				\
+	$(LIBNOTIFY_LIBS)				\
 	$(GPM_EXTRA_LIBS)				\
 	-lm
 
diff --git a/src/gpm-manager.c b/src/gpm-manager.c
index f1be5d8..3d501b4 100644
--- a/src/gpm-manager.c
+++ b/src/gpm-manager.c
@@ -40,7 +40,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <canberra-gtk.h>
 #include <libupower-glib/upower.h>
-#include <libmatenotify/notify.h>
+#include <libnotify/notify.h>
 
 #include "egg-debug.h"
 #include "egg-console-kit.h"
@@ -486,9 +486,9 @@ gpm_manager_notify (GpmManager *manager, NotifyNotification **notification_class
 	/* if the status icon is hidden, don't point at it */
 	if (manager->priv->status_icon != NULL &&
 	    gtk_status_icon_is_embedded (manager->priv->status_icon))
-		notification = notify_notification_new_with_status_icon (title, message, icon, manager->priv->status_icon);
+		notification = notify_notification_new (title, message, gtk_status_icon_get_icon_name(manager->priv->status_icon));
 	else
-		notification = notify_notification_new (title, message, icon, NULL);
+		notification = notify_notification_new (title, message, icon);
 	notify_notification_set_timeout (notification, timeout);
 	notify_notification_set_urgency (notification, urgency);
 	g_signal_connect (notification, "closed", G_CALLBACK (gpm_manager_notification_closed_cb), notification_class);
-- 
cgit v1.2.1