Author: kelnos
Date: 2008-10-17 08:40:22 +0000 (Fri, 17 Oct 2008)
New Revision: 28275
Modified:
xfce4-session/trunk/ChangeLog
xfce4-session/trunk/NEWS
xfce4-session/trunk/libxfsm/Makefile.am
xfce4-session/trunk/xfce4-session/ice-layer.c
Log:
* xfce4-session/ice-layer.c: Properly initialise a GError to
NULL. Patch from Carlos Santos (bug 4202).
* libxfsm/Makefile.am: Link all used libraries to libxfsm.so
to avoid link-time errors on Darwin. Shouldn't be an issue
on other platforms as well. Partial patch from Anders
Bj?\195?\182rklund (bug 4429).
Modified: xfce4-session/trunk/ChangeLog
===================================================================
--- xfce4-session/trunk/ChangeLog 2008-10-17 08:26:18 UTC (rev 28274)
+++ xfce4-session/trunk/ChangeLog 2008-10-17 08:40:22 UTC (rev 28275)
@@ -1,5 +1,14 @@
2008-10-17 Brian Tarricone <[EMAIL PROTECTED]>
+ * xfce4-session/ice-layer.c: Properly initialise a GError to
+ NULL. Patch from Carlos Santos (bug 4202).
+ * libxfsm/Makefile.am: Link all used libraries to libxfsm.so
+ to avoid link-time errors on Darwin. Shouldn't be an issue
+ on other platforms as well. Partial patch from Anders
+ Björklund (bug 4429).
+
+2008-10-17 Brian Tarricone <[EMAIL PROTECTED]>
+
* xfce4-session/xfsm-startup.c: Store the result of fork() in a
temporary again to avoid possible memory access issues if
vfork() is used.
Modified: xfce4-session/trunk/NEWS
===================================================================
--- xfce4-session/trunk/NEWS 2008-10-17 08:26:18 UTC (rev 28274)
+++ xfce4-session/trunk/NEWS 2008-10-17 08:40:22 UTC (rev 28275)
@@ -1,6 +1,9 @@
4.5.92
======
- Implement support for the RestartImmediately restart style hint.
+- Fix possible crash with uninitialised GError (bug 4202).
+- Link libxfsm against all required libs to avoid link-time errors
+ (bug 4429).
4.5.91
Modified: xfce4-session/trunk/libxfsm/Makefile.am
===================================================================
--- xfce4-session/trunk/libxfsm/Makefile.am 2008-10-17 08:26:18 UTC (rev
28274)
+++ xfce4-session/trunk/libxfsm/Makefile.am 2008-10-17 08:40:22 UTC (rev
28275)
@@ -17,18 +17,18 @@
libxfsm_4_6_la_LDFLAGS = \
-export-dynamic \
- -version-info 0:0:0
+ -version-info 0:0:0 \
+ $(LIBX11_LDFLAGS)
if HAVE_OS_CYGWIN
libxfsm_4_6_la_LDFLAGS += \
- -no-undefined \
- $(LIBX11_LDFLAGS@
+ -no-undefined
+endif
libxfsm_4_6_la_LIBADD =
\
$(LIBX11_LIBS) \
$(LIBXFCEGUI4_LIBS) \
$(XFCONF_LIBS)
-endif
libxfsmincludedir = \
Modified: xfce4-session/trunk/xfce4-session/ice-layer.c
===================================================================
--- xfce4-session/trunk/xfce4-session/ice-layer.c 2008-10-17 08:26:18 UTC
(rev 28274)
+++ xfce4-session/trunk/xfce4-session/ice-layer.c 2008-10-17 08:40:22 UTC
(rev 28275)
@@ -214,7 +214,7 @@
static FILE*
ice_tmpfile (char **name)
{
- GError *error;
+ GError *error = NULL;
mode_t mode;
FILE *fp = NULL;
int fd;
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
