diff options
author | Benedikt Meurer <benny@xfce.org> | 2004-11-01 16:10:55 +0000 |
---|---|---|
committer | Benedikt Meurer <benny@xfce.org> | 2004-11-01 16:10:55 +0000 |
commit | 1c83667bc7b468c098758621711c4b354d0e4de7 (patch) | |
tree | 3930970cab769beb14ac1037165d12eca26ff3ba /engines | |
parent | 330740fbc99384acea2e96df09d72217f81164a1 (diff) | |
download | xfce4-session-1c83667bc7b468c098758621711c4b354d0e4de7.tar.gz |
Resolve the libxfsm build order problem. Issue a detailed message if the
failsafe session couldn't be loaded. Imported the xfce4-session-logout
hack from Brian, requested too often to ignore. Update the man pages, esp.
mention the XDG variables in the xfce4-session man page. Update the po
files.
(Old svn revision: 4711)
Diffstat (limited to 'engines')
-rw-r--r-- | engines/balou/Makefile.am | 4 | ||||
-rw-r--r-- | engines/balou/Makefile.in | 4 | ||||
-rw-r--r-- | engines/balou/config.c | 2 | ||||
-rw-r--r-- | engines/balou/engine.c | 2 | ||||
-rw-r--r-- | engines/mice/Makefile.am | 4 | ||||
-rw-r--r-- | engines/mice/Makefile.in | 4 | ||||
-rw-r--r-- | engines/mice/mice.c | 2 | ||||
-rw-r--r-- | engines/simple/Makefile.am | 4 | ||||
-rw-r--r-- | engines/simple/Makefile.in | 4 | ||||
-rw-r--r-- | engines/simple/simple.c | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am index 0cf74103..be53b936 100644 --- a/engines/balou/Makefile.am +++ b/engines/balou/Makefile.am @@ -28,7 +28,7 @@ libbalou_la_LDFLAGS = \ -module libbalou_la_LIBADD = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la + $(top_builddir)/libxfsm/libxfsm-4.2.la if HAVE_OS_CYGWIN libbalou_la_LIBADD += \ @@ -36,4 +36,4 @@ libbalou_la_LIBADD += \ endif libbalou_la_DEPENDENCIES = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la + $(top_builddir)/libxfsm/libxfsm-4.2.la diff --git a/engines/balou/Makefile.in b/engines/balou/Makefile.in index 37228ab7..38c76b19 100644 --- a/engines/balou/Makefile.in +++ b/engines/balou/Makefile.in @@ -262,10 +262,10 @@ libbalou_la_LDFLAGS = \ -module libbalou_la_LIBADD = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la\ + $(top_builddir)/libxfsm/libxfsm-4.2.la\ $(am__append_1) libbalou_la_DEPENDENCIES = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la + $(top_builddir)/libxfsm/libxfsm-4.2.la all: all-recursive diff --git a/engines/balou/config.c b/engines/balou/config.c index b1322171..6a89e727 100644 --- a/engines/balou/config.c +++ b/engines/balou/config.c @@ -37,7 +37,7 @@ #include <libxfcegui4/libxfcegui4.h> -#include <xfce4-session/xfsm-splash-engine.h> +#include <libxfsm/xfsm-splash-engine.h> #include <engines/balou/balou-theme.h> #include <engines/balou/gnome-uri.h> diff --git a/engines/balou/engine.c b/engines/balou/engine.c index feade79b..c0fc4475 100644 --- a/engines/balou/engine.c +++ b/engines/balou/engine.c @@ -25,7 +25,7 @@ #include <gmodule.h> -#include <xfce4-session/xfsm-splash-engine.h> +#include <libxfsm/xfsm-splash-engine.h> #include <engines/balou/balou.h> diff --git a/engines/mice/Makefile.am b/engines/mice/Makefile.am index f696f439..506195f5 100644 --- a/engines/mice/Makefile.am +++ b/engines/mice/Makefile.am @@ -17,7 +17,7 @@ libmice_la_LDFLAGS = \ -module libmice_la_LIBADD = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la + $(top_builddir)/libxfsm/libxfsm-4.2.la if HAVE_OS_CYGWIN libmice_la_LIBADD += \ @@ -25,7 +25,7 @@ libmice_la_LIBADD += \ endif libmice_la_DEPENDENCIES = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la + $(top_builddir)/libxfsm/libxfsm-4.2.la noinst_PROGRAMS = \ generate diff --git a/engines/mice/Makefile.in b/engines/mice/Makefile.in index 0daaefb2..b0a9b2d0 100644 --- a/engines/mice/Makefile.in +++ b/engines/mice/Makefile.in @@ -245,10 +245,10 @@ libmice_la_LDFLAGS = \ -module libmice_la_LIBADD = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la\ + $(top_builddir)/libxfsm/libxfsm-4.2.la\ $(am__append_1) libmice_la_DEPENDENCIES = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la + $(top_builddir)/libxfsm/libxfsm-4.2.la generate_SOURCES = \ generate.c diff --git a/engines/mice/mice.c b/engines/mice/mice.c index 9e8bf0c8..85daf072 100644 --- a/engines/mice/mice.c +++ b/engines/mice/mice.c @@ -28,7 +28,7 @@ #include <gdk-pixbuf/gdk-pixdata.h> #include <gmodule.h> -#include <xfce4-session/xfsm-splash-engine.h> +#include <libxfsm/xfsm-splash-engine.h> #include <engines/mice/preview.h> #include <engines/mice/slide.h> diff --git a/engines/simple/Makefile.am b/engines/simple/Makefile.am index 0ede60b4..c656b697 100644 --- a/engines/simple/Makefile.am +++ b/engines/simple/Makefile.am @@ -18,7 +18,7 @@ libsimple_la_LDFLAGS = \ -module libsimple_la_LIBADD = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la + $(top_builddir)/libxfsm/libxfsm-4.2.la if HAVE_OS_CYGWIN libsimple_la_LIBADD += \ @@ -26,7 +26,7 @@ libsimple_la_LIBADD += \ endif libsimple_la_DEPENDENCIES = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la + $(top_builddir)/libxfsm/libxfsm-4.2.la EXTRA_DIST = \ fallback.h \ diff --git a/engines/simple/Makefile.in b/engines/simple/Makefile.in index 8413fd30..8febd9bd 100644 --- a/engines/simple/Makefile.in +++ b/engines/simple/Makefile.in @@ -239,10 +239,10 @@ libsimple_la_LDFLAGS = \ -module libsimple_la_LIBADD = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la\ + $(top_builddir)/libxfsm/libxfsm-4.2.la\ $(am__append_1) libsimple_la_DEPENDENCIES = \ - $(top_builddir)/xfce4-session/libxfsm-4.2.la + $(top_builddir)/libxfsm/libxfsm-4.2.la EXTRA_DIST = \ fallback.h \ diff --git a/engines/simple/simple.c b/engines/simple/simple.c index f0e9cb43..5da136fb 100644 --- a/engines/simple/simple.c +++ b/engines/simple/simple.c @@ -30,7 +30,7 @@ #include <libxfcegui4/libxfcegui4.h> -#include <xfce4-session/xfsm-splash-engine.h> +#include <libxfsm/xfsm-splash-engine.h> #include <engines/simple/fallback.h> #include <engines/simple/preview.h> |