Merge branch 'gnome-3-4'

13 files changed, 69 insertions, 17 deletions

diff --git a/NEWS b/NEWS
index 02ad20f17..f68ff3465 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,52 @@
+NEW in 3.4.0.1 (05/04/2012)
+==============
+
+The "Please unify version numbers" release.
+
+This new releases fixes calls logging and is usable with the stable version of
+telepathy-logger.
+
+Most of the Telepathy components have been branched and released as stable. We
+recommend to distributors to use the following versions of these components:
+ • telepathy-glib 0.18.0
+ • telepathy-gabble 0.16.0
+ • telepathy-mission-control 5.12.0
+ • telepathy-logger 0.4.0
+ • telepathy-salut 0.8.0
+ • telepathy-haze 0.6.0
+
+Dependencies:
+ • Clutter ≥ 1.10.0
+ • telepathy-logger ≥ 0.2.13
+
+Bugs fixed:
+ - Fixed #652800, Empathy should notify when someone mention me at IRC (Will Thompson)
+ - Fixed #670601, empathy-accounts segfault (settings are null for liststore iter) (Guillaume Desmottes)
+ - Fixed #672560, Call window inline toolbar borders are not crisp (Cosimo Cecchi)
+ - Fixed #672561, Call window preview drop placeholder should not be red (Cosimo Cecchi)
+ - Fixed #672796, gst_element_get_name: return value should be freed (Debarshi Ray)
+ - Fixed #672839, Pidgin importer treeview should expand vertically. (Guillaume Desmottes)
+ - Fixed #673030, Empathy need porting to logger stable call1 support (Danielle Madeley, Nicolas Dufresne)
+ - Fixed #673046, Video preview is always behind the incoming video (Cosimo Cecchi)
+ - Fixed #673141, Right-click on GOA account let you disable it (Guillaume Desmottes)
+ - Fixed #673162, "Enable" account menu item doesn't connect the account (Guillaume Desmottes)
+ - Fixed #673444, Needs a clutter ≥ 1.10 dep (Guillaume Desmottes)
+ - Fixed #673451, Initial Empathy Accounts Dialog does not allow to click "Connect" (Guillaume Desmottes)
+ - Fixed #673480, nautilus-sendto menu entry "Instant Message (Empathy)" lacks icon (Guillaume Desmottes)
+
+Translations:
+ - Updated ar Translation (Ibrahim Saed)
+ - Updated eu Translation (Inaki Larranaga Murgoitio)
+ - Updated fa Translation (Arash Mousavi)
+ - 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)
+
+Documentation translations:
+ - Updated ja Documentation translation (Mako N)
+
 NEW in 3.4.0 (26/03/2012)
 ============
 Bugs fixed:
diff --git a/configure.ac b/configure.ac
index a31c29c66..4a4a43ce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl If not 1, append datestamp to the version number
-m4_define(empathy_released, 0)
+m4_define(empathy_released, 1)
 
 m4_define([empathy_major_version], [3])
 m4_define([empathy_minor_version], [5])
 m4_define([empathy_micro_version], [0])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [1])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index b98f52102..14404bfe3 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -38,8 +38,7 @@
 
 #include <telepathy-glib/account-manager.h>
 #include <telepathy-glib/util.h>
-#include <telepathy-logger/log-manager.h>
-#include <telepathy-logger/text-event.h>
+#include <telepathy-logger/telepathy-logger.h>
 #include <libempathy/empathy-contact-list.h>
 #include <libempathy/empathy-gsettings.h>
 #include <libempathy/empathy-keyring.h>
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
index 3a6c8ee1c..9caca7de9 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.c
@@ -307,3 +307,10 @@ empathy_local_xmpp_assistant_widget_should_create_account (
 
   return !salut_created;
 }
+
+gboolean
+empathy_local_xmpp_assistant_widget_is_valid (
+        EmpathyLocalXmppAssistantWidget *self)
+{
+  return empathy_account_settings_is_valid (self->priv->settings);
+}
diff --git a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
index 35343bd40..dafd7fb2a 100644
--- a/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
+++ b/libempathy-gtk/empathy-local-xmpp-assistant-widget.h
@@ -58,6 +58,9 @@ void empathy_local_xmpp_assistant_widget_create_account (
 gboolean empathy_local_xmpp_assistant_widget_should_create_account (
     TpAccountManager *manager);
 
+gboolean empathy_local_xmpp_assistant_widget_is_valid (
+        EmpathyLocalXmppAssistantWidget *self);
+
 G_END_DECLS
 
 #endif /* __EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET_H__ */
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 108765370..f38638880 100644
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -35,7 +35,6 @@
 #include <telepathy-glib/proxy-subclass.h>
 
 #include <telepathy-logger/telepathy-logger.h>
-#include <telepathy-logger/call-event.h>
 
 #include <extensions/extensions.h>
 
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index b8d2f3c40..0c4ef755f 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -29,8 +29,6 @@
 #include <telepathy-glib/interfaces.h>
 #include <telepathy-glib/util.h>
 
-#include <telepathy-logger/log-manager.h>
-
 #include <folks/folks.h>
 #include <folks/folks-telepathy.h>
 
diff --git a/libempathy/empathy-contact.h b/libempathy/empathy-contact.h
index d90ea2ad4..6b15d5ea3 100644
--- a/libempathy/empathy-contact.h
+++ b/libempathy/empathy-contact.h
@@ -26,7 +26,7 @@
 
 #include <telepathy-glib/contact.h>
 #include <telepathy-glib/account.h>
-#include <telepathy-logger/entity.h>
+#include <telepathy-logger/telepathy-logger.h>
 #include <folks/folks.h>
 
 G_BEGIN_DECLS
diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 777d4a672..0a8ca408b 100644
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -32,11 +32,6 @@
 #include <telepathy-glib/account.h>
 #include <telepathy-glib/account-manager.h>
 
-#include <telepathy-logger/entity.h>
-#include <telepathy-logger/event.h>
-#include <telepathy-logger/text-event.h>
-#include <telepathy-logger/call-event.h>
-
 #include "empathy-client-factory.h"
 #include "empathy-message.h"
 #include "empathy-utils.h"
diff --git a/libempathy/empathy-message.h b/libempathy/empathy-message.h
index 81da7bf43..c49a2840f 100644
--- a/libempathy/empathy-message.h
+++ b/libempathy/empathy-message.h
@@ -27,7 +27,7 @@
 
 #include <glib-object.h>
 #include <telepathy-glib/message.h>
-#include <telepathy-logger/event.h>
+#include <telepathy-logger/telepathy-logger.h>
 
 #include "empathy-contact.h"
 #include "empathy-time.h"
diff --git a/nautilus-sendto-plugin/empathy-nautilus-sendto.c b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
index 9dc0bca10..04b2c4e2c 100644
--- a/nautilus-sendto-plugin/empathy-nautilus-sendto.c
+++ b/nautilus-sendto-plugin/empathy-nautilus-sendto.c
@@ -269,7 +269,7 @@ destroy (NstPlugin *plugin)
 
 static
 NstPluginInfo plugin_info = {
-  "im",
+  "empathy",
   "empathy",
   N_("Instant Message (Empathy)"),
   GETTEXT_PACKAGE,
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index b146f3838..8f5397912 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2236,7 +2236,9 @@ maybe_show_salut_dialog (EmpathyAccountsDialog *self)
 
   button = gtk_dialog_add_button (GTK_DIALOG (dialog),
       _("_Connect"), GTK_RESPONSE_YES);
-  gtk_widget_set_sensitive (button, FALSE);
+  gtk_widget_set_sensitive (button,
+      empathy_local_xmpp_assistant_widget_is_valid (
+        EMPATHY_LOCAL_XMPP_ASSISTANT_WIDGET (widget)));
 
   g_signal_connect (widget, "valid", G_CALLBACK (salut_valid_cb),
       button);
diff --git a/src/empathy.c b/src/empathy.c
index 2ed3bab5d..ac84d3317 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -44,7 +44,7 @@
 #include <telepathy-glib/connection-manager.h>
 #include <telepathy-glib/interfaces.h>
 
-#include <telepathy-logger/log-manager.h>
+#include <telepathy-logger/telepathy-logger.h>
 
 #include <libempathy/empathy-client-factory.h>
 #include <libempathy/empathy-connection-aggregator.h>