[Xfce4-commits] r29753 - in thunar/branches/migration-to-gio: . thunar thunarx

[Jannis Pohlmann]

Author: jannis
Date: 2009-04-10 19:42:40 +0000 (Fri, 10 Apr 2009)
New Revision: 29753

Modified:
   thunar/branches/migration-to-gio/AUTHORS
   thunar/branches/migration-to-gio/ChangeLog
   thunar/branches/migration-to-gio/configure.in.in
   thunar/branches/migration-to-gio/thunar/Makefile.am
   thunar/branches/migration-to-gio/thunarx/Makefile.am
Log:
	* AUTHORS: Put my name in. Yeah, yeah ...
	* configure.in.in, thunar/Makefile.am, thunarx/Makefile.am: Add
	  dependency on GIO. Bump required GTK+/GLib version to 2.14/2.16.

Modified: thunar/branches/migration-to-gio/AUTHORS
===================================================================
--- thunar/branches/migration-to-gio/AUTHORS	2009-04-09 22:09:36 UTC (rev 29752)
+++ thunar/branches/migration-to-gio/AUTHORS	2009-04-10 19:42:40 UTC (rev 29753)
@@ -1,4 +1,5 @@
 Benedikt Meurer <benny at xfce.org>
+Jannis Pohlmann <jannis at xfce.org>
 Jeffs Franks <jcfranks at xfce.org>
 
 The tdb library, which is included with the Thunar distribution, was originally

Modified: thunar/branches/migration-to-gio/ChangeLog
===================================================================
--- thunar/branches/migration-to-gio/ChangeLog	2009-04-09 22:09:36 UTC (rev 29752)
+++ thunar/branches/migration-to-gio/ChangeLog	2009-04-10 19:42:40 UTC (rev 29753)
@@ -1,3 +1,9 @@
+2009-04-10	Jannis Pohlmann <jannis at xfce.org>
+
+	* AUTHORS: Put my name in. Yeah, yeah ...
+	* configure.in.in, thunar/Makefile.am, thunarx/Makefile.am: Add
+	  dependency on GIO. Bump required GTK+/GLib version to 2.14/2.16.
+
 2009-04-09	Jannis Pohlmann <jannis at xfce.org>
 
 	* README: Add information about the purpose of this branch and

Modified: thunar/branches/migration-to-gio/configure.in.in
===================================================================
--- thunar/branches/migration-to-gio/configure.in.in	2009-04-09 22:09:36 UTC (rev 29752)
+++ thunar/branches/migration-to-gio/configure.in.in	2009-04-10 19:42:40 UTC (rev 29753)
@@ -16,7 +16,7 @@
 m4_define([thunar_version_micro], [0])
 m4_define([thunar_version_nano], [])
 m4_define([thunar_version_build], [r at REVISION@])
-m4_define([thunar_version_tag], [])
+m4_define([thunar_version_tag], [svn])
 m4_define([thunar_version], [thunar_version_major().thunar_version_minor().thunar_version_micro()ifelse(thunar_version_nano(), [], [], [.thunar_version_nano()])ifelse(thunar_version_tag(), [svn], [thunar_version_tag()-thunar_version_build()], [thunar_version_tag()])])
 
 dnl *******************************************
@@ -160,10 +160,11 @@
 dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.12.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.12.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
-XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.10.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.16.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.14.0])
+XDT_CHECK_PACKAGE([GDK_PIXBUF], [gdk-pixbuf-2.0], [2.14.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.6.0])
 
 dnl *********************************************

Modified: thunar/branches/migration-to-gio/thunar/Makefile.am
===================================================================
--- thunar/branches/migration-to-gio/thunar/Makefile.am	2009-04-09 22:09:36 UTC (rev 29752)
+++ thunar/branches/migration-to-gio/thunar/Makefile.am	2009-04-10 19:42:40 UTC (rev 29753)
@@ -195,6 +195,7 @@
 Thunar_CFLAGS =								\
 	$(EXO_CFLAGS)							\
 	$(GTHREAD_CFLAGS)						\
+	$(GIO_CFLAGS)							\
 	$(LIBSM_CFLAGS)							\
 	$(PLATFORM_CFLAGS)
 
@@ -209,6 +210,7 @@
 	$(top_builddir)/thunarx/libthunarx-$(THUNAR_VERSION_API).la	\
 	$(EXO_LIBS)							\
 	$(GTHREAD_LIBS)							\
+	$(GIO_LIBS)							\
 	$(LIBSM_LIBS)
 
 Thunar_DEPENDENCIES =							\
@@ -247,7 +249,7 @@
 clean-local:
 	rm -f *.core core core.*
 
-DISTCLEANFILES =								\
+DISTCLEANFILES =							\
 	thunar-settings.desktop
 
 if MAINTAINER_MODE
@@ -335,18 +337,18 @@
 	&& rm -f xgen-tmc
 endif
 
-EXTRA_DIST =									\
-	thunar-abstract-icon-view-ui.xml			\
-	thunar-dbus-service-infos.xml				\
+EXTRA_DIST =								\
+	thunar-abstract-icon-view-ui.xml				\
+	thunar-dbus-service-infos.xml					\
 	thunar-details-view-ui.xml					\
 	thunar-launcher-ui.xml						\
-	thunar-location-buttons-ui.xml				\
-	thunar-marshal.list							\
-	thunar-renamer-dialog-ui.xml				\
+	thunar-location-buttons-ui.xml					\
+	thunar-marshal.list						\
+	thunar-renamer-dialog-ui.xml					\
 	thunar-standard-view-ui.xml					\
 	thunar-thumbnail-frame.png					\
 	thunar-window-ui.xml						\
-	thunar-settings								\
+	thunar-settings							\
 	$(desktop_in_files)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:

Modified: thunar/branches/migration-to-gio/thunarx/Makefile.am
===================================================================
--- thunar/branches/migration-to-gio/thunarx/Makefile.am	2009-04-09 22:09:36 UTC (rev 29752)
+++ thunar/branches/migration-to-gio/thunarx/Makefile.am	2009-04-10 19:42:40 UTC (rev 29753)
@@ -52,6 +52,8 @@
 	thunarx-renamer-provider.c
 
 libthunarx_1_la_CFLAGS =						\
+	$(GLIB_CFLAGS)							\
+	$(GIO_CFLAGS)							\
 	$(GTK_CFLAGS)							\
 	$(PLATFORM_CFLAGS)
 
@@ -62,6 +64,8 @@
 	$(PLATFORM_LDFLAGS)
 
 libthunarx_1_la_LIBADD =						\
+	$(GLIB_LIBS)							\
+	$(GIO_LIBS)							\
 	$(GTK_LIBS)
 
 pkgconfigdir = $(libdir)/pkgconfig