diff options
| author | Stefano Karapetsas <[email protected]> | 2013-02-18 13:54:58 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-02-18 13:54:58 -0800 |
| commit | 982c86b51d022fb4fa9310daaeb5c77e070328de (patch) | |
| tree | 9963e509e0cd5cbbd4db7eaf0972f347e500dc17 | |
| parent | 790fa5e0ea340ce4c826237e1c4626096c5d42bc (diff) | |
| parent | 7ab40269be0cfe23e4d404d9e304d589ee81873f (diff) | |
| download | mate-power-manager-982c86b51d022fb4fa9310daaeb5c77e070328de.tar.bz2 mate-power-manager-982c86b51d022fb4fa9310daaeb5c77e070328de.tar.xz | |
Merge pull request #49 from glensc/libnotify
use libnotify, not libmatenotify
| -rw-r--r-- | applets/brightness/Makefile.am | 2 | ||||
| -rw-r--r-- | applets/inhibit/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | src/gpm-manager.c | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am index 781a6b0..5d896e2 100644 --- a/applets/brightness/Makefile.am +++ b/applets/brightness/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ $(DBUS_CFLAGS) \ $(MATE_CFLAGS) \ $(PANEL_CFLAGS) \ - $(LIBMATENOTIFY_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ $(GTKUNIQUE_CFLAGS) \ -DBINDIR=\"$(bindir)\" \ -DMATELOCALEDIR=\""$(datadir)/locale"\" \ diff --git a/applets/inhibit/Makefile.am b/applets/inhibit/Makefile.am index 37f5d6c..b6d6258 100644 --- a/applets/inhibit/Makefile.am +++ b/applets/inhibit/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ $(DBUS_CFLAGS) \ $(MATE_CFLAGS) \ $(PANEL_CFLAGS) \ - $(LIBMATENOTIFY_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ $(GTKUNIQUE_CFLAGS) \ -DBINDIR=\"$(bindir)\" \ -DMATELOCALEDIR=\""$(datadir)/locale"\" \ diff --git a/configure.ac b/configure.ac index f2db80c..8e5208f 100644 --- a/configure.ac +++ b/configure.ac @@ -106,7 +106,7 @@ GDK_REQUIRED=2.11.0 MATE_KEYRING_REQUIRED=1.1.0 DBUS_REQUIRED=1.0 DBUS_GLIB_REQUIRED=0.70 -LIBMATENOTIFY_REQUIRED=1.1.0 +LIBNOTIFY_REQUIRED=0.7.0 CAIRO_REQUIRED=1.0.0 UNIQUE_REQUIRED=0.9.4 LIBPANEL_REQUIRED=1.5.0 @@ -167,7 +167,7 @@ PKG_CHECK_EXISTS( [xrandr >= 1.3], [AC_DEFINE(HAVE_XRANDR_13, 1, [xrandr 1.3 available])]) -PKG_CHECK_MODULES(LIBMATENOTIFY, libmatenotify >= $LIBMATENOTIFY_REQUIRED) +PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) dnl ---------------------------------------------------------------------------- dnl - Unique 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); |