awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[awesome] Initialize glib thread system 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2008-05-21 18:04:44 +02:00
parent 648dc236f8
commit 7a5326e0ff
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -97,7 +97,7 @@ AM_CPPFLAGS = $(pangocairo_CFLAGS) $(AWESOME_CFLAGS) \
$(xcb_CFLAGS) $(xcb_event_CFLAGS) \ $(xcb_CFLAGS) $(xcb_event_CFLAGS) \
$(xcb_randr_CFLAGS) $(xcb_xinerama_CFLAGS) $(xcb_shape_CFLAGS) \ $(xcb_randr_CFLAGS) $(xcb_xinerama_CFLAGS) $(xcb_shape_CFLAGS) \
$(xcb_aux_CFLAGS) $(xcb_atom_CFLAGS) $(xcb_keysyms_CFLAGS) \ $(xcb_aux_CFLAGS) $(xcb_atom_CFLAGS) $(xcb_keysyms_CFLAGS) \
$(xcb_icccm_CFLAGS) $(dbus_CFLAGS) $(Lua_CFLAGS) $(xcb_icccm_CFLAGS) $(dbus_CFLAGS) $(Lua_CFLAGS) $(gthread_CLFAGS)
bin_PROGRAMS += awesome bin_PROGRAMS += awesome
awesome_SOURCES = \ awesome_SOURCES = \
@ -133,7 +133,7 @@ awesome_SOURCES += $(WIDGETS)
awesome_LDADD = $(pangocairo_LIBS) $(xcb_LIBS) $(xcb_event_LIBS) \ awesome_LDADD = $(pangocairo_LIBS) $(xcb_LIBS) $(xcb_event_LIBS) \
$(xcb_randr_LIBS) $(xcb_xinerama_LIBS) $(xcb_shape_LIBS) $(xcb_aux_LIBS) \ $(xcb_randr_LIBS) $(xcb_xinerama_LIBS) $(xcb_shape_LIBS) $(xcb_aux_LIBS) \
$(xcb_atom_LIBS) $(xcb_keysyms_LIBS) $(xcb_icccm_LIBS) $(dbus_LIBS)\ $(xcb_atom_LIBS) $(xcb_keysyms_LIBS) $(xcb_icccm_LIBS) $(dbus_LIBS)\
$(imlib2_LIBS) $(GTK_LIBS) $(Lua_LIBS) $(imlib2_LIBS) $(GTK_LIBS) $(Lua_LIBS) $(gthread_LIBS)
bin_PROGRAMS += awesome-client bin_PROGRAMS += awesome-client
awesome_client_SOURCES = \ awesome_client_SOURCES = \

5
awesome.c
View File

@ -36,6 +36,8 @@
#include <pthread.h> #include <pthread.h>
#include <glib.h>
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <xcb/shape.h> #include <xcb/shape.h>
#include <xcb/randr.h> #include <xcb/randr.h>
@ -484,6 +486,9 @@ main(int argc, char **argv)
statusbar_refresh(NULL); statusbar_refresh(NULL);
layout_refresh(NULL); layout_refresh(NULL);
/* initialize Glib for thread safeness */
g_thread_init(NULL);
/* main event loop, also reads status text from socket */ /* main event loop, also reads status text from socket */
while(running) while(running)
{ {

2
configure.ac
View File

@ -119,6 +119,8 @@ PKG_CHECK_MODULES([Lua], [lua >= 5.1],,
[AC_MSG_ERROR([awesome requires Lua >= 5.1.])])]) [AC_MSG_ERROR([awesome requires Lua >= 5.1.])])])
PKG_CHECK_MODULES([glib], [glib-2.0],, PKG_CHECK_MODULES([glib], [glib-2.0],,
[AC_MSG_ERROR([awesome requires glib-2.0.])]) [AC_MSG_ERROR([awesome requires glib-2.0.])])
PKG_CHECK_MODULES([gthread], [gthread-2.0],,
[AC_MSG_ERROR([awesome requires gthread-2.0.])])
PKG_CHECK_MODULES([dbus], [dbus-1],, PKG_CHECK_MODULES([dbus], [dbus-1],,
[AC_MSG_ERROR([awesome requires dbus-1.])]) [AC_MSG_ERROR([awesome requires dbus-1.])])
AC_ARG_WITH([imlib2], AS_HELP_STRING([--with-imlib2], [Build with Imlib2 (default: disabled)])) AC_ARG_WITH([imlib2], AS_HELP_STRING([--with-imlib2], [Build with Imlib2 (default: disabled)]))