From 9fd5a0d64710c248045f245317f8d9e4ddbf005b Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 7 Jul 2010 15:09:02 +0200 Subject: Simplify checking of the deps The empathy/libempathy/libempathy-gtk border is less clear than it used to be so there is not point continuing checking deps separately. --- configure.ac | 60 ++++++++-------------------------------------- extensions/Makefile.am | 2 +- libempathy-gtk/Makefile.am | 4 ++-- libempathy/Makefile.am | 4 ++-- 4 files changed, 15 insertions(+), 55 deletions(-) diff --git a/configure.ac b/configure.ac index 6f965737e..f0aeb2cb6 100644 --- a/configure.ac +++ b/configure.ac @@ -139,67 +139,27 @@ AC_SUBST(ERROR_CFLAGS) # Pkg-Config dependency checks # ----------------------------------------------------------- -PKG_CHECK_MODULES(LIBEMPATHY, +PKG_CHECK_MODULES(EMPATHY, [ - glib-2.0 >= $GLIB_REQUIRED - gobject-2.0 + dbus-glib-1 + farsight2-0.10 + gconf-2.0 >= $GCONF_REQUIRED + gdk-x11-2.0 gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED - libxml-2.0 - telepathy-glib >= $TELEPATHY_GLIB_REQUIRED - telepathy-farsight - farsight2-0.10 - gstreamer-0.10 - telepathy-logger-0.1 >= $TELEPATHY_LOGGER -]) - -PKG_CHECK_MODULES(LIBEMPATHYGTK, -[ - glib-2.0 >= $GLIB_REQUIRED + gnome-keyring-1 >= $KEYRING_REQUIRED gobject-2.0 - gio-2.0 >= $GLIB_REQUIRED - gconf-2.0 >= $GCONF_REQUIRED - x11 - gtk+-2.0 >= $GTK_REQUIRED - libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED - telepathy-glib >= $TELEPATHY_GLIB_REQUIRED - farsight2-0.10 gstreamer-0.10 gstreamer-interfaces-0.10 - telepathy-logger-0.1 >= $TELEPATHY_LOGGER -]) - -PKG_CHECK_MODULES(EMPATHY, -[ - glib-2.0 >= $GLIB_REQUIRED - gobject-2.0 - gio-2.0 >= $GLIB_REQUIRED - gdk-x11-2.0 gtk+-2.0 >= $GTK_REQUIRED + libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED libebook-1.2 - dbus-glib-1 - telepathy-glib >= $TELEPATHY_GLIB_REQUIRED + libxml-2.0 telepathy-farsight - farsight2-0.10 - gstreamer-0.10 - unique-1.0 >= $UNIQUE_REQUIRED - gnome-keyring-1 >= $KEYRING_REQUIRED - telepathy-logger-0.1 >= $TELEPATHY_LOGGER -]) - -PKG_CHECK_MODULES(LIBEMPATHY_ACCOUNTS_PANEL, -[ - glib-2.0 >= $GLIB_REQUIRED - gobject-2.0 - gio-2.0 >= $GLIB_REQUIRED - gdk-x11-2.0 - gtk+-2.0 >= $GTK_REQUIRED - libebook-1.2 - dbus-glib-1 telepathy-glib >= $TELEPATHY_GLIB_REQUIRED - unique-1.0 >= $UNIQUE_REQUIRED - gnome-keyring-1 >= $KEYRING_REQUIRED telepathy-logger-0.1 >= $TELEPATHY_LOGGER + unique-1.0 >= $UNIQUE_REQUIRED + x11 ]) PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 8ea05ae6b..a60994b70 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ $(WARN_CFLAGS) \ - $(LIBEMPATHY_CFLAGS) + $(EMPATHY_CFLAGS) EXTRA_DIST = \ all.xml \ diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 43763d56c..2a891bc72 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DDATADIR=\""$(datadir)"\" \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ - $(LIBEMPATHYGTK_CFLAGS) \ + $(EMPATHY_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(ENCHANT_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ @@ -129,7 +129,7 @@ nodist_libempathy_gtk_la_SOURCES =\ $(BUILT_SOURCES) libempathy_gtk_la_LIBADD = \ - $(LIBEMPATHYGTK_LIBS) \ + $(EMPATHY_LIBS) \ $(LIBNOTIFY_LIBS) \ $(ENCHANT_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index d44d8afef..746803e05 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DLOCALEDIR=\""$(datadir)/locale"\" \ -DG_LOG_DOMAIN=\"empathy\" \ - $(LIBEMPATHY_CFLAGS) \ + $(EMPATHY_CFLAGS) \ $(GEOCLUE_CFLAGS) \ $(NETWORK_MANAGER_CFLAGS) \ $(CONNMAN_CFLAGS) \ @@ -100,7 +100,7 @@ nodist_libempathy_la_SOURCES =\ libempathy_la_LIBADD = \ $(top_builddir)/extensions/libemp-extensions.la \ - $(LIBEMPATHY_LIBS) \ + $(EMPATHY_LIBS) \ $(GEOCLUE_LIBS) \ $(NETWORK_MANAGER_LIBS) \ $(CONNMAN_LIBS) -- cgit v1.2.3 From 3dffe8d0ebce77eded0b7e9ed70ac03b09d0090e Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 7 Jul 2010 15:25:53 +0200 Subject: sort dependencies --- configure.ac | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index f0aeb2cb6..5c5921a83 100644 --- a/configure.ac +++ b/configure.ac @@ -29,24 +29,28 @@ AC_COPYRIGHT([ ]) # Minimal version required + +# Hardp deps +GCONF_REQUIRED=1.2.0 GLIB_REQUIRED=2.25.9 GTK_REQUIRED=2.21.2 -GCONF_REQUIRED=1.2.0 +KEYRING_REQUIRED=2.22 +LIBCANBERRA_GTK_REQUIRED=0.4 +LIBNOTIFY_REQUIRED=0.4.4 TELEPATHY_GLIB_REQUIRED=0.11.7 TELEPATHY_LOGGER=0.1.2 +UNIQUE_REQUIRED=1.1.2 + +# Optionnal deps +CLUTTER_GTK_REQUIRED=0.10 ENCHANT_REQUIRED=1.2.0 +GEOCLUE_REQUIRED=0.11 ISO_CODES_REQUIRED=0.35 -LIBNOTIFY_REQUIRED=0.4.4 -LIBCANBERRA_GTK_REQUIRED=0.4 -LIBCHAMPLAIN_REQUIRED=0.4 LIBCHAMPLAIN_GTK_REQUIRED=0.4 -CLUTTER_GTK_REQUIRED=0.10 -GEOCLUE_REQUIRED=0.11 -WEBKIT_REQUIRED=1.1.15 -KEYRING_REQUIRED=2.22 -NETWORK_MANAGER_REQUIRED=0.7.0 +LIBCHAMPLAIN_REQUIRED=0.4 NAUTILUS_SENDTO_REQUIRED=2.28.1 -UNIQUE_REQUIRED=1.1.2 +NETWORK_MANAGER_REQUIRED=0.7.0 +WEBKIT_REQUIRED=1.1.15 # Use --enable-maintainer-mode to disable deprecated symbols, # disable single include and enable GSEAL. If this is not a released empathy, -- cgit v1.2.3 From 85063c344a4dada140b609c726118a889e4e09ac Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 7 Jul 2010 15:41:05 +0200 Subject: call-window: use gtk_widget_get_allocation() --- src/empathy-call-window.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/empathy-call-window.c b/src/empathy-call-window.c index 5fd232bc6..a8d1c40fa 100644 --- a/src/empathy-call-window.c +++ b/src/empathy-call-window.c @@ -1247,8 +1247,10 @@ contact_avatar_changed_cb (EmpathyContact *contact, GParamSpec *pspec, GtkWidget *avatar_widget) { int size; + GtkAllocation allocation; - size = avatar_widget->allocation.height; + gtk_widget_get_allocation (avatar_widget, &allocation); + size = allocation.height; if (size == 0) { -- cgit v1.2.3 From bc2b3bf0966076e8452a170a9741ded016051f44 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 7 Jul 2010 15:49:08 +0200 Subject: move GTK+ check to its own PKG_CHECK_MODULES --- configure.ac | 3 ++- libempathy-gtk/Makefile.am | 2 ++ nautilus-sendto-plugin/Makefile.am | 3 ++- src/Makefile.am | 2 ++ tests/interactive/Makefile.am | 4 +++- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 5c5921a83..12d9cac08 100644 --- a/configure.ac +++ b/configure.ac @@ -155,7 +155,6 @@ PKG_CHECK_MODULES(EMPATHY, gobject-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 - gtk+-2.0 >= $GTK_REQUIRED libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED libebook-1.2 libxml-2.0 @@ -166,6 +165,8 @@ PKG_CHECK_MODULES(EMPATHY, x11 ]) +PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) + PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) # ----------------------------------------------------------- diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 2a891bc72..5762f5c9e 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -7,6 +7,7 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ $(EMPATHY_CFLAGS) \ + $(GTK_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ $(ENCHANT_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ @@ -130,6 +131,7 @@ nodist_libempathy_gtk_la_SOURCES =\ libempathy_gtk_la_LIBADD = \ $(EMPATHY_LIBS) \ + $(GTK_LIBS) \ $(LIBNOTIFY_LIBS) \ $(ENCHANT_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ diff --git a/nautilus-sendto-plugin/Makefile.am b/nautilus-sendto-plugin/Makefile.am index adc9bfb67..03564fe02 100644 --- a/nautilus-sendto-plugin/Makefile.am +++ b/nautilus-sendto-plugin/Makefile.am @@ -7,7 +7,8 @@ INCLUDES = \ $(NST_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) \ - $(EMPATHY_CFLAGS) + $(EMPATHY_CFLAGS) \ + $(GTK_CFLAGS) plugin_LTLIBRARIES = libnstempathy.la diff --git a/src/Makefile.am b/src/Makefile.am index eaac3c341..dc199c2f6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,7 @@ include $(top_srcdir)/tools/flymake.mk CPPFLAGS_COMMON = \ $(EMPATHY_CFLAGS) \ + $(GTK_CFLAGS) \ $(ERROR_CFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"empathy\" \ @@ -24,6 +25,7 @@ LDADD = \ $(top_builddir)/extensions/libemp-extensions.la \ $(LIBNOTIFY_LIBS) \ $(EMPATHY_LIBS) \ + $(GTK_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ $(WEBKIT_LIBS) diff --git a/tests/interactive/Makefile.am b/tests/interactive/Makefile.am index 8fc19eb3e..bd3acea67 100644 --- a/tests/interactive/Makefile.am +++ b/tests/interactive/Makefile.am @@ -3,13 +3,15 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ $(EMPATHY_CFLAGS) \ + $(GTK_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) LDADD = \ $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ $(top_builddir)/libempathy/libempathy.la \ - $(EMPATHY_LIBS) + $(EMPATHY_LIBS) \ + $(GTK_LIBS) noinst_PROGRAMS = \ contact-manager \ -- cgit v1.2.3 From fc57cd132b0563feeec4dba0e5a7298c7d904a0a Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 7 Jul 2010 16:11:39 +0200 Subject: Build with GTK+3 if available (#621753) --- configure.ac | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 12d9cac08..03e0620fc 100644 --- a/configure.ac +++ b/configure.ac @@ -57,9 +57,6 @@ WEBKIT_REQUIRED=1.1.15 # maintainer mode is forced ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"]) GNOME_MAINTAINER_MODE_DEFINES -if test $USE_MAINTAINER_MODE = yes; then - AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors]) -fi AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) @@ -165,10 +162,33 @@ PKG_CHECK_MODULES(EMPATHY, x11 ]) -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) - PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) +# ----------------------------------------------------------- +# GTK+ +# ----------------------------------------------------------- +AC_ARG_ENABLE(gtk3, + AS_HELP_STRING([--enable-gtk3=@<:@no/yes/auto@:>@], + [build with GTK+3]), , + enable_gtk3=auto) + +# Try to use GTK+3 if available +if test "x$enable_gtk3" != "xno"; then + PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_REQUIRED], + enable_gtk3="yes", enable_gtk3="no") +fi + +# ...if not use GTK+2 +if test "x$enable_gtk3" == "xno"; then + enable_gtk3=no + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) + + # Enable GSEAL checks if needed + if test $USE_MAINTAINER_MODE = yes; then + AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors]) + fi +fi + # ----------------------------------------------------------- # Enable debug # ----------------------------------------------------------- @@ -489,6 +509,7 @@ Configure summary: Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS} Prefix......................: ${prefix} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} + Use GTK+3...................: ${enable_gtk3} Features: Spell checking (enchant)....: ${have_enchant} -- cgit v1.2.3 From e56070fd87fe3429ee046550623c90d64c98eb83 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 7 Jul 2010 16:20:54 +0200 Subject: use libcanberra-gtk3 when building with GTK3 --- configure.ac | 7 ++++++- libempathy-gtk/Makefile.am | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 03e0620fc..7a1b9b9d6 100644 --- a/configure.ac +++ b/configure.ac @@ -152,7 +152,6 @@ PKG_CHECK_MODULES(EMPATHY, gobject-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 - libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED libebook-1.2 libxml-2.0 telepathy-farsight @@ -176,6 +175,9 @@ AC_ARG_ENABLE(gtk3, if test "x$enable_gtk3" != "xno"; then PKG_CHECK_MODULES(GTK, [gtk+-3.0 >= $GTK_REQUIRED], enable_gtk3="yes", enable_gtk3="no") + + # GTK3 specific deps + PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED) fi # ...if not use GTK+2 @@ -183,6 +185,9 @@ if test "x$enable_gtk3" == "xno"; then enable_gtk3=no PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) + # GTK2 specific deps + PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED) + # Enable GSEAL checks if needed if test $USE_MAINTAINER_MODE = yes; then AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors]) diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 5762f5c9e..6fa8202dd 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ $(EMPATHY_CFLAGS) \ $(GTK_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ + $(CANBERRA_CFLAGS) \ $(ENCHANT_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ $(GEOCLUE_CFLAGS) \ @@ -133,6 +134,7 @@ libempathy_gtk_la_LIBADD = \ $(EMPATHY_LIBS) \ $(GTK_LIBS) \ $(LIBNOTIFY_LIBS) \ + $(CANBERRA_LIBS) \ $(ENCHANT_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ $(GEOCLUE_LIBS) \ -- cgit v1.2.3 From 9a1f7eef53c664ec9a81f51bfe9a7ec5659b8c6c Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 7 Jul 2010 17:03:45 +0200 Subject: notify-manager: include empathy-contact.h as we use it --- libempathy-gtk/empathy-notify-manager.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libempathy-gtk/empathy-notify-manager.h b/libempathy-gtk/empathy-notify-manager.h index ff62a872a..f7c5e4c5a 100644 --- a/libempathy-gtk/empathy-notify-manager.h +++ b/libempathy-gtk/empathy-notify-manager.h @@ -23,6 +23,8 @@ #include +#include + G_BEGIN_DECLS #define EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS "actions" -- cgit v1.2.3 From c98757d4c4dff4e7f6cea083e4bcf8ac07e93a08 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 8 Jul 2010 09:46:44 +0200 Subject: Update libnotify dep when using GTK3 Since 0.5.1 libnotify doesn't link on GTK+. --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7a1b9b9d6..1ebc23a85 100644 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,7 @@ GTK_REQUIRED=2.21.2 KEYRING_REQUIRED=2.22 LIBCANBERRA_GTK_REQUIRED=0.4 LIBNOTIFY_REQUIRED=0.4.4 +LIBNOTIFY_REQUIRED_GTK3=0.5.1 TELEPATHY_GLIB_REQUIRED=0.11.7 TELEPATHY_LOGGER=0.1.2 UNIQUE_REQUIRED=1.1.2 @@ -161,8 +162,6 @@ PKG_CHECK_MODULES(EMPATHY, x11 ]) -PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) - # ----------------------------------------------------------- # GTK+ # ----------------------------------------------------------- @@ -178,6 +177,7 @@ if test "x$enable_gtk3" != "xno"; then # GTK3 specific deps PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED) + PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3) fi # ...if not use GTK+2 @@ -187,6 +187,7 @@ if test "x$enable_gtk3" == "xno"; then # GTK2 specific deps PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED) + PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) # Enable GSEAL checks if needed if test $USE_MAINTAINER_MODE = yes; then -- cgit v1.2.3 From ce007d41e6854b9434efe29621e98efe95ff0d3b Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 8 Jul 2010 10:01:01 +0200 Subject: link on unique-3 when using GTK3 --- configure.ac | 3 ++- src/Makefile.am | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 1ebc23a85..b99ae2549 100644 --- a/configure.ac +++ b/configure.ac @@ -158,7 +158,6 @@ PKG_CHECK_MODULES(EMPATHY, telepathy-farsight telepathy-glib >= $TELEPATHY_GLIB_REQUIRED telepathy-logger-0.1 >= $TELEPATHY_LOGGER - unique-1.0 >= $UNIQUE_REQUIRED x11 ]) @@ -178,6 +177,7 @@ if test "x$enable_gtk3" != "xno"; then # GTK3 specific deps PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED) PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3) + PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED) fi # ...if not use GTK+2 @@ -188,6 +188,7 @@ if test "x$enable_gtk3" == "xno"; then # GTK2 specific deps PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED) PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) + PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED) # Enable GSEAL checks if needed if test $USE_MAINTAINER_MODE = yes; then diff --git a/src/Makefile.am b/src/Makefile.am index dc199c2f6..8209d92a6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,6 +15,7 @@ AM_LDFLAGS = -lm AM_CPPFLAGS = \ $(CPPFLAGS_COMMON) \ $(LIBNOTIFY_CFLAGS) \ + $(UNIQUE_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ $(WEBKIT_CFLAGS) \ $(NULL) @@ -24,6 +25,7 @@ LDADD = \ $(top_builddir)/libempathy/libempathy.la \ $(top_builddir)/extensions/libemp-extensions.la \ $(LIBNOTIFY_LIBS) \ + $(UNIQUE_LIBS) \ $(EMPATHY_LIBS) \ $(GTK_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ @@ -45,6 +47,7 @@ libempathy_accounts_common_la_SOURCES = \ libempathy_accounts_common_la_LIBADD = \ $(top_builddir)/libempathy-gtk/libempathy-gtk.la \ $(LIBNOTIFY_LIBS) \ + $(UNIQUE_LIBS) \ $(EMPATHY_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ $(WEBKIT_LIBS) \ @@ -134,6 +137,7 @@ empathy_LDADD = \ $(top_builddir)/libempathy/libempathy.la \ $(top_builddir)/extensions/libemp-extensions.la \ $(LIBNOTIFY_LIBS) \ + $(UNIQUE_LIBS) \ $(EMPATHY_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ $(WEBKIT_LIBS) \ -- cgit v1.2.3 From 457808007540c9d7ab0f6b29f2d8e643d46eb8b4 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 8 Jul 2010 10:08:53 +0200 Subject: no need to explicitely check for gdk-x11 --- configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/configure.ac b/configure.ac index b99ae2549..2656c9edd 100644 --- a/configure.ac +++ b/configure.ac @@ -146,7 +146,6 @@ PKG_CHECK_MODULES(EMPATHY, dbus-glib-1 farsight2-0.10 gconf-2.0 >= $GCONF_REQUIRED - gdk-x11-2.0 gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-keyring-1 >= $KEYRING_REQUIRED -- cgit v1.2.3 From 757c4d6c3e3a1872588387bfd49f473ce444b3cf Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 8 Jul 2010 10:36:16 +0200 Subject: Check for webkitgtk-3.0 when building with GTK3 --- configure.ac | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 2656c9edd..175b7669f 100644 --- a/configure.ac +++ b/configure.ac @@ -284,10 +284,14 @@ AC_ARG_ENABLE(webkit, enable_webkit=auto) if test "x$enable_webkit" != "xno"; then - PKG_CHECK_MODULES(WEBKIT, - [ - webkit-1.0 >= $WEBKIT_REQUIRED - ], have_webkit="yes", have_webkit="no") + + if test "x$enable_gtk3" == "xno"; then + PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_REQUIRED], + have_webkit="yes", have_webkit="no") + else + PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED], + have_webkit="yes", have_webkit="no") + fi if test "x$have_webkit" = "xyes"; then AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk]) -- cgit v1.2.3 From 166785e324a397f3b1444820102a41413041d76d Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 8 Jul 2010 10:50:59 +0200 Subject: disable champlain when using GTK3 --- configure.ac | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 175b7669f..2426c2f5e 100644 --- a/configure.ac +++ b/configure.ac @@ -352,17 +352,23 @@ AC_ARG_ENABLE(map, enable_map=auto) if test "x$enable_map" != "xno"; then - PKG_CHECK_MODULES(LIBCHAMPLAIN, - [ - champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED - clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED - ], have_libchamplain="yes", have_libchamplain="no") + + if test "x$enable_gtk3" == "xno"; then + PKG_CHECK_MODULES(LIBCHAMPLAIN, + [ + champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED, + champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED + clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED + ], have_libchamplain="yes", have_libchamplain="no") + else + have_libchamplain="no" + fi if test "x$have_libchamplain" = "xyes"; then AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [Define if you have libchamplain]) fi else + # FIXME: check deps once clutter-gtk and champlain have been ported to GTK3 have_libchamplain=no fi -- cgit v1.2.3 From 6b1d4251dc32cf7c75871002a1f8163af9775f65 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 8 Jul 2010 11:32:20 +0200 Subject: Build with latest NST when using GTK3 and port to new API (#623199) --- configure.ac | 16 ++++++++++++---- nautilus-sendto-plugin/empathy-nautilus-sendto.c | 17 +++++++++++++++++ 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 2426c2f5e..7e71bd96f 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,7 @@ ISO_CODES_REQUIRED=0.35 LIBCHAMPLAIN_GTK_REQUIRED=0.4 LIBCHAMPLAIN_REQUIRED=0.4 NAUTILUS_SENDTO_REQUIRED=2.28.1 +NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 WEBKIT_REQUIRED=1.1.15 @@ -445,10 +446,17 @@ AC_ARG_ENABLE(nautilus-sendto, enable_nautilus_sendto=auto) if test "x$enable_nautilus_sendto" != "xno"; then - PKG_CHECK_MODULES(NST, - [ - nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED - ], have_nst="yes", have_nst="no") + if test "x$enable_gtk3" == "xno"; then + # Newer NST requires GTK+3 so we can't use it + PKG_CHECK_MODULES(NST,[nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED + nautilus-sendto < 2.90.0], + have_nst="yes", have_nst="no") + + AC_DEFINE(HAVE_OLD_NST, [], [Legacy compat mode with old nautilus-sendto] ) + else + PKG_CHECK_MODULES(NST,[nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED_GTK3], + have_nst="yes", have_nst="no") + fi else have_nst=no fi diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c index 503e51808..346624aff 100644 --- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c +++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c @@ -235,6 +235,8 @@ destroy (NstPlugin *plugin) return TRUE; } +/* Legacy from old versions (< 2.90.0) */ +#ifdef HAVE_OLD_NST static NstPluginInfo plugin_info = { "im", @@ -249,6 +251,21 @@ NstPluginInfo plugin_info = { send_files, destroy }; +#else +static +NstPluginInfo plugin_info = { + "im", + "empathy", + N_("Instant Message (Empathy)"), + GETTEXT_PACKAGE, + NAUTILUS_CAPS_NONE, + init, + get_contacts_widget, + validate_destination, + send_files, + destroy +}; +#endif NST_INIT_PLUGIN (plugin_info) -- cgit v1.2.3