diff options
| author | Brian Tarricone <brian@tarricone.org> | 2008-10-11 11:10:44 +0000 |
|---|---|---|
| committer | Brian Tarricone <brian@tarricone.org> | 2008-10-11 11:10:44 +0000 |
| commit | e2f588d194233b76b4893d08e707014da50f67cc (patch) | |
| tree | db920c01b6dd6d111095b6377e2301768deb9df7 /libxfsm | |
| parent | 15723bce50632bc72f9330b94e017212669c70f7 (diff) | |
| download | xfce4-session-e2f588d194233b76b4893d08e707014da50f67cc.tar.gz | |
* (lots): Migrate xfce4-session to use xfconf. Combine session,
splash, and autostart dialog into one glade-ified (mostly) dialog.
(Old svn revision: 28142)
Diffstat (limited to 'libxfsm')
| -rw-r--r-- | libxfsm/Makefile.am | 30 | ||||
| -rw-r--r-- | libxfsm/xfce4-session-2.0.pc.in (renamed from libxfsm/xfce4-session-1.0.pc.in) | 4 | ||||
| -rw-r--r-- | libxfsm/xfsm-util.c | 8 | ||||
| -rw-r--r-- | libxfsm/xfsm-util.h | 4 |
4 files changed, 24 insertions, 22 deletions
diff --git a/libxfsm/Makefile.am b/libxfsm/Makefile.am index 215b6bf8..1883cc5a 100644 --- a/libxfsm/Makefile.am +++ b/libxfsm/Makefile.am @@ -2,35 +2,37 @@ INCLUDES = \ -I$(top_srcdir) # common library -lib_LTLIBRARIES = libxfsm-4.2.la +lib_LTLIBRARIES = libxfsm-4.6.la -libxfsm_4_2_la_SOURCES = \ +libxfsm_4_6_la_SOURCES = \ xfsm-splash-rc.c \ xfsm-splash-rc.h \ xfsm-util.h \ xfsm-util.c -libxfsm_4_2_la_CFLAGS = \ - @LIBX11_CFLAGS@ \ - @LIBXFCEGUI4_CFLAGS@ +libxfsm_4_6_la_CFLAGS = \ + $(LIBX11_CFLAGS) \ + $(LIBXFCEGUI4_CFLAGS) \ + $(XFCONF_CFLAGS) -libxfsm_4_2_la_LDFLAGS = \ +libxfsm_4_6_la_LDFLAGS = \ -export-dynamic \ - -version-info 0:1:0 + -version-info 0:0:0 if HAVE_OS_CYGWIN -libxfsm_4_2_la_LDFLAGS += \ +libxfsm_4_6_la_LDFLAGS += \ -no-undefined \ - @LIBX11_LDFLAGS@ + $(LIBX11_LDFLAGS@ -libxfsm_4_2_la_LIBADD = \ - @LIBX11_LIBS@ \ - @LIBXFCEGUI4_LIBS@ +libxfsm_4_6_la_LIBADD = \ + $(LIBX11_LIBS) \ + $(LIBXFCEGUI4_LIBS) \ + $(XFCONF_LIBS) endif libxfsmincludedir = \ - $(includedir)/xfce4/xfce4-session-4.2/libxfsm + $(includedir)/xfce4/xfce4-session-4.6/libxfsm libxfsminclude_HEADERS = \ xfsm-splash-engine.h \ @@ -38,6 +40,6 @@ libxfsminclude_HEADERS = \ pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = xfce4-session-1.0.pc +pkgconfig_DATA = xfce4-session-2.0.pc diff --git a/libxfsm/xfce4-session-1.0.pc.in b/libxfsm/xfce4-session-2.0.pc.in index 06cc2f0f..b0c546b6 100644 --- a/libxfsm/xfce4-session-1.0.pc.in +++ b/libxfsm/xfce4-session-2.0.pc.in @@ -7,5 +7,5 @@ Name: xfce4-session Description: Xfce 4 session manager Requires: libxfcegui4-1.0 Version: @VERSION@ -Libs: -L${libdir} -lxfsm-4.2 -Cflags: -I${includedir}/xfce4/xfce4-session-4.2 +Libs: -L${libdir} -lxfsm-4.6 +Cflags: -I${includedir}/xfce4/xfce4-session-4.6 diff --git a/libxfsm/xfsm-util.c b/libxfsm/xfsm-util.c index 88c563a7..49a78588 100644 --- a/libxfsm/xfsm-util.c +++ b/libxfsm/xfsm-util.c @@ -234,11 +234,9 @@ xfsm_window_grab_input (GtkWindow *window) } -XfceRc* -xfsm_open_config (gboolean readonly) +XfconfChannel* +xfsm_open_config (void) { - return xfce_rc_config_open (XFCE_RESOURCE_CONFIG, - "xfce4-session/xfce4-session.rc", - readonly); + return xfconf_channel_get ("xfce4-session"); } diff --git a/libxfsm/xfsm-util.h b/libxfsm/xfsm-util.h index c38e1ec9..337f6f2a 100644 --- a/libxfsm/xfsm-util.h +++ b/libxfsm/xfsm-util.h @@ -22,6 +22,8 @@ #ifndef __XFSM_UTIL_H__ #define __XFSM_UTIL_H__ +#include <xfconf/xfconf.h> + #include <gtk/gtk.h> #include <libxfce4util/libxfce4util.h> @@ -49,7 +51,7 @@ void xfsm_window_add_border (GtkWindow *window); void xfsm_window_grab_input (GtkWindow *window); -XfceRc *xfsm_open_config (gboolean readonly); +XfconfChannel *xfsm_open_config (void); G_END_DECLS; |