diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 17:18:19 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 17:18:19 +0800 |
| commit | 26b9e04f1c40888bba66bcaace30d9f0feac45fc (patch) | |
| tree | c191578379fbc693b0616b4fd933f8f3322d4dd2 /src | |
| parent | 19d2ee5fe81b850c8300dca6583e9c49bf6f7afd (diff) | |
| parent | 2b263049bd152504227c9ade7e7b6e17cbc95f11 (diff) | |
| download | gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.gz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.bz2 gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.lz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.xz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.zst gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.zip | |
Merge branch 'gnome-3-4'
Conflicts:
NEWS
configure.ac
src/empathy-accounts.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/empathy-accounts.c | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ef7af74fa..01de664b0 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 8feb346e5..027d99918 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,8 +227,14 @@ main (int argc, char *argv[]) GObjectClass *app_class; gint retval; + 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 (); - textdomain (GETTEXT_PACKAGE); gtk_init (&argc, &argv); empathy_gtk_init (); |