Port to gtk3 for the tests

8 files changed, 26 insertions, 21 deletions

diff --git a/configure.ac b/configure.ac
index 19079fc..ac02d31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,7 +89,7 @@ AC_EXEEXT
 AM_PROG_LIBTOOL
 
 REQ_DBUS_VERSION=0.76
-REQ_GTK_VERSION=2.18
+REQ_GTK_VERSION=2.90
 REQ_GLIB_VERSION=2.6
 
 pkg_modules="gdk-pixbuf-2.0 glib-2.0 >= $REQ_GLIB_VERSION, dbus-1 >= $REQ_DBUS_VERSION, dbus-glib-1 >= $REQ_DBUS_VERSION"
@@ -97,8 +97,8 @@ PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 AC_SUBST(PACKAGE_LIBS)
 AC_SUBST(PACKAGE_CFLAGS)
 
-tests_modules="gtk+-2.0 >= $REQ_GTK_VERSION, glib-2.0 >= $REQ_GLIB_VERSION, dbus-1 >= $REQ_DBUS_VERSION, dbus-glib-1 >= $REQ_DBUS_VERSION"
-PKG_CHECK_MODULES(TEST, [$tests_modules])
+tests_modules="gtk+-3.0 >= $REQ_GTK_VERSION dbus-glib-1 >= $REQ_DBUS_VERSION"
+PKG_CHECK_MODULES(TESTS, [$tests_modules])
 AC_SUBST(TESTS_LIBS)
 AC_SUBST(TESTS_CFLAGS)
 
diff --git a/docs/reference/tmpl/libnotify-unused.sgml b/docs/reference/tmpl/libnotify-unused.sgml
index f3a1e60..f3ae995 100644
--- a/docs/reference/tmpl/libnotify-unused.sgml
+++ b/docs/reference/tmpl/libnotify-unused.sgml
@@ -1,3 +1,9 @@
+<!-- ##### ARG NotifyNotification:attach-widget ##### -->
+<para>
+
+</para>
+
+
 <!-- ##### ARG NotifyNotification:status-icon ##### -->
 <para>
 
diff --git a/docs/reference/tmpl/notification.sgml b/docs/reference/tmpl/notification.sgml
index 0e67dcf..e5937f3 100644
--- a/docs/reference/tmpl/notification.sgml
+++ b/docs/reference/tmpl/notification.sgml
@@ -54,11 +54,6 @@ not be used directly. Use the accessor functions below.
 
 @notifynotification: the object which received the signal.
 
-<!-- ##### ARG NotifyNotification:attach-widget ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG NotifyNotification:body ##### -->
 <para>
 
diff --git a/libnotify/Makefile.am b/libnotify/Makefile.am
index 66abb80..7e6cf85 100644
--- a/libnotify/Makefile.am
+++ b/libnotify/Makefile.am
@@ -4,6 +4,13 @@ MARSHAL_PREFIX = notify_marshal
 MARSHAL_FILE = notify-marshal
 ENUM_FILE = notify-enum-types
 
+AM_CPPFLAGS = \
+	-I.				\
+	-I..				\
+	-I$(top_srcdir)			\
+	-DG_LOG_DOMAIN=\"libnotify\"	\
+	$(PACKAGE_CFLAGS)
+
 lib_LTLIBRARIES = libnotify.la
 
 notify_headers = \
@@ -84,9 +91,4 @@ CLEANFILES = \
 	s-enum-types-c \
 	s-enum-types-h
 
-INCLUDES = \
-	-I$(top_srcdir) \
-	-DG_LOG_DOMAIN=\"libnotify\" \
-	$(PACKAGE_CFLAGS)
-
 -include $(top_srcdir)/git.mk
diff --git a/libnotify/notification.h b/libnotify/notification.h
index 982bc2e..c117210 100644
--- a/libnotify/notification.h
+++ b/libnotify/notification.h
@@ -25,7 +25,6 @@
 
 #include <glib.h>
 #include <glib-object.h>
-
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS
diff --git a/libnotify/notify.c b/libnotify/notify.c
index 19138af..d8593cc 100644
--- a/libnotify/notify.c
+++ b/libnotify/notify.c
@@ -27,6 +27,10 @@
 #include <stdarg.h>
 #include <unistd.h>
 
+#include <glib.h>
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+
 #include "notify.h"
 #include "internal.h"
 #include "notify-marshal.h"
diff --git a/libnotify/notify.h b/libnotify/notify.h
index 334dfa2..58c63a3 100644
--- a/libnotify/notify.h
+++ b/libnotify/notify.h
@@ -23,7 +23,6 @@
 #define _LIBNOTIFY_NOTIFY_H_
 
 #include <glib.h>
-#include <time.h>
 
 #include <libnotify/notification.h>
 #include <libnotify/notify-enum-types.h>
@@ -59,7 +58,7 @@ gboolean        notify_is_initted (void);
  *
  * @return The name of the application.
  */
-const gchar    *notify_get_app_name (void);
+const char     *notify_get_app_name (void);
 
 /**
  * Returns the capabilities of the notification server.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fcd7b1b..115cbd9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,7 @@
+INCLUDES = \
+	-I$(top_srcdir) \
+	$(TESTS_CFLAGS)
+
 noinst_PROGRAMS = \
 	test-replace \
 	test-replace-widget \
@@ -18,7 +22,7 @@ noinst_PROGRAMS = \
 
 common_ldflags = \
 	$(top_builddir)/libnotify/libnotify.la \
-	$(PACKAGE_LIBS)
+	$(TESTS_LIBS)
 
 test_replace_SOURCES = test-replace.c
 test_replace_LDADD  = $(common_ldflags)
@@ -70,8 +74,4 @@ test_persistence_LDADD = $(common_ldflags)
 
 EXTRA_DIST = applet-critical.png
 
-INCLUDES = $(PACKAGE_CFLAGS)	\
-	$(GTK3_CFLAGS)		\
-	-I$(top_srcdir)
-
 -include $(top_srcdir)/git.mk