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-04-08 18:41:28 +0800
commit2b4988b5bbfef759bb28a04c172d6011c18991e1 (patch)
treef7178e824b9900641e87e8477618f22d06b3248a
parentf24f7cc3e9cd2be78df4a23d8efd9e11aad97200 (diff)
downloadgsoc2013-empathy-2b4988b5bbfef759bb28a04c172d6011c18991e1.tar
gsoc2013-empathy-2b4988b5bbfef759bb28a04c172d6011c18991e1.tar.gz
gsoc2013-empathy-2b4988b5bbfef759bb28a04c172d6011c18991e1.tar.bz2
gsoc2013-empathy-2b4988b5bbfef759bb28a04c172d6011c18991e1.tar.lz
gsoc2013-empathy-2b4988b5bbfef759bb28a04c172d6011c18991e1.tar.xz
gsoc2013-empathy-2b4988b5bbfef759bb28a04c172d6011c18991e1.tar.zst
gsoc2013-empathy-2b4988b5bbfef759bb28a04c172d6011c18991e1.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 e84fa650c..f7753bdb3 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";