diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-05 19:31:59 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-05 19:31:59 +0800 |
| commit | cf118e67c08e1d50b456a7127b0c879740d30e85 (patch) | |
| tree | a1cb10a25c6c994d1f27dd56d5365aa6e7b6f8ab /libempathy-gtk | |
| parent | f86e7b5be4d7721f7f0bf3a9a7a140109486c48b (diff) | |
| parent | beb1e9f725a34f63bbd88744ff92ad6a596574e0 (diff) | |
| download | gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.gz gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.bz2 gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.lz gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.xz gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.tar.zst gsoc2013-empathy-cf118e67c08e1d50b456a7127b0c879740d30e85.zip | |
Merge branch 'gnome-3-4'
Diffstat (limited to 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-local-xmpp-assistant-widget.c | 7 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-local-xmpp-assistant-widget.h | 3 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 1 |
4 files changed, 11 insertions, 3 deletions
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> |