[Goodies-commits] r2789 - in xfce4-volstatus-icon/trunk: . xfce4-volstatus-icon
Brian Tarricone
kelnos at xfce.org
Sun May 27 22:51:50 CEST 2007
Author: kelnos
Date: 2007-05-27 20:51:49 +0000 (Sun, 27 May 2007)
New Revision: 2789
Modified:
xfce4-volstatus-icon/trunk/configure.ac.in
xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am
xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c
Log:
we don't use threading anymore, so ditch libgthread and g_thread_init()
Modified: xfce4-volstatus-icon/trunk/configure.ac.in
===================================================================
--- xfce4-volstatus-icon/trunk/configure.ac.in 2007-05-27 20:25:08 UTC (rev 2788)
+++ xfce4-volstatus-icon/trunk/configure.ac.in 2007-05-27 20:51:49 UTC (rev 2789)
@@ -49,7 +49,6 @@
XDT_CHECK_LIBX11_REQUIRE
dnl required
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.6.0])
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0])
Modified: xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am
===================================================================
--- xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am 2007-05-27 20:25:08 UTC (rev 2788)
+++ xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/Makefile.am 2007-05-27 20:51:49 UTC (rev 2789)
@@ -15,7 +15,6 @@
-I$(top_srcdir) \
-DEXO_API_SUBJECT_TO_CHANGE \
-DLOCALEDIR=\"$(localedir)\" \
- @GTHREAD_CFLAGS@ \
@GTK_CFLAGS@ \
@LIBXFCE4UTIL_CFLAGS@ \
@LIBXFCEGUI4_CFLAGS@ \
@@ -25,7 +24,6 @@
xfce4_volstatus_icon_LDADD = \
$(top_builddir)/ghal/libghal.la \
- @GTHREAD_LIBS@ \
@GTK_LIBS@ \
@LIBXFCE4UTIL_LIBS@ \
@LIBXFCEGUI4_LIBS@ \
Modified: xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c
===================================================================
--- xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c 2007-05-27 20:25:08 UTC (rev 2788)
+++ xfce4-volstatus-icon/trunk/xfce4-volstatus-icon/main.c 2007-05-27 20:51:49 UTC (rev 2789)
@@ -192,7 +192,6 @@
xfce_textdomain(PACKAGE, LOCALEDIR, "UTF-8");
- g_thread_init(NULL);
gtk_init(&argc, &argv);
xfce_volstatus_firstrun_check();
@@ -217,7 +216,8 @@
_("Unable to connect to D-Bus system bus daemon"),
secondary, GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT,
NULL);
- g_error_free(error);
+ if(error)
+ g_error_free(error);
return EXIT_FAILURE;
}
More information about the Goodies-commits
mailing list