Merge branch 'gnome-3-4'

[empathy.git] / src / empathy-accounts.c

diff --git a/src/empathy-accounts.c b/src/empathy-accounts.c
index 8feb346e546f5b8c2f75e19d4a508312bfde8ce4..027d99918ef71cec2496ff7d1c8e1e2c5f9cf50c 100644 (file)
--- 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 ();