From a0a0f0bc14b965c2063891242f435be3ac6296a4 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 4 Apr 2012 11:55:14 +0200
Subject: include logger single header

---
 src/empathy.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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>
-- 
cgit v1.2.3


From 7843d9f5621b1489a60cb982513ad39e38926fde Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 4 Apr 2012 15:17:03 +0200
Subject: check if salut settings are valid instead of assume they are not

If we manage to fetch all the info from EDS the account is ready to connect
and so the 'Connect' button should be sensitive right away.

https://bugzilla.gnome.org/show_bug.cgi?id=673451
---
 src/empathy-accounts-dialog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c
index fb679ba3c..0e004f5a5 100644
--- a/src/empathy-accounts-dialog.c
+++ b/src/empathy-accounts-dialog.c
@@ -2223,7 +2223,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);
-- 
cgit v1.2.3