From 9cafb4386d0fdbd5b8b8fbfc0768baa850912a2a Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 29 Jul 2016 16:41:09 +0200
Subject: [PATCH] Fix gtk app compilation

---
 gtk/setup_wizard.ui |  4 ++--
 gtk/setupwizard.c   | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gtk/setup_wizard.ui b/gtk/setup_wizard.ui
index 337163f3d..95cdcc4e2 100644
--- a/gtk/setup_wizard.ui
+++ b/gtk/setup_wizard.ui
@@ -652,7 +652,7 @@ This assistant will help you to use a SIP account for your calls.</property>
                 <property name="bottom_attach">6</property>
               </packing>
             </child>
-            <child>
+            <!--<child>
               <object class="GtkCheckButton" id="p4_check_newsletter">
                 <property name="label" translatable="yes">Keep me informed with linphone updates</property>
                 <property name="visible">True</property>
@@ -665,7 +665,7 @@ This assistant will help you to use a SIP account for your calls.</property>
                 <property name="top_attach">6</property>
                 <property name="bottom_attach">7</property>
               </packing>
-            </child>
+			</child>-->
           </object>
         </child>
       </object>
diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index 5586f145e..a29826aea 100644
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -50,7 +50,7 @@ static void create_account(GtkWidget *assistant) {
 
 static void linphone_gtk_test_account_validation_cb(LinphoneAccountCreator *creator, LinphoneAccountCreatorStatus status) {
 	GtkWidget *assistant = (GtkWidget *)linphone_account_creator_get_user_data(creator);
-	if (status == LinphoneAccountCreatorAccountValidated) {
+	if (status == LinphoneAccountCreatorAccountActivated) {
 		// Go to page_9_finish
 		gtk_assistant_set_current_page(GTK_ASSISTANT(assistant), 9);
 	} else {
@@ -61,7 +61,7 @@ static void linphone_gtk_test_account_validation_cb(LinphoneAccountCreator *crea
 
 static void check_account_validation(GtkWidget *assistant) {
 	LinphoneAccountCreator *creator = linphone_gtk_assistant_get_creator(assistant);
-	linphone_account_creator_test_validation(creator);
+	linphone_account_creator_is_account_activated(creator);
 }
 
 void linphone_gtk_assistant_closed(GtkWidget *w) {
@@ -154,11 +154,11 @@ static int linphone_gtk_assistant_forward(int curpage, gpointer data) {
 			GtkEntry *password_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p4_entry_password1"));
 			GtkEntry *username_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p4_entry_username"));
 			GtkEntry *email_entry = GTK_ENTRY(linphone_gtk_get_widget(w, "p4_entry_email"));
-			GtkToggleButton *newsletter = GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w, "p4_check_newsletter"));
+			//GtkToggleButton *newsletter = GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(w, "p4_check_newsletter"));
 			linphone_account_creator_set_username(creator, gtk_entry_get_text(username_entry));
 			linphone_account_creator_set_password(creator, gtk_entry_get_text(password_entry));
 			linphone_account_creator_set_email(creator, gtk_entry_get_text(email_entry));
-			linphone_account_creator_enable_newsletter_subscription(creator, gtk_toggle_button_get_active(newsletter));
+			//linphone_account_creator_enable_newsletter_subscription(creator, gtk_toggle_button_get_active(newsletter));
 			curpage = 5; // Go to page_5_linphone_account_creation_in_progress
 			break;
 		}
@@ -239,7 +239,7 @@ static gboolean check_username_availability(GtkWidget *assistant) {
 	LinphoneAccountCreator *creator = linphone_gtk_assistant_get_creator(assistant);
 	GtkWidget *page = gtk_assistant_get_nth_page(GTK_ASSISTANT(assistant), gtk_assistant_get_current_page(GTK_ASSISTANT(assistant)));
 	g_object_set_data(G_OBJECT(page), "usernameAvailabilityTimerID", GUINT_TO_POINTER(0));
-	linphone_account_creator_test_existence(creator);
+	linphone_account_creator_is_account_used(creator);
 	return FALSE;
 }
 
@@ -322,8 +322,8 @@ static void linphone_gtk_assistant_init(GtkWidget *w) {
 	LinphoneAccountCreator *creator = linphone_account_creator_new(linphone_gtk_get_core(), "https://www.linphone.org/wizard.php");
 	LinphoneAccountCreatorCbs *cbs = linphone_account_creator_get_callbacks(creator);
 	linphone_account_creator_set_user_data(creator, w);
-	linphone_account_creator_cbs_set_existence_tested(cbs, linphone_gtk_test_account_existence_cb);
-	linphone_account_creator_cbs_set_validation_tested(cbs, linphone_gtk_test_account_validation_cb);
+	linphone_account_creator_cbs_set_is_account_used(cbs, linphone_gtk_test_account_existence_cb);
+	linphone_account_creator_cbs_set_is_account_activated(cbs, linphone_gtk_test_account_validation_cb);
 	linphone_account_creator_cbs_set_create_account(cbs, linphone_gtk_create_account_cb);
 	g_object_set_data(G_OBJECT(w), "creator", creator);