diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/empathy-accounts.c | 11 |
3 files changed, 17 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 9a8b0f45d..eebe69790 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,7 @@ ISO_CODES_REQUIRED=0.35 NAUTILUS_SENDTO_REQUIRED=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 CHAMPLAIN_REQUIRED=0.12.1 -CHEESE_GTK_REQUIRED=2.91.91.1 +CHEESE_GTK_REQUIRED=3.4.0 # Use --enable-maintainer-mode to disable deprecated symbols, # disable single include and enable GSEAL. If this is not a released empathy, diff --git a/src/Makefile.am b/src/Makefile.am index dfde20558..dc85dd9ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -59,6 +59,11 @@ empathy_accounts_SOURCES = \ empathy-accounts.c empathy-accounts.h \ $(NULL) +empathy_accounts_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(CHEESE_CFLAGS) \ + $(NULL) + empathy_accounts_LDADD = \ $(LDADD) \ libempathy-accounts-common.la \ diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c index 6b51820f7..efb98e9b3 100644 --- a/src/empathy-accounts.c +++ b/src/empathy-accounts.c @@ -32,6 +32,10 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> +#ifdef HAVE_CHEESE +#include <cheese-gtk.h> +#endif + #include <telepathy-glib/account-manager.h> #include <telepathy-glib/defs.h> #include <telepathy-glib/util.h> @@ -223,6 +227,13 @@ main (int argc, char *argv[]) gint retval; g_thread_init (NULL); + g_type_init (); + +#ifdef HAVE_CHEESE + /* Used by the avatar chooser */ + g_return_val_if_fail (cheese_gtk_init (&argc, &argv), 1); +#endif + empathy_init (); gtk_init (&argc, &argv); |