aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-10 21:10:25 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-03-14 23:54:09 +0800
commit34b8438b68cf3783b358d28efd776b8be9f43022 (patch)
treeaef77d8be6d7b7b061d07b5a1de31e3ac6496172
parent7224d0c54379f65b28a3eef01f8857f8116757e3 (diff)
downloadgsoc2013-empathy-34b8438b68cf3783b358d28efd776b8be9f43022.tar
gsoc2013-empathy-34b8438b68cf3783b358d28efd776b8be9f43022.tar.gz
gsoc2013-empathy-34b8438b68cf3783b358d28efd776b8be9f43022.tar.bz2
gsoc2013-empathy-34b8438b68cf3783b358d28efd776b8be9f43022.tar.lz
gsoc2013-empathy-34b8438b68cf3783b358d28efd776b8be9f43022.tar.xz
gsoc2013-empathy-34b8438b68cf3783b358d28efd776b8be9f43022.tar.zst
gsoc2013-empathy-34b8438b68cf3783b358d28efd776b8be9f43022.zip
Also show the EULA in the new account assistant
-rw-r--r--src/empathy-account-assistant.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index a242bf233..636966fb6 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -34,6 +34,7 @@
#include <libempathy/empathy-utils.h>
#include <libempathy-gtk/empathy-account-widget.h>
+#include <libempathy-gtk/empathy-account-widget-skype.h>
#include <libempathy-gtk/empathy-protocol-chooser.h>
#include <libempathy-gtk/empathy-ui-utils.h>
@@ -400,6 +401,15 @@ account_assistant_protocol_changed_cb (GtkComboBox *chooser,
/* we are not ready yet */
return;
+ if (!tp_strdiff (proto->name, "skype"))
+ {
+ if (!empathy_account_widget_skype_show_eula (GTK_WINDOW (self)))
+ {
+ gtk_combo_box_set_active (chooser, 0);
+ return;
+ }
+ }
+
/* Create account */
if (is_gtalk)
name = "gtalk";