summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/capplet/Makefile.am2
-rw-r--r--src/daemon/Makefile.am2
-rw-r--r--src/daemon/daemon.c29
-rw-r--r--src/themes/standard/Makefile.am2
4 files changed, 18 insertions, 17 deletions
diff --git a/src/capplet/Makefile.am b/src/capplet/Makefile.am
index 3a15e6d..dfd31f2 100644
--- a/src/capplet/Makefile.am
+++ b/src/capplet/Makefile.am
@@ -14,7 +14,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
man_MANS = mate-notification-properties.1
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/src/daemon \
$(NOTIFICATION_CAPPLET_CFLAGS) \
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 4f9471c..ce476e5 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -18,7 +18,7 @@ notificationdaemon-dbus-glue.h: notificationdaemon.xml
dbus-binding-tool --mode=glib-server --prefix=notification_daemon \
$(srcdir)/notificationdaemon.xml > notificationdaemon-dbus-glue.h
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
$(NOTIFICATION_DAEMON_CFLAGS) \
-DENGINES_DIR=\"$(libdir)/mate-notification-daemon/engines\"
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index ec3ddf5..56c40f7 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -42,7 +42,8 @@
#include <X11/Xatom.h>
#include <gdk/gdkx.h>
-#include <libmatewnck/libmatewnck.h>
+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
+#include <libwnck/libwnck.h>
#include "daemon.h"
#include "engines.h"
@@ -1147,36 +1148,36 @@ static gboolean screensaver_active(GtkWidget* nw)
static gboolean fullscreen_window_exists(GtkWidget* nw)
{
- MatewnckScreen* matewnck_screen;
- MatewnckWorkspace* matewnck_workspace;
+ WnckScreen* wnck_screen;
+ WnckWorkspace* wnck_workspace;
GList* l;
#if (GDK_PIXBUF_MAJOR == 2) && (GDK_PIXBUF_MINOR < 22)
- matewnck_screen = matewnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw))));
+ wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_window_get_screen(gtk_widget_get_window(nw))));
#else
- matewnck_screen = matewnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
+ wnck_screen = wnck_screen_get(GDK_SCREEN_XNUMBER(gdk_drawable_get_screen(GDK_DRAWABLE(GTK_WIDGET(nw)->window))));
#endif
- matewnck_screen_force_update (matewnck_screen);
+ wnck_screen_force_update (wnck_screen);
- matewnck_workspace = matewnck_screen_get_active_workspace (matewnck_screen);
+ wnck_workspace = wnck_screen_get_active_workspace (wnck_screen);
- for (l = matewnck_screen_get_windows_stacked (matewnck_screen); l != NULL; l = l->next)
+ for (l = wnck_screen_get_windows_stacked (wnck_screen); l != NULL; l = l->next)
{
- MatewnckWindow *matewnck_win = (MatewnckWindow *) l->data;
+ WnckWindow *wnck_win = (WnckWindow *) l->data;
- if (matewnck_window_is_on_workspace (matewnck_win, matewnck_workspace) && matewnck_window_is_fullscreen (matewnck_win) && matewnck_window_is_active (matewnck_win))
+ if (wnck_window_is_on_workspace (wnck_win, wnck_workspace) && wnck_window_is_fullscreen (wnck_win) && wnck_window_is_active (wnck_win))
{
/*
* Sanity check if the window is _really_ fullscreen to
- * work around a bug in libmatewnck that doesn't get all
+ * work around a bug in libwnck that doesn't get all
* unfullscreen events.
*/
- int sw = matewnck_screen_get_width (matewnck_screen);
- int sh = matewnck_screen_get_height (matewnck_screen);
+ int sw = wnck_screen_get_width (wnck_screen);
+ int sh = wnck_screen_get_height (wnck_screen);
int x, y, w, h;
- matewnck_window_get_geometry (matewnck_win, &x, &y, &w, &h);
+ wnck_window_get_geometry (wnck_win, &x, &y, &w, &h);
if (sw == w && sh == h)
{
diff --git a/src/themes/standard/Makefile.am b/src/themes/standard/Makefile.am
index d5b4a2a..c31098c 100644
--- a/src/themes/standard/Makefile.am
+++ b/src/themes/standard/Makefile.am
@@ -6,6 +6,6 @@ libstandard_la_SOURCES = theme.c
libstandard_la_LDFLAGS = -module -avoid-version -no-undefined
libstandard_la_LIBADD = $(NOTIFICATION_DAEMON_LIBS)
-INCLUDES = $(NOTIFICATION_DAEMON_CFLAGS)
+AM_CPPFLAGS = $(NOTIFICATION_DAEMON_CFLAGS)
-include $(top_srcdir)/git.mk