Updating branch refs/heads/master to 0f03c6c55e258453cffd0170aab6ccac48fd4bb9 (commit) from cd25664c090036790eef891893208ca826d84439 (commit)
commit 0f03c6c55e258453cffd0170aab6ccac48fd4bb9 Author: Jérôme Guelfucci <jero...@xfce.org> Date: Fri Jan 22 23:53:01 2010 +0100 Update the build system for libxfce4ui. libxfsm/xfsm-util.h | 1 + xfce4-session-logout/Makefile.am | 4 ++-- xfce4-session-logout/main.c | 2 +- xfce4-session/xfsm-chooser.c | 2 +- xfce4-session/xfsm-dns.c | 2 +- xfce4-session/xfsm-global.c | 2 +- xfce4-session/xfsm-legacy.c | 2 +- xfce4-session/xfsm-manager.c | 2 +- xfce4-session/xfsm-splash-screen.c | 2 +- xfce4-session/xfsm-startup.c | 2 +- xfce4-tips/Makefile.am | 4 ++-- 11 files changed, 13 insertions(+), 12 deletions(-) diff --git a/libxfsm/xfsm-util.h b/libxfsm/xfsm-util.h index d7b9d9b..7bab34c 100644 --- a/libxfsm/xfsm-util.h +++ b/libxfsm/xfsm-util.h @@ -27,6 +27,7 @@ #include <gtk/gtk.h> #include <libxfce4util/libxfce4util.h> +#include <libxfce4ui/libxfce4ui.h> G_BEGIN_DECLS; diff --git a/xfce4-session-logout/Makefile.am b/xfce4-session-logout/Makefile.am index 354c760..2e73c3d 100644 --- a/xfce4-session-logout/Makefile.am +++ b/xfce4-session-logout/Makefile.am @@ -10,11 +10,11 @@ xfce4_session_logout_SOURCES = \ xfce4_session_logout_CFLAGS = \ -I$(top_srcdir) \ $(DBUS_CFLAGS) \ - $(LIBXFCEGUI4_CFLAGS) + $(LIBXFCE4UI_CFLAGS) xfce4_session_logout_LDFLAGS = \ $(DBUS_LIBS) \ - $(LIBXFCEGUI4_LIBS) + $(LIBXFCE4UI_LIBS) EXTRA_DIST = \ $(man_MANS) diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c index cfeadc9..a0765dc 100644 --- a/xfce4-session-logout/main.c +++ b/xfce4-session-logout/main.c @@ -38,7 +38,7 @@ #include <dbus/dbus.h> #include <gtk/gtk.h> -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> /* copied from xfce4-session/shutdown.h -- ORDER MATTERS. The numbers diff --git a/xfce4-session/xfsm-chooser.c b/xfce4-session/xfsm-chooser.c index b23a5b9..1ccea77 100644 --- a/xfce4-session/xfsm-chooser.c +++ b/xfce4-session/xfsm-chooser.c @@ -34,7 +34,7 @@ #endif #include <libxfce4util/libxfce4util.h> -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <libxfsm/xfsm-splash-engine.h> #include <libxfsm/xfsm-util.h> diff --git a/xfce4-session/xfsm-dns.c b/xfce4-session/xfsm-dns.c index 3b5d5fa..2237c68 100644 --- a/xfce4-session/xfsm-dns.c +++ b/xfce4-session/xfsm-dns.c @@ -51,7 +51,7 @@ #include <gtk/gtk.h> -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <libxfsm/xfsm-util.h> diff --git a/xfce4-session/xfsm-global.c b/xfce4-session/xfsm-global.c index 9aa98d0..e582403 100644 --- a/xfce4-session/xfsm-global.c +++ b/xfce4-session/xfsm-global.c @@ -43,7 +43,7 @@ #endif #include <libxfce4util/libxfce4util.h> -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <xfce4-session/shutdown.h> #include <xfce4-session/xfsm-global.h> diff --git a/xfce4-session/xfsm-legacy.c b/xfce4-session/xfsm-legacy.c index eb85794..2860d26 100644 --- a/xfce4-session/xfsm-legacy.c +++ b/xfce4-session/xfsm-legacy.c @@ -71,7 +71,7 @@ #include <gdk/gdkx.h> -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <libwnck/libwnck.h> diff --git a/xfce4-session/xfsm-manager.c b/xfce4-session/xfsm-manager.c index 6aa3543..8c78975 100644 --- a/xfce4-session/xfsm-manager.c +++ b/xfce4-session/xfsm-manager.c @@ -74,7 +74,7 @@ #include <libwnck/libwnck.h> #include "xfsm-shutdown-helper.h" -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <libxfsm/xfsm-splash-engine.h> #include <libxfsm/xfsm-util.h> diff --git a/xfce4-session/xfsm-splash-screen.c b/xfce4-session/xfsm-splash-screen.c index bbb3dd7..feb71cc 100644 --- a/xfce4-session/xfsm-splash-screen.c +++ b/xfce4-session/xfsm-splash-screen.c @@ -34,7 +34,7 @@ #include <xfconf/xfconf.h> #include <libxfce4util/libxfce4util.h> -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <libxfsm/xfsm-splash-engine.h> #include <libxfsm/xfsm-util.h> diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c index ddf6ad4..9f8f08f 100644 --- a/xfce4-session/xfsm-startup.c +++ b/xfce4-session/xfsm-startup.c @@ -46,7 +46,7 @@ #include <glib/gstdio.h> -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <libxfsm/xfsm-util.h> diff --git a/xfce4-tips/Makefile.am b/xfce4-tips/Makefile.am index 3e12e20..074b930 100644 --- a/xfce4-tips/Makefile.am +++ b/xfce4-tips/Makefile.am @@ -16,10 +16,10 @@ xfce4_tips_SOURCES = \ main.c xfce4_tips_CFLAGS = \ - @LIBXFCEGUI4_CFLAGS@ + @LIBXFCE4UI_CFLAGS@ xfce4_tips_LDADD = \ - @LIBXFCEGUI4_LIBS@ + @LIBXFCE4UI_LIBS@ desktopdir = $(sysconfdir)/xdg/autostart desktop_in_files = xfce4-tips-autostart.desktop.in _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits