From bc693ff06c8520998b3eb9eeee117aed7d859f72 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 8 May 2012 13:32:09 -0400
Subject: [PATCH] * #10463: gnome: added gthread flags, fixes build for gtk2
---
gnome/configure.ac | 2 +-
gnome/src/Makefile.am | 9 +++++----
gnome/src/widget/imwidget.c | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/gnome/configure.ac b/gnome/configure.ac
index 2efdb04831..df520004db 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 8a0878d10d..4c0107eab5 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 130510e3af..bf03d84310 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"
--
GitLab