Merge branch 'gnome-3-4'

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

diff --cc NEWS
index 7d3b49ee0df1e948a70ec3ca6cd3e4cf0232409a,c2983c4076c5d48dc508b2b861f3f52d1f29aee3..9efd8a6884745ffb6605cbe9a9449e6cf36f689e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,51 -1,17 +1,65 @@@
 +NEW in 3.5.1 (30/04/2012)
 +============
 +
 +Dependencies:
 + • GLib ≥ 2.32.0
 + • telepathy-glib ≥ 0.17.6
 + • Intltool ≥ 0.50.0
 +
 +Bugs fixed:
 + - Fixed #501065, Can't rename group (Guillaume Desmottes)
 + - Fixed #668186, make check does not run the test suite (which doesn't pass when it is run) (Guillaume Desmottes)
 + - Fixed #668261, empathy-tls-test (Stef Walter)
 + - Fixed #669134, SIP widget: add local IP widgets (Laurent Contzen)
 + - Fixed #669177, Show who changed the subject.
 + - Fixed #672619, Drop org.gnome.Empathy.gschema.xml.in (Guillaume Desmottes)
 + - Fixed #672976, Use GNetworkMonitor (Guillaume Desmottes)
 + - Fixed #673159, Add 'Rename' entry to accounts context menu (Guillaume Desmottes)
 + - Fixed #673410, Tooltip text when editing should be translatable (Laurent)
 + - Fixed #673821, Remove old contact list code (Guillaume Desmottes)
 + - Fixed #674432, The buddy list window is very small by default (Guillaume Desmottes)
 + - Fixed #640846, No tooltips in status picker (Laurent Contzen)
 +
 +Translations:
 + - Updated an Translation (Daniel Martinez Cucalon)
 + - Updated ar Translation (Ibrahim Saed)
 + - Updated ca Translation (Jordi Serratosa)
 + - Updated ca@valencia Translation (Carles Ferrando)
 + - Updated en_CA Translation (Tiffany Antopolski)
 + - Updated es Translation (Daniel Mustieles)
 + - Updated eu Translation (Inaki Larranaga Murgoitio)
 + - Updated fa Translation (Arash Mousavi)
 + - Updated gl Translation (Fran Diéguez)
 + - Updated he Translation (Yaron Shahrabani)
 + - Updated hi Translation (Chandan Kumar)
 + - Updated id Translation (Andika Triwidada)
 + - Updated ja Translation (Mako N)
 + - Updated ko Translation (Changwoo Ryu)
 + - Updated nb Translation (Kjartan Maraas)
 + - Updated or Translation (ManojKumar Giri)
 + - Updated sk Translation (Pavol Klačanský)
 + - Updated sl Translation (Matej Urbančič, Andrej Žnidaršič)
 + - Updated te Translation (Sasi Bhushan)
 + - Updated zh_CN Translation (Automatic Mirroring)
 +
 +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 --cc configure.ac
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/empathy-accounts.c
index 8feb346e546f5b8c2f75e19d4a508312bfde8ce4,efb98e9b309456d7f9c81f85dcbd0d355b574776..027d99918ef71cec2496ff7d1c8e1e2c5f9cf50c
--- 1/src/empathy-accounts.c
--- 2/src/empathy-accounts.c
+++ b/src/empathy-accounts.c
@@@ -223,8 -226,15 +227,14 @@@ main (int argc, char *argv[]
    GObjectClass *app_class;
    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 ();
-   textdomain (GETTEXT_PACKAGE);
  
    gtk_init (&argc, &argv);
    empathy_gtk_init ();