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

---
 libempathy-gtk/empathy-chat.c       | 3 +--
 libempathy-gtk/empathy-log-window.c | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'libempathy-gtk')

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


From bba730492873951c0e8b58c25ebfc6128b02e8a9 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Wed, 4 Apr 2012 15:15:35 +0200
Subject: add empathy_local_xmpp_assistant_widget_is_valid()

https://bugzilla.gnome.org/show_bug.cgi?id=673451
---
 libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 7 +++++++
 libempathy-gtk/empathy-local-xmpp-assistant-widget.h | 3 +++
 2 files changed, 10 insertions(+)

(limited to 'libempathy-gtk')

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