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 /src | |
| 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 'src')
| -rw-r--r-- | src/empathy-accounts-dialog.c | 4 | ||||
| -rw-r--r-- | src/empathy.c | 2 |
2 files changed, 4 insertions, 2 deletions
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> |