[Xfce4-commits] <xfce4-screenshooter:master> Replace libxfcegui4 by libxfce4ui (bug #6438).

[Jérôme Guelfucci]

Updating branch refs/heads/master
         to 504a9935f3fa900636ae5f8f40e8182b4fc293ec (commit)
       from 67995de822ffc2a1d58536e08f8a5f3952d5bdae (commit)

commit 504a9935f3fa900636ae5f8f40e8182b4fc293ec
Author: Jérôme Guelfucci <jeromeg at xfce.org>
Date:   Tue Dec 7 14:41:30 2010 +0100

    Replace libxfcegui4 by libxfce4ui (bug #6438).

 Makefile.am     |   12 ++++++------
 NEWS            |    5 +++--
 configure.ac.in |    2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 55b06b6..e1e12ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,7 @@ lib_libscreenshooter_la_CFLAGS = \
   @GTK_CFLAGS@ \
 	@GLIB_CFLAGS@ \
 	@LIBXFCE4UTIL_CFLAGS@ \
-	@LIBXFCEGUI4_CFLAGS@ \
+	@LIBXFCE4UI_CFLAGS@ \
 	@SOUP_CFLAGS@ \
   -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
 
@@ -45,7 +45,7 @@ lib_libscreenshooter_la_LIBADD = \
 	@EXO_LIBS@ \
   @GTK_LIBS@ \
 	@LIBXFCE4UTIL_LIBS@ \
-	@LIBXFCEGUI4_LIBS@ \
+	@LIBXFCE4UI_LIBS@ \
   @GLIB_LIBS@ \
 	@SOUP_LIBS@
 
@@ -78,7 +78,7 @@ src_xfce4_screenshooter_CFLAGS = \
 	@GTK_CFLAGS@ \
 	@GLIB_CFLAGS@ \
 	@LIBXFCE4UTIL_CFLAGS@ \
-	@LIBXFCEGUI4_CFLAGS@ \
+	@LIBXFCE4UI_CFLAGS@ \
 	@GTHREAD_CFLAGS@ \
 	@SOUP_CFLAGS@ \
 	-DPACKAGE_LOCALE_DIR=\"$(localedir)\"
@@ -90,7 +90,7 @@ src_xfce4_screenshooter_LDFLAGS = \
 	@GTHREAD_LIBS@ \
 	@SOUP_LIBS@ \
 	@LIBXFCE4UTIL_LIBS@ \
-	@LIBXFCEGUI4_LIBS@
+	@LIBXFCE4UI_LIBS@
 
 src_xfce4_screenshooter_LDADD = lib/libscreenshooter.la
 	
@@ -119,7 +119,7 @@ panel_plugin_xfce4_screenshooter_plugin_CFLAGS =	\
 	-I$(top_srcdir)/lib/	\
 	@EXO_CFLAGS@ \
 	@LIBXFCE4PANEL_CFLAGS@ \
-	@LIBXFCEGUI4_CFLAGS@ \
+	@LIBXFCE4UI_CFLAGS@ \
 	@GTHREAD_CFLAGS@ \
 	@SOUP_CFLAGS@
 
@@ -128,7 +128,7 @@ panel_plugin_xfce4_screenshooter_plugin_LDFLAGS = \
 	@LIBXFCE4PANEL_LIBS@ \
 	@GTHREAD_LIBS@ \
 	@SOUP_LIBS@ \
-	@LIBXFCEGUI4_LIBS@
+	@LIBXFCE4UI_LIBS@
 
 panel_plugin_xfce4_screenshooter_plugin_LDADD = lib/libscreenshooter.la
 
diff --git a/NEWS b/NEWS
index 4785cd2..43a28cb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 === Version x.x.x ===
 
-  * Gtk 2.16 is now required to compile.
+  * Gtk 2.16 and libxfce4ui are now required.
+  * Xfce4 Screenshooter does not depend anymore on libxfcegui4.
 
   * Bugs fixed:
     - Fix build with Xfce's master branch.
@@ -58,7 +59,7 @@
     - Plug some leaks in the application and in the panel plugin.
     - Do not accept conflicting CLI options. Warn the user when he uses
       CLI options which are not coherent.
-    - Correctly save preferences, even if the rc file does not exist 
+    - Correctly save preferences, even if the rc file does not exist
       (Mike Massonnet).
     - One second is now the minimal delay when using the interactive
       mode. This caused the screenshooter dialog to be partially displayed
diff --git a/configure.ac.in b/configure.ac.in
index 84bffae..3b0e44c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -48,7 +48,7 @@ dnl *** Check for required packages ***
 dnl ***********************************
 XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.7.0])
 XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.16.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.16.0])
 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.16.0])