diff --git a/gnome/configure.ac b/gnome/configure.ac index 2efdb0483170b2538ba7d62f939652e4442c73fc..df520004dbcc4131b781824818c4d567a60b2fd8 100644 --- a/gnome/configure.ac +++ b/gnome/configure.ac @@ -35,7 +35,7 @@ fi # check for gtk+-2.0 and if found, check for webkitgtk-1.0. PKG_CHECK_MODULES(GTK, gtk+-3.0, [PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0)], [PKG_CHECK_MODULES(GTK, gtk+-2.0, - [PKG_CHECK_MODULES(WEBKIT, webkit-1.0)], + [PKG_CHECK_MODULES(WEBKIT, webkit-1.0) && PKG_CHECK_MODULES(GTHREAD, gthread-2.0)], [AC_MSG_ERROR(gtk-2 not found)])]) PKG_CHECK_MODULES(GCONF, gconf-2.0) diff --git a/gnome/src/Makefile.am b/gnome/src/Makefile.am index 8a0878d10dc1a103152e858a24fe12dfd0127272..4c0107eab596d368f56c63488a53b0de51b8ad9b 100644 --- a/gnome/src/Makefile.am +++ b/gnome/src/Makefile.am @@ -33,20 +33,21 @@ sflphone_client_gnome_SOURCES = \ noinst_HEADERS = actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \ reqaccount.h sflphone_const.h uimanager.h accountlist.h \ - sliders.h statusicon.h callable_obj.h conference_obj.h \ + sliders.h statusicon.h callable_obj.h conference_obj.h \ shortcuts.h eel-gconf-extensions.h logger.h imwindow.h \ - unused.h str_utils.h gtk2_wrappers.h + unused.h str_utils.h gtk2_wrappers.h sflphone_client_gnome_LDADD = $(DBUSGLIB_LIBS) $(LIBNOTIFY_LIBS) \ $(NOTIFY_LIBS) $(SFLPHONEGTK_LIBS) $(X11_LIBS) \ $(GTK_LIBS) $(GLIB_LIBS) $(WEBKIT_LIBS) \ $(LD_LIBS) $(GCONF_LIBS) \ - $(JAVASCRIPT_CORE_GTK_LIBS) + $(JAVASCRIPT_CORE_GTK_LIBS) $(GTHREAD_LIBS) sflphone_client_gnome_CFLAGS = $(DBUSGLIB_CFLAGS) $(LIBNOTIFY_CFLAGS) \ $(NOTIFY_CFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS) \ $(GLIB_CFLAGS) $(WEBKIT_CFLAGS) \ - $(GCONF_CFLAGS) $(JAVASCRIPT_CORE_GTK_CFLAGS) + $(GCONF_CFLAGS) $(JAVASCRIPT_CORE_GTK_CFLAGS) \ + $(GTHREAD_CFLAGS) # add symbolic link install-exec-local: diff --git a/gnome/src/widget/imwidget.c b/gnome/src/widget/imwidget.c index 130510e3af2d65c647715a813ac1d5d3086b0b8a..bf03d843106ceaa699ff2434c4fa23654bf39711 100644 --- a/gnome/src/widget/imwidget.c +++ b/gnome/src/widget/imwidget.c @@ -29,6 +29,7 @@ #include "imwindow.h" #include "logger.h" +#include "gtk2_wrappers.h" #include "imwidget.h" #include "dbus.h" #include "unused.h"