summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog11
-rw-r--r--NEWS5
-rwxr-xr-xconfigure2
-rw-r--r--configure.ac2
-rw-r--r--xfce4-session/Makefile.am15
-rw-r--r--xfce4-session/Makefile.in55
-rw-r--r--xfce4-session/ice-layer.c4
-rw-r--r--xfce4-session/main.c2
-rw-r--r--xfce4-session/manager.c24
9 files changed, 102 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 3275d5f1..e40a0671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-19 13:16 bmeurer
+
+ * po/POTFILES.in, po/de.gmo, po/de.po, po/es.gmo, po/es.po,
+ po/es_MX.gmo, po/es_MX.po, po/nl.gmo, po/nl.po, po/tr.gmo,
+ po/tr.po, po/xfce4-session.pot, po/zh_CN.gmo, po/zh_CN.po,
+ xfce4-session/ice-layer.c: Fixed broken POTFILES.in
+
+2003-07-18 23:09 bmeurer
+
+ * ChangeLog, TODO: Add note about Autostart option
+
2003-07-18 21:45 bmeurer
* xfce4-session/main.c: Fixes: "the xfce4-session trayicon is off
diff --git a/NEWS b/NEWS
index b38423fd..9053f406 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+20030721:
+---------
+ * Fix problem with Xrandr MCS plugin and splash screen not using
+ the new screen height/width.
+
20030716:
---------
* XfceTrayIcon now both provides "clicked" (a single left button
diff --git a/configure b/configure
index d10ab978..9a17cbe6 100755
--- a/configure
+++ b/configure
@@ -1753,7 +1753,7 @@ fi
# Define the identity of the package.
PACKAGE=xfce4-session
- VERSION=0.1.2
+ VERSION=0.1.3
cat >>confdefs.h <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 86894a0d..f4616f76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([configure.ac])
AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([xfce4-session], [0.1.2])
+AM_INIT_AUTOMAKE([xfce4-session], [0.1.3])
AM_MAINTAINER_MODE
diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
index 540b6f75..a24615f9 100644
--- a/xfce4-session/Makefile.am
+++ b/xfce4-session/Makefile.am
@@ -20,7 +20,9 @@ xfce4_session_SOURCES = \
util.c \
util.h \
xfce_trayicon.c \
- xfce_trayicon.h
+ xfce_trayicon.h \
+ xfsm-marshal.c \
+ xfsm-marshal.h
xfce4_session_CFLAGS = \
@LIBSM_CFLAGS@ \
@@ -41,8 +43,17 @@ xfce4_session_LDADD = \
@LIBXFCEGUI4_LIBS@
EXTRA_DIST = \
- splash-fallback.png
+ splash-fallback.png \
+ xfsm-marshal.list
splash-fallback.h: $(srcdir)/splash-fallback.png
gdk-pixbuf-csource --raw --build-list \
fallback_logo $(srcdir)/splash-fallback.png > splash-fallback.h
+
+xfsm-marshal.c: xfsm-marshal.list
+ glib-genmarshal --prefix=_xfsm_marshal xfsm-marshal.list \
+ --body > xfsm-marshal.c
+
+xfsm-marshal.h: xfsm-marshal.list
+ glib-genmarshal --prefix=_xfsm_marshal xfsm-marshal.list \
+ --header > xfsm-marshal.h
diff --git a/xfce4-session/Makefile.in b/xfce4-session/Makefile.in
index 4a8093b4..154abda6 100644
--- a/xfce4-session/Makefile.in
+++ b/xfce4-session/Makefile.in
@@ -195,7 +195,9 @@ xfce4_session_SOURCES = \
util.c \
util.h \
xfce_trayicon.c \
- xfce_trayicon.h
+ xfce_trayicon.h \
+ xfsm-marshal.c \
+ xfsm-marshal.h
xfce4_session_CFLAGS = \
@@ -219,7 +221,8 @@ xfce4_session_LDADD = \
EXTRA_DIST = \
- splash-fallback.png
+ splash-fallback.png \
+ xfsm-marshal.list
subdir = xfce4-session
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -236,7 +239,8 @@ am_xfce4_session_OBJECTS = xfce4_session-client.$(OBJEXT) \
xfce4_session-shutdown.$(OBJEXT) \
xfce4_session-splash-screen.$(OBJEXT) \
xfce4_session-startup.$(OBJEXT) xfce4_session-util.$(OBJEXT) \
- xfce4_session-xfce_trayicon.$(OBJEXT)
+ xfce4_session-xfce_trayicon.$(OBJEXT) \
+ xfce4_session-xfsm-marshal.$(OBJEXT)
xfce4_session_OBJECTS = $(am_xfce4_session_OBJECTS)
xfce4_session_DEPENDENCIES =
xfce4_session_LDFLAGS =
@@ -253,7 +257,8 @@ am__depfiles_maybe = depfiles
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_session-splash-screen.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_session-startup.Po \
@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_session-util.Po \
-@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_session-xfce_trayicon.Po
+@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_session-xfce_trayicon.Po \
+@AMDEP_TRUE@ ./$(DEPDIR)/xfce4_session-xfsm-marshal.Po
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
@@ -323,6 +328,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_session-startup.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_session-util.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_session-xfce_trayicon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfce4_session-xfsm-marshal.Po@am__quote@
distclean-depend:
-rm -rf ./$(DEPDIR)
@@ -690,6 +696,39 @@ xfce4_session-xfce_trayicon.lo: xfce_trayicon.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfce_trayicon.lo `test -f 'xfce_trayicon.c' || echo '$(srcdir)/'`xfce_trayicon.c
+xfce4_session-xfsm-marshal.o: xfsm-marshal.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-marshal.o -MD -MP -MF "$(DEPDIR)/xfce4_session-xfsm-marshal.Tpo" \
+@am__fastdepCC_TRUE@ -c -o xfce4_session-xfsm-marshal.o `test -f 'xfsm-marshal.c' || echo '$(srcdir)/'`xfsm-marshal.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_session-xfsm-marshal.Tpo" "$(DEPDIR)/xfce4_session-xfsm-marshal.Po"; \
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_session-xfsm-marshal.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfsm-marshal.c' object='xfce4_session-xfsm-marshal.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_session-xfsm-marshal.Po' tmpdepfile='$(DEPDIR)/xfce4_session-xfsm-marshal.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-marshal.o `test -f 'xfsm-marshal.c' || echo '$(srcdir)/'`xfsm-marshal.c
+
+xfce4_session-xfsm-marshal.obj: xfsm-marshal.c
+@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-marshal.obj -MD -MP -MF "$(DEPDIR)/xfce4_session-xfsm-marshal.Tpo" \
+@am__fastdepCC_TRUE@ -c -o xfce4_session-xfsm-marshal.obj `if test -f 'xfsm-marshal.c'; then $(CYGPATH_W) 'xfsm-marshal.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-marshal.c'; fi`; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_session-xfsm-marshal.Tpo" "$(DEPDIR)/xfce4_session-xfsm-marshal.Po"; \
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_session-xfsm-marshal.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfsm-marshal.c' object='xfce4_session-xfsm-marshal.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_session-xfsm-marshal.Po' tmpdepfile='$(DEPDIR)/xfce4_session-xfsm-marshal.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-marshal.obj `if test -f 'xfsm-marshal.c'; then $(CYGPATH_W) 'xfsm-marshal.c'; else $(CYGPATH_W) '$(srcdir)/xfsm-marshal.c'; fi`
+
+xfce4_session-xfsm-marshal.lo: xfsm-marshal.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -MT xfce4_session-xfsm-marshal.lo -MD -MP -MF "$(DEPDIR)/xfce4_session-xfsm-marshal.Tpo" \
+@am__fastdepCC_TRUE@ -c -o xfce4_session-xfsm-marshal.lo `test -f 'xfsm-marshal.c' || echo '$(srcdir)/'`xfsm-marshal.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xfce4_session-xfsm-marshal.Tpo" "$(DEPDIR)/xfce4_session-xfsm-marshal.Plo"; \
+@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/xfce4_session-xfsm-marshal.Tpo"; exit 1; \
+@am__fastdepCC_TRUE@ fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xfsm-marshal.c' object='xfce4_session-xfsm-marshal.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/xfce4_session-xfsm-marshal.Plo' tmpdepfile='$(DEPDIR)/xfce4_session-xfsm-marshal.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfce4_session_CFLAGS) $(CFLAGS) -c -o xfce4_session-xfsm-marshal.lo `test -f 'xfsm-marshal.c' || echo '$(srcdir)/'`xfsm-marshal.c
+
mostlyclean-libtool:
-rm -f *.lo
@@ -877,6 +916,14 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
splash-fallback.h: $(srcdir)/splash-fallback.png
gdk-pixbuf-csource --raw --build-list \
fallback_logo $(srcdir)/splash-fallback.png > splash-fallback.h
+
+xfsm-marshal.c: xfsm-marshal.list
+ glib-genmarshal --prefix=_xfsm_marshal xfsm-marshal.list \
+ --body > xfsm-marshal.c
+
+xfsm-marshal.h: xfsm-marshal.list
+ glib-genmarshal --prefix=_xfsm_marshal xfsm-marshal.list \
+ --header > xfsm-marshal.h
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/xfce4-session/ice-layer.c b/xfce4-session/ice-layer.c
index 0c9342bc..ec92a71d 100644
--- a/xfce4-session/ice-layer.c
+++ b/xfce4-session/ice-layer.c
@@ -205,11 +205,7 @@ ice_connection_accept(GIOChannel *channel, GIOCondition condition,
/* Wait for the connection to leave pending state */
do {
-#if 0 /* THIS MIGHT CAUSE A RACE CONDITIION ?!?! */
- (void)g_main_context_iteration(NULL, TRUE);
-#else
(void)IceProcessMessages(iceConn, NULL, NULL);
-#endif
} while ((cstatus = IceConnectionStatus(iceConn)) == IceConnectPending);
if (cstatus != IceConnectAccepted) {
diff --git a/xfce4-session/main.c b/xfce4-session/main.c
index ff54df5e..dfdeba03 100644
--- a/xfce4-session/main.c
+++ b/xfce4-session/main.c
@@ -444,7 +444,7 @@ main(int argc, char **argv)
"Session/StartupSplashTheme",
CHANNEL, &setting) == MCS_SUCCESS) {
startupSplashTheme = g_strdup(setting->data.v_string);
- g_free(setting);
+ mcs_setting_free(setting);
}
else {
if ((theme = g_getenv("XFSM_SPLASH_THEME")) != NULL)
diff --git a/xfce4-session/manager.c b/xfce4-session/manager.c
index c760d6b4..52331103 100644
--- a/xfce4-session/manager.c
+++ b/xfce4-session/manager.c
@@ -260,6 +260,24 @@ end:
}
/*
+ * This does the initial startup. Starting up have to be done after atleast
+ * one run through the gtk main loop, else the splash screen will use the
+ * old screen height/width that was set before the mcs manager (with the
+ * Xrandr plugin) fired up.
+ */
+static gboolean
+manager_startup(void)
+{
+ /* sort list of pending clients by priority */
+ pendingClients = g_list_sort(pendingClients,
+ (GCompareFunc)client_compare_priority);
+
+ pending_continue(NULL);
+
+ return(FALSE);
+}
+
+/*
*/
gboolean
manager_restart(void)
@@ -326,11 +344,7 @@ manager_restart(void)
(void)fclose(fp);
- /* sort list of pending clients by priority */
- pendingClients = g_list_sort(pendingClients,
- (GCompareFunc)client_compare_priority);
-
- pending_continue(NULL);
+ (void)g_idle_add((GSourceFunc)manager_startup, NULL);
return(TRUE);
View Lorry Controller Status