diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 16:55:46 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 17:13:52 +0800 |
| commit | 2b263049bd152504227c9ade7e7b6e17cbc95f11 (patch) | |
| tree | f18df3c8abad0a638ba97985844b5cbcb4c62ea1 /src | |
| parent | 87524d43add5732091025b0f76661c09a06bb116 (diff) | |
| download | gsoc2013-empathy-2b263049bd152504227c9ade7e7b6e17cbc95f11.tar.gz gsoc2013-empathy-2b263049bd152504227c9ade7e7b6e17cbc95f11.tar.zst gsoc2013-empathy-2b263049bd152504227c9ade7e7b6e17cbc95f11.zip | |
empathy-accounts: init cheese-gtk if needed
The avatar chooser, which is not used by empathy-accounts, may use Cheese to
take a photo.
cheese_gtk_init() has been added during the 3.4 cycle so I bumped the dep to
3.4.0 as that's the version I have tested it with it. It's an optionnal dep
anyway so...
https://bugzilla.gnome.org/show_bug.cgi?id=674553
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/empathy-accounts.c | 11 |
2 files changed, 16 insertions, 0 deletions
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); |