Merge branch 'gnome-3-4'

Conflicts:
	NEWS
	configure.ac
	src/empathy-accounts.c

diff --git a/NEWS b/NEWS
index 7d3b49ee0df1e948a70ec3ca6cd3e4cf0232409a..9efd8a6884745ffb6605cbe9a9449e6cf36f689e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -46,6 +46,20 @@ Documentation translations:
  - Updated fr Documentation translation (Bruno Brouard)
  - Updated ja Documentation translation (Mako N)
 
+NEW in 3.4.2 (14/05/2012)
+============
+
+Dependencies:
+ • telepathy-glib ≥ 0.18.0
+
+Bugs fixed:
+ - Fixed #674432, The buddy list window is very small by default
+ - Fixed #675767, IRC Edit Connection Parameters text alignment
+
+Translations:
+ - Updated an Translation (Daniel Martinez Cucalon)
+ - Updated sk Translation (Pavol Klačanský)
+
 NEW in 3.4.1 (16/04/2012)
 ============
 

diff --git a/configure.ac b/configure.ac
index 5d6905e38bae66897b3c5d9af448f7c8ab0a2277..0ff4ea8ca273ddb5b234a27b3cae56713573dd07 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +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=3.4.0
 
 # Use --enable-maintainer-mode to disable deprecated symbols,
 # disable single include and enable GSEAL. If this is not a released empathy,
@@ -477,7 +478,7 @@ AC_ARG_WITH([cheese],
             with_cheese=auto)
 
 if test x"$with_cheese" != x"no" ; then
-   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no])
+   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= CHEESE_GTK_REQUIRED, [have_cheese=yes], [have_cheese=no])
    if test x${have_cheese} = xyes; then
      AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
    fi

diff --git a/src/Makefile.am b/src/Makefile.am
index ef7af74fa7be1e704b5cdd6ccac8738aa88ab89d..01de664b03ace4196b0318bcfa5dcd4c12c6f1ce 100644 (file)
--- 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 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 ();