From 41389eb9c8c16917cbc4060b3769da95ecb64dd1 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Thu, 28 Feb 2013 12:39:47 +0100
Subject: Use libnotify instead of libmatenotify

---
 mateweather/Makefile.am          | 12 +++++++-----
 mateweather/mateweather-applet.c | 12 +++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'mateweather')

diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am
index e2e8322e..6058ba27 100644
--- a/mateweather/Makefile.am
+++ b/mateweather/Makefile.am
@@ -7,9 +7,10 @@ INCLUDES =					\
 	-I$(top_srcdir)				\
 	-DMATEWEATHER_MENU_UI_DIR=\""$(uidir)"\"	\
 	$(MATE_APPLETS4_CFLAGS)		\
-	$(LIBMATENOTIFY_CFLAGS)			\
+	$(LIBNOTIFY_CFLAGS)			\
 	$(LIBMATEWEATHER_CFLAGS)			\
-	$(NETWORKMANAGER_CFLAGS)
+	$(NETWORKMANAGER_CFLAGS)			\
+	$(DBUS_CFLAGS)
 
 libexec_PROGRAMS = mateweather-applet-2
 
@@ -22,11 +23,12 @@ mateweather_applet_2_SOURCES = \
 	mateweather-applet.c mateweather-applet.h
 
 mateweather_applet_2_LDADD = 	\
-	$(LIBMATENOTIFY_LIBS) 	\
+	$(LIBNOTIFY_LIBS) 	\
 	$(MATE_APPLETS4_LIBS)	\
 	$(MATE_LIBS2_LIBS)	\
-	$(LIBMATEWEATHER_LIBS) 	\
-	$(NETWORKMANAGER_LIBS)
+	$(LIBMATEWEATHER_LIBS)	\
+	$(NETWORKMANAGER_LIBS)	\
+	$(DBUS_LIBS)
 
 uidir = $(datadir)/mate-2.0/ui
 ui_DATA = mateweather-applet-menu.xml
diff --git a/mateweather/mateweather-applet.c b/mateweather/mateweather-applet.c
index 8420195e..fdb9879e 100644
--- a/mateweather/mateweather-applet.c
+++ b/mateweather/mateweather-applet.c
@@ -27,9 +27,8 @@
 
 #include <gdk/gdkkeysyms.h>
 
-#ifdef HAVE_LIBMATENOTIFY
-#include <libmatenotify/notify.h>
-#include <libmatenotify/notification.h>
+#ifdef HAVE_LIBNOTIFY
+#include <libnotify/notify.h>
 #endif
 
 #define MATEWEATHER_I_KNOW_THIS_IS_UNSTABLE
@@ -393,7 +392,7 @@ static void
 update_finish (WeatherInfo *info, gpointer data)
 {
     static int gw_fault_counter = 0;
-#ifdef HAVE_LIBMATENOTIFY
+#ifdef HAVE_LIBNOTIFY
     char *message, *detail;
 #endif
     char *s;
@@ -442,7 +441,7 @@ update_finish (WeatherInfo *info, gpointer data)
 	    /* update applet */
 	    place_widgets(gw_applet);
 
-#ifdef HAVE_LIBMATENOTIFY
+#ifdef HAVE_LIBNOTIFY
 		    NotifyNotification *n;
 	            
 		    /* Show notifications if possible */
@@ -468,8 +467,7 @@ update_finish (WeatherInfo *info, gpointer data)
 			 if (icon == NULL)
 				 icon = "stock-unknown";
 	           	 
-			 n = notify_notification_new (message, detail, icon,
-					 gw_applet->container);
+			 n = notify_notification_new (message, detail, icon);
 	
 		   	 notify_notification_show (n, &error);
 			 if (error)
-- 
cgit v1.2.1