Wizard merged

diff --git a/configure.ac b/configure.ac
index 89e0f230b58a886ea29badd1fd39431b167cd8b9..ec64910fe4372909924efc217d6ebd98df2b93fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,7 @@ AC_ARG_ENABLE(gtk_ui,
       esac],[gtk_ui=true])
 
 if test "$gtk_ui" = "true" ; then
-       PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= 2.4.0 gthread-2.0)
+       PKG_CHECK_MODULES(LIBGTK, gtk+-2.0 >= 2.22.0 gthread-2.0)
        if test "$enable_x11" = "false" ; then
                PKG_CHECK_MODULES(LIBGTKMAC,[ige-mac-integration >= 0.9.7 ])
                AC_DEFINE([HAVE_GTK_OSX],[1],[Defined when gtk osx is used])
@@ -412,6 +412,11 @@ if test "$has_sighandler_t" = "yes" ; then
     AC_DEFINE( HAVE_SIGHANDLER_T, 1, [Define if sighandler_t available] )
 fi
 
+dnl check libsoup (needed for wizard)
+PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= 2.26])
+AC_SUBST(LIBSOUP_CFLAGS)
+AC_SUBST(LIBSOUP_LIBS)
+
 ##################################################
 # Stricter build options (after external packages)
 ##################################################

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index eab5bdc5cbecc72130ce02ae47e80bf369e4001f..96a27d02b385a072b34fc2f8526b4c824fb77603 100644 (file)
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -38,6 +38,7 @@ liblinphone_la_SOURCES=\
        linphonecall.c \
        sipsetup.c sipsetup.h \
        siplogin.c \
+       sipwizard.c \
        lsd.c linphonecore_utils.h \
        ec-calibrator.c \
        conference.c 
@@ -54,7 +55,8 @@ liblinphone_la_LIBADD= \
                $(EXOSIP_LIBS) \
                $(MEDIASTREAMER_LIBS) \
                $(ORTP_LIBS) $(OPENSSL_LIBS) \
-               $(TUNNEL_LIBS)
+               $(TUNNEL_LIBS) \
+               $(LIBSOUP_LIBS)
 
 if BUILD_TESTS
 noinst_PROGRAMS=test_lsd test_ecc
@@ -74,11 +76,10 @@ AM_CFLAGS=$(STRICT_OPTIONS)  -DIN_LINPHONE \
        $(MEDIASTREAMER_CFLAGS) \
        $(OSIP_CFLAGS) \
        $(EXOSIP_CFLAGS) \
+       $(LIBSOUP_CFLAGS) \
        -DENABLE_TRACE  \
        -DLOG_DOMAIN=\"LinphoneCore\" \
        $(IPV6_CFLAGS) \
        -DORTP_INET6 \
        $(VIDEO_CFLAGS) \
        $(TUNNEL_CFLAGS)
-
-AM_CXXFLAGS=$(AM_CFLAGS)

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 306569f1684d0abbdde60d28f9cb18a4d6953179..83edb4975085b206099ac9e5b98897e231e37843 100644 (file)
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -417,6 +417,9 @@ typedef struct _LinphoneAccountCreator{
        char *username;
        char *password;
        char *domain;
+       char *route;
+       char *email;
+       int suscribe;
        bool_t succeeded;
 }LinphoneAccountCreator;
 
@@ -424,9 +427,13 @@ LinphoneAccountCreator *linphone_account_creator_new(struct _LinphoneCore *core,
 void linphone_account_creator_set_username(LinphoneAccountCreator *obj, const char *username);
 void linphone_account_creator_set_password(LinphoneAccountCreator *obj, const char *password);
 void linphone_account_creator_set_domain(LinphoneAccountCreator *obj, const char *domain);
+void linphone_account_creator_set_route(LinphoneAccountCreator *obj, const char *route);
+void linphone_account_creator_set_email(LinphoneAccountCreator *obj, const char *email);
+void linphone_account_creator_set_suscribe(LinphoneAccountCreator *obj, int suscribre);
 const char * linphone_account_creator_get_username(LinphoneAccountCreator *obj);
 const char * linphone_account_creator_get_domain(LinphoneAccountCreator *obj);
 int linphone_account_creator_test_existence(LinphoneAccountCreator *obj);
+int linphone_account_creator_test_validation(LinphoneAccountCreator *obj);
 LinphoneProxyConfig * linphone_account_creator_validate(LinphoneAccountCreator *obj);
 void linphone_account_creator_destroy(LinphoneAccountCreator *obj);
 

diff --git a/coreapi/proxy.c b/coreapi/proxy.c
index 959c321b6862d194c5275683a693d025d69f31ab..d1ef5355bdb5579faac920f4bdb836db23a97f9d 100644 (file)
--- a/coreapi/proxy.c
+++ b/coreapi/proxy.c
@@ -779,6 +779,18 @@ void linphone_account_creator_set_domain(LinphoneAccountCreator *obj, const char
        set_string(&obj->domain,domain);
 }
 
+void linphone_account_creator_set_route(LinphoneAccountCreator *obj, const char *route) {
+       set_string(&obj->route,route);
+}
+
+void linphone_account_creator_set_email(LinphoneAccountCreator *obj, const char *email) {
+       set_string(&obj->email,email);
+}
+
+void linphone_account_creator_set_suscribe(LinphoneAccountCreator *obj, int suscribe) {
+       obj->suscribe = suscribe;
+}
+
 const char * linphone_account_creator_get_username(LinphoneAccountCreator *obj){
        return obj->username;
 }
@@ -795,10 +807,16 @@ int linphone_account_creator_test_existence(LinphoneAccountCreator *obj){
        return err;
 }
 
+int linphone_account_creator_test_validation(LinphoneAccountCreator *obj) {
+       SipSetupContext *ssctx=obj->ssctx;
+       int err=sip_setup_context_account_validated(ssctx,obj->username);
+       return err;
+}
+
 LinphoneProxyConfig * linphone_account_creator_validate(LinphoneAccountCreator *obj){
        SipSetupContext *ssctx=obj->ssctx;
        char *uri=ms_strdup_printf("%s@%s",obj->username,obj->domain);
-       int err=sip_setup_context_create_account(ssctx,uri,obj->password);
+       int err=sip_setup_context_create_account(ssctx, uri, obj->password, obj->email, obj->suscribe);
        ms_free(uri);
        if (err==0) {
                obj->succeeded=TRUE;

diff --git a/coreapi/sipsetup.c b/coreapi/sipsetup.c
index 270737df1a2cbb26fd0943870269f4564954dffc..a1eaa57893302d5cfeb9ca1d1267f2bbb5a15863 100644 (file)
--- a/coreapi/sipsetup.c
+++ b/coreapi/sipsetup.c
@@ -24,9 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "linphonecore.h"
 
 extern SipSetup linphone_sip_login;
+extern SipSetup linphone_sip_wizard;
 
 static SipSetup *all_sip_setups[]={
        &linphone_sip_login,
+       &linphone_sip_wizard,
        NULL
 };
 
@@ -123,9 +125,9 @@ int sip_setup_context_get_capabilities(SipSetupContext *ctx){
        return ctx->funcs->capabilities;
 }
 
-int sip_setup_context_create_account(SipSetupContext * ctx, const char *uri, const char *passwd){
+int sip_setup_context_create_account(SipSetupContext * ctx, const char *uri, const char *passwd, const char *email, int suscribe){
        if (ctx->funcs->create_account)
-               return ctx->funcs->create_account(ctx,uri, passwd);
+               return ctx->funcs->create_account(ctx, uri, passwd, email, suscribe);
        else return -1;
 }
 
@@ -135,6 +137,12 @@ int sip_setup_context_account_exists(SipSetupContext *ctx, const char *uri){
        return -1;
 }
 
+int sip_setup_context_account_validated(SipSetupContext *ctx, const char *uri){
+       if (ctx->funcs->account_validated)
+               return ctx->funcs->account_validated(ctx,uri);
+       return -1;
+}
+
 int sip_setup_context_login_account(SipSetupContext * ctx, const char *uri, const char *passwd){
        LinphoneAddress *from=linphone_address_new(uri);
        if (from==NULL) {

diff --git a/coreapi/sipsetup.h b/coreapi/sipsetup.h
index 6776367c961352480264dc537891413306a31665..2aefbee5c6097ab6a0322c2cc1aa58576644ba4e 100644 (file)
--- a/coreapi/sipsetup.h
+++ b/coreapi/sipsetup.h
@@ -97,7 +97,7 @@ struct _SipSetup{
        void (*init_instance)(SipSetupContext *ctx);
        void (*uninit_instance)(SipSetupContext *ctx);
        int (*account_exists)(SipSetupContext *ctx, const char *uri);
-       int (*create_account)(SipSetupContext *ctx, const char *uri, const char *passwd);
+       int (*create_account)(SipSetupContext *ctx, const char *uri, const char *passwd, const char *email, int suscribe);
        int (*login_account)(SipSetupContext *ctx, const char *uri, const char *passwd);
        int (*get_proxy)(SipSetupContext *ctx, const char *domain, char *proxy, size_t sz);
        int (*get_stun_servers)(SipSetupContext *ctx, char *stun1, char *stun2, size_t size);
@@ -106,6 +106,7 @@ struct _SipSetup{
        const char ** (*get_domains)(SipSetupContext *ctx);
        int (*logout_account)(SipSetupContext *ctx);
        BuddyLookupFuncs *buddy_lookup_funcs;
+       int (*account_validated)(SipSetupContext *ctx, const char *uri);
 };
 
 typedef struct _SipSetup SipSetup;
@@ -131,7 +132,8 @@ unsigned int sip_setup_get_capabilities(SipSetup *s);
 
 SipSetupContext * sip_setup_context_new(SipSetup *s, struct _LinphoneProxyConfig *cfg);
 int sip_setup_context_account_exists(SipSetupContext *ctx, const char *uri);
-int sip_setup_context_create_account(SipSetupContext *ctx, const char *uri, const char *passwd);
+int sip_setup_context_account_validated(SipSetupContext *ctx, const char *uri);
+int sip_setup_context_create_account(SipSetupContext *ctx, const char *uri, const char *passwd, const char *email, int suscribe);
 int sip_setup_context_get_capabilities(SipSetupContext *ctx);
 int sip_setup_context_login_account(SipSetupContext * ctx, const char *uri, const char *passwd);
 int sip_setup_context_get_proxy(SipSetupContext *ctx, const char *domain, char *proxy, size_t sz);

diff --git a/coreapi/sipwizard.c b/coreapi/sipwizard.c
new file mode 100644 (file)
index 0000000..ee268e5
--- /dev/null
+++ b/coreapi/sipwizard.c
@@ -0,0 +1,268 @@
+/*
+sipwizard.c
+Copyright (C) 2011 Belledonne Communication, Grenoble, France
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#include "linphonecore.h"
+#include "private.h"
+#include <ctype.h>
+#include <libsoup/soup.h>
+
+typedef struct _BLReq{
+       int status;
+       int result;
+       SoupMessage *msg;
+       SoupSession *session;
+       ortp_thread_t th;
+}BLReq;
+
+static const int XMLRPC_FAILED = -1;
+static const int XMLRPC_OK = 0;
+static const char *XMLRPC_URL = "https://www.linphone.org/wizard.php";
+
+static void sip_wizard_init_instance(SipSetupContext *ctx){
+       LinphoneProxyConfig *cfg=sip_setup_context_get_proxy_config(ctx);
+       /*disable registration until the user logs in*/
+       linphone_proxy_config_enable_register(cfg,FALSE);
+}
+
+static const char ** sip_wizard_get_domains(SipSetupContext *ctx) {
+       LinphoneProxyConfig *cfg=sip_setup_context_get_proxy_config(ctx);
+       const char **domains = (const char**) &cfg->reg_proxy;
+       return domains;
+}
+
+
+static int xml_rpc_parse_response(BLReq *blreq, SoupMessage *sm){
+       SoupBuffer *sb;
+       GValue retval;
+       GError *error=NULL;
+       sb=soup_message_body_flatten(sm->response_body);
+       ms_message("This the xml-rpc response:\n%s\n",sb->data);
+       if (soup_xmlrpc_parse_method_response(sb->data,sb->length,&retval,&error)==FALSE){
+               if (error!=NULL){
+                       ms_error("xmlrpc fault: %s",error->message);
+                       g_error_free(error);
+               }else{
+                       ms_error("Could not parse xml-rpc response !");
+               }
+               blreq->status=XMLRPC_FAILED;
+       }else{
+               ms_message("Extracting values from return type...");
+               blreq->result = g_value_get_int(&retval);
+               g_value_unset(&retval);
+               blreq->status=XMLRPC_OK;
+       }
+       soup_buffer_free(sb);
+       return blreq->status;
+}
+
+static void got_headers(BLReq *blreq, SoupMessage*msg){
+       ms_message("Got headers !");
+       blreq->status=XMLRPC_OK;
+}
+
+#if SERIALIZE_HTTPS
+/*on windows libsoup support for threads with gnutls is not yet functionnal (only in git)
+This will come in next release of libsoup, probably.
+In the meantime, we are forced to serialize all soup https processing with a big
+ugly global mutex...*/
+
+static GStaticMutex big_mutex = G_STATIC_MUTEX_INIT;
+#endif
+
+static void * process_xml_rpc_request(void *up){
+       BLReq *blreq=(BLReq*)up;
+       SoupMessage *sm=blreq->msg;
+       int code;
+       g_signal_connect_swapped(G_OBJECT(sm),"got-headers",(GCallback)got_headers,blreq);
+       blreq->status=XMLRPC_OK;
+#if SERIALIZE_HTTPS
+       g_static_mutex_lock(&big_mutex);
+#endif
+       code=soup_session_send_message(blreq->session,sm);
+       if (code==200){
+               xml_rpc_parse_response(blreq,sm);
+       }else{
+               ms_error("request failed, error-code=%i (%s)",code,soup_status_get_phrase(code));
+               blreq->status=XMLRPC_FAILED;
+       }
+#if SERIALIZE_HTTPS
+       g_static_mutex_unlock(&big_mutex);
+#endif
+       return NULL;
+}
+
+
+static int do_simple_xmlrpc_request(SoupMessage *msg) {
+        int ret=-1;
+        BLReq *req;
+
+       if (!msg){
+               ms_error("Fail to create SoupMessage !");
+               return -1;
+       }else{
+               SoupBuffer *sb=soup_message_body_flatten(msg->request_body);
+               ms_message("This is the XML-RPC request we are going to send:\n%s\n",sb->data);
+               soup_buffer_free(sb);
+       }
+
+       req=ms_new0(BLReq, 1);
+        req->session=soup_session_sync_new();
+        req->msg=msg;
+
+        process_xml_rpc_request(req);
+
+        if (req->status == XMLRPC_OK) {
+                ret=req->result;
+        }
+
+       // Freeing allocated structures lead to a crash (why?)
+       //g_free(req->session);
+       //g_free(msg);
+        ms_free(req);
+
+        return ret;
+}
+
+/*
+ * Return 1 if account already exists
+ * 0 if account doesn't exists
+ * -1 if information isn't available
+ */
+static int sip_wizard_account_exists(SipSetupContext *ctx, const char *identity) {
+       SoupMessage *msg=soup_xmlrpc_request_new(XMLRPC_URL,
+                                "check_account",
+                                G_TYPE_STRING, identity,
+                                G_TYPE_INVALID);
+       return do_simple_xmlrpc_request(msg);
+}
+
+static int sip_wizard_account_validated(SipSetupContext *ctx, const char *identity) {
+       SoupMessage *msg=soup_xmlrpc_request_new(XMLRPC_URL,
+                                "check_account_validated",
+                                G_TYPE_STRING, identity,
+                                G_TYPE_INVALID);
+        return do_simple_xmlrpc_request(msg);
+}
+
+static int sip_wizard_create_account(SipSetupContext *ctx, const char *identity, const char *passwd, const char *email, int suscribe) {
+       SoupMessage *msg=soup_xmlrpc_request_new(XMLRPC_URL,
+                               "create_account",
+                               G_TYPE_STRING, identity,
+                               G_TYPE_STRING, passwd,
+                               G_TYPE_STRING, email,
+                               G_TYPE_INT, suscribe,
+                               G_TYPE_INVALID);
+       return do_simple_xmlrpc_request(msg);
+}
+
+static void guess_display_name(LinphoneAddress *from){
+       const char *username=linphone_address_get_username(from);
+       char *dn=(char*)ms_malloc(strlen(username)+1);
+       const char *it;
+       char *wptr=dn;
+       bool_t begin=TRUE;
+       bool_t surname=FALSE;
+       for(it=username;*it!='\0';++it){
+               if (begin){
+                       *wptr=toupper(*it);
+                       begin=FALSE;
+               }else if (*it=='.'){
+                       if (surname) break;
+                       *wptr=' ';
+                       begin=TRUE;
+                       surname=TRUE;
+               }else {
+                       *wptr=*it;
+               }
+               wptr++;
+       }
+       *wptr='\0';
+       linphone_address_set_display_name(from,dn);
+       ms_free(dn);
+}
+
+static int sip_wizard_do_login(SipSetupContext * ctx, const char *uri, const char *passwd){
+       LinphoneProxyConfig *cfg=sip_setup_context_get_proxy_config(ctx);
+       LinphoneCore *lc=linphone_proxy_config_get_core(cfg);
+       LinphoneAuthInfo *auth;
+       LinphoneAddress *parsed_uri;
+       char *tmp;
+
+       parsed_uri=linphone_address_new(uri);
+       if (parsed_uri==NULL){
+               return -1;
+       }
+       if (linphone_address_get_display_name(parsed_uri)!=NULL){
+               guess_display_name(parsed_uri);
+       }
+       tmp=linphone_address_as_string(parsed_uri);
+       linphone_proxy_config_set_identity(cfg,tmp);
+       if (passwd) {
+               auth=linphone_auth_info_new(linphone_address_get_username(parsed_uri),NULL,passwd,NULL,NULL);
+               linphone_core_add_auth_info(lc,auth);
+       }
+       linphone_proxy_config_enable_register(cfg,TRUE);
+       linphone_proxy_config_done(cfg);
+       ms_free(tmp);
+       linphone_address_destroy(parsed_uri);
+       return 0;
+}
+
+/* a simple SipSetup built-in plugin to allow creating accounts at runtime*/
+
+#ifndef _MSC_VER
+
+SipSetup linphone_sip_wizard={
+       .name="SipWizard",
+       .capabilities=SIP_SETUP_CAP_ACCOUNT_MANAGER,
+       .init_instance=sip_wizard_init_instance,
+       .account_exists=sip_wizard_account_exists,
+       .create_account=sip_wizard_create_account,
+       .login_account=sip_wizard_do_login,
+       .get_domains=sip_wizard_get_domains,
+       .account_validated=sip_wizard_account_validated
+};
+
+#else
+SipSetup linphone_sip_wizard={
+       "SipWizard",
+       SIP_SETUP_CAP_ACCOUNT_MANAGER,
+       0,
+       NULL,
+       NULL,
+       sip_wizard_init_instance,
+       NULL,
+       sip_wizard_account_exists,
+       sip_wizard_create_account,
+       sip_wizard_do_login,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       NULL,
+       sip_wizard_get_domains,
+       NULL,
+       NULL,
+       sip_wizard_account_validated
+};
+
+
+
+#endif

diff --git a/gtk/linphone.h b/gtk/linphone.h
index 57b56203840013bdc0991b75803bd6af9433df91..45c8b54aacfa4b42c3adc1a18d69a7ffe1561a35 100644 (file)
--- a/gtk/linphone.h
+++ b/gtk/linphone.h
@@ -56,6 +56,7 @@ GdkPixbuf *_gdk_pixbuf_new_from_memory_at_scale(const void *data, gint len, gint
 GtkWidget *linphone_gtk_create_window(const char *window_name);
 GtkWidget *linphone_gtk_get_widget(GtkWidget *window, const char *name);
 GtkWidget *linphone_gtk_create_widget(const char *filename, const char *widget_name);
+GtkWidget * linphone_gtk_create_assistant(void);
 
 LinphoneCore *linphone_gtk_get_core(void);
 GtkWidget *linphone_gtk_get_main_window();

diff --git a/gtk/main.c b/gtk/main.c
index 88f2807fd5848c9082f48dd4a94023a6e783ae4b..27c6f616586d5b931618cd2d771fa170a1b4790b 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -50,6 +50,7 @@ const char *this_program_ident_string="linphone_ident_string=" LINPHONE_VERSION;
 
 static LinphoneCore *the_core=NULL;
 static GtkWidget *the_ui=NULL;
+GtkWidget *the_wizard=NULL;
 
 static void linphone_gtk_registration_state_changed(LinphoneCore *lc, LinphoneProxyConfig *cfg, LinphoneRegistrationState rs, const char *msg);
 static void linphone_gtk_notify_recv(LinphoneCore *lc, LinphoneFriend * fid);
@@ -1439,8 +1440,9 @@ static void linphone_gtk_configure_main_window(){
                        g_object_unref(G_OBJECT(pbuf));
                }
        }
-       if (linphone_gtk_can_manage_accounts())
+       if (linphone_gtk_can_manage_accounts()) {
                gtk_widget_show(linphone_gtk_get_widget(w,"assistant_item"));
+       }
        if (update_check_menu){
                gtk_widget_show(linphone_gtk_get_widget(w,"versioncheck_item"));
        }
@@ -1584,6 +1586,13 @@ static void linphone_gtk_check_soundcards(){
        }
 }
 
+// Display the account wizard
+void linphone_gtk_display_wizard() {
+       if (the_wizard == NULL || !gtk_widget_get_visible(the_wizard)) { // Only one instance of the wizard at the same time
+               the_wizard = linphone_gtk_create_assistant();
+       }
+}
+
 static void linphone_gtk_quit(void){
        static gboolean quit_done=FALSE;
        if (!quit_done){
@@ -1727,6 +1736,12 @@ int main(int argc, char *argv[]){
        gtk_timeout_add(30,(GtkFunction)linphone_gtk_iterate,(gpointer)linphone_gtk_get_core());
        gtk_timeout_add(30,(GtkFunction)linphone_gtk_check_logs,(gpointer)NULL);
        linphone_gtk_init_main_window();
+
+       // Veryfing if at least one sip account is configured. If not, show wizard
+       if (linphone_core_get_proxy_config_list(linphone_gtk_get_core()) == NULL) {
+               linphone_gtk_display_wizard();
+       }
+
 #ifndef HAVE_GTK_OSX
        linphone_gtk_init_status_icon();
 #endif

diff --git a/gtk/main.ui b/gtk/main.ui
index fde3a794a62a9ae95fa6c2a22071f08ecc18bda6..f6f418a03c55ca4686940cf23a3615ee07069e78 100644 (file)
--- a/gtk/main.ui
+++ b/gtk/main.ui
@@ -129,7 +129,7 @@
                   <object class="GtkHBox" id="encryption_box">
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImage" id="image12">
+                      <object class="GtkImage" id="image121">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="stock">gtk-dialog-authentication</property>
@@ -383,6 +383,11 @@
     <property name="can_focus">False</property>
     <property name="stock">gtk-clear</property>
   </object>
+  <object class="GtkImage" id="image12">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-connect</property>
+  </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -572,6 +577,16 @@
                         <signal name="activate" handler="linphone_gtk_check_for_new_version" swapped="no"/>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkImageMenuItem" id="assistant_item">
+                        <property name="label" translatable="yes">Account assistant</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="image">image12</property>
+                        <property name="use_stock">False</property>
+                        <signal name="activate" handler="linphone_gtk_display_wizard" swapped="no"/>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>

diff --git a/gtk/parameters.ui b/gtk/parameters.ui
index 153b5bddecec410d7fb6aa9cc499c408c26527b4..dcea80e264cdd01fcb446122416194787e494e79 100644 (file)
--- a/gtk/parameters.ui
+++ b/gtk/parameters.ui
@@ -1,31 +1,31 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.18"/>
   <!-- interface-naming-policy toplevel-contextual -->
   <object class="GtkAdjustment" id="adjustment1">
-    <property name="value">500</property>
     <property name="lower">500</property>
     <property name="upper">3001</property>
+    <property name="value">500</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
-    <property name="value">1</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment3">
-    <property name="value">1</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment4">
-    <property name="value">1</property>
     <property name="upper">65535</property>
+    <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
@@ -42,15 +42,15 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustment7">
-    <property name="value">5060</property>
     <property name="lower">1</property>
     <property name="upper">65535</property>
+    <property name="value">5060</property>
     <property name="step_increment">1</property>
     <property name="page_increment">9.9999999995529656</property>
   </object>
   <object class="GtkAdjustment" id="adjustment_tcp_port">
-    <property name="value">1</property>
     <property name="upper">65535</property>
+    <property name="value">1</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
@@ -153,12 +153,14 @@
     </data>
   </object>
   <object class="GtkWindow" id="parameters">
+    <property name="can_focus">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
     <property name="title" translatable="yes">Settings</property>
     <property name="icon">linphone2.png</property>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <child>
           <object class="GtkNotebook" id="notebook1">
@@ -168,34 +170,42 @@
             <child>
               <object class="GtkVBox" id="network_tab">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
                   <object class="GtkFrame" id="transport_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkHBox" id="hbox2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
                                   <object class="GtkCheckButton" id="mtu_set">
                                     <property name="label" translatable="yes">Set Maximum Transmission Unit:</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="draw_indicator">True</property>
-                                    <signal name="toggled" handler="linphone_gtk_mtu_set"/>
+                                    <signal name="toggled" handler="linphone_gtk_mtu_set" swapped="no"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -203,15 +213,23 @@
                                   <object class="GtkSpinButton" id="mtu">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
                                     <property name="adjustment">adjustment1</property>
-                                    <signal name="value_changed" handler="linphone_gtk_mtu_changed"/>
+                                    <signal name="value-changed" handler="linphone_gtk_mtu_changed" swapped="no"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -221,10 +239,13 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="linphone_gtk_use_sip_info_dtmf_toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_use_sip_info_dtmf_toggled" swapped="no"/>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -235,10 +256,13 @@
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="linphone_gtk_ipv6_toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_ipv6_toggled" swapped="no"/>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">2</property>
                               </packing>
                             </child>
@@ -249,6 +273,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;Transport&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -257,29 +282,34 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="ports_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table1">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">5</property>
                             <property name="n_columns">2</property>
                             <child>
                               <object class="GtkComboBox" id="proto_combo">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="model">model8</property>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer1"/>
@@ -293,8 +323,12 @@
                               <object class="GtkSpinButton" id="proto_port">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="invisible_char">&#x2022;</property>
+                                <property name="invisible_char">•</property>
                                 <property name="invisible_char_set">True</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
                                 <property name="adjustment">adjustment7</property>
                               </object>
                               <packing>
@@ -307,10 +341,10 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="invisible_char">&#x2022;</property>
-                                <property name="invisible_char_set">True</property>
-                                <property name="adjustment">adjustment2</property>
-                                <signal name="value_changed" handler="linphone_gtk_video_port_changed"/>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -324,10 +358,14 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <property name="invisible_char">&#x2022;</property>
+                                <property name="invisible_char">•</property>
                                 <property name="invisible_char_set">True</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
                                 <property name="adjustment">adjustment3</property>
-                                <signal name="value_changed" handler="linphone_gtk_audio_port_changed"/>
+                                <signal name="value-changed" handler="linphone_gtk_audio_port_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -339,6 +377,7 @@
                             <child>
                               <object class="GtkLabel" id="label7">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Video RTP/UDP:</property>
                                 <property name="justify">right</property>
@@ -351,6 +390,7 @@
                             <child>
                               <object class="GtkLabel" id="label6">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Audio RTP/UDP:</property>
                                 <property name="justify">right</property>
@@ -363,6 +403,7 @@
                             <child>
                               <object class="GtkLabel" id="media_encryption_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Media encryption type</property>
                               </object>
                               <packing>
@@ -373,6 +414,7 @@
                             <child>
                               <object class="GtkComboBox" id="media_encryption_combo">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="active">0</property>
                               </object>
                               <packing>
@@ -384,6 +426,7 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="tunnel_label">
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Tunnel</property>
                               </object>
                               <packing>
@@ -396,7 +439,8 @@
                                 <property name="label" translatable="yes">edit</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <signal name="clicked" handler="linphone_gtk_edit_tunnel"/>
+                                <property name="use_action_appearance">False</property>
+                                <signal name="clicked" handler="linphone_gtk_edit_tunnel" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -412,6 +456,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;Network protocol and ports&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -420,27 +465,31 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="nat_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkVButtonBox" id="vbuttonbox3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkRadioButton" id="no_nat">
                             <property name="label" translatable="yes">Direct connection to the Internet</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="active">True</property>
                             <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="linphone_gtk_no_firewall_toggled"/>
+                            <signal name="toggled" handler="linphone_gtk_no_firewall_toggled" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -451,33 +500,41 @@
                         <child>
                           <object class="GtkVBox" id="vbox4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioButton" id="use_nat_address">
                                 <property name="label" translatable="yes">Behind NAT / Firewall (specify gateway IP below)</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">no_nat</property>
-                                <signal name="toggled" handler="linphone_gtk_use_nat_address_toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_use_nat_address_toggled" swapped="no"/>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" id="hbox21">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <child>
                                   <object class="GtkLabel" id="label39">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="label" translatable="yes">Public IP address:</property>
                                     <property name="justify">right</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -486,14 +543,22 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <signal name="changed" handler="linphone_gtk_nat_address_changed"/>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                    <signal name="changed" handler="linphone_gtk_nat_address_changed" swapped="no"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -507,33 +572,41 @@
                         <child>
                           <object class="GtkVBox" id="vbox5">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkRadioButton" id="use_stun">
                                 <property name="label" translatable="yes">Behind NAT / Firewall (use STUN to resolve)</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
                                 <property name="group">no_nat</property>
-                                <signal name="toggled" handler="linphone_gtk_use_stun_toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_use_stun_toggled" swapped="no"/>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" id="hbox24">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <child>
                                   <object class="GtkLabel" id="label42">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <property name="label" translatable="yes">Stun server:</property>
                                     <property name="justify">right</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -542,14 +615,22 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <signal name="changed" handler="linphone_gtk_stun_server_changed"/>
+                                    <property name="primary_icon_activatable">False</property>
+                                    <property name="secondary_icon_activatable">False</property>
+                                    <property name="primary_icon_sensitive">True</property>
+                                    <property name="secondary_icon_sensitive">True</property>
+                                    <signal name="changed" handler="linphone_gtk_stun_server_changed" swapped="no"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -565,6 +646,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label38">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;NAT and Firewall&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -573,6 +655,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -581,24 +664,31 @@
             <child type="tab">
               <object class="GtkHBox" id="hbox12">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
                   <object class="GtkImage" id="image6">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="stock">gtk-network</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="network">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">Network settings</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -610,35 +700,43 @@
             <child>
               <object class="GtkVBox" id="multimedia_tab">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
                   <object class="GtkFrame" id="frame14">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment14">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table5">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">6</property>
                             <property name="n_columns">2</property>
                             <child>
                               <object class="GtkHBox" id="ring_sound_box">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <child>
                                   <object class="GtkFileChooserButton" id="ring_chooser">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <signal name="file_set" handler="linphone_gtk_ring_file_set"/>
+                                    <signal name="file-set" handler="linphone_gtk_ring_file_set" swapped="no"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
@@ -649,10 +747,13 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                    <property name="use_action_appearance">False</property>
                                     <property name="use_stock">True</property>
-                                    <signal name="clicked" handler="linphone_gtk_play_ring_file"/>
+                                    <signal name="clicked" handler="linphone_gtk_play_ring_file" swapped="no"/>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -668,6 +769,7 @@
                             <child>
                               <object class="GtkLabel" id="ring_sound_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Ring sound:</property>
                                 <property name="justify">right</property>
@@ -682,7 +784,11 @@
                               <object class="GtkEntry" id="alsa_dev">
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <signal name="editing_done" handler="linphone_gtk_alsa_special_device_changed"/>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                                <signal name="editing-done" handler="linphone_gtk_alsa_special_device_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -695,9 +801,10 @@
                             <child>
                               <object class="GtkComboBox" id="capture_device">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="model">model1</property>
-                                <signal name="changed" handler="linphone_gtk_capture_device_changed"/>
+                                <signal name="changed" handler="linphone_gtk_capture_device_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer2"/>
                                   <attributes>
@@ -716,9 +823,10 @@
                             <child>
                               <object class="GtkComboBox" id="ring_device">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="model">model2</property>
-                                <signal name="changed" handler="linphone_gtk_ring_device_changed"/>
+                                <signal name="changed" handler="linphone_gtk_ring_device_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer3"/>
                                   <attributes>
@@ -736,6 +844,7 @@
                             </child>
                             <child>
                               <object class="GtkLabel" id="label36">
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">ALSA special device (optional):</property>
                                 <property name="justify">right</property>
@@ -749,6 +858,7 @@
                             <child>
                               <object class="GtkLabel" id="label35">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Capture device:</property>
                                 <property name="justify">right</property>
@@ -762,6 +872,7 @@
                             <child>
                               <object class="GtkLabel" id="label34">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Ring device:</property>
                                 <property name="justify">right</property>
@@ -775,6 +886,7 @@
                             <child>
                               <object class="GtkLabel" id="label32">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Playback device:</property>
                                 <property name="justify">right</property>
@@ -787,9 +899,10 @@
                             <child>
                               <object class="GtkComboBox" id="playback_device">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="model">model3</property>
-                                <signal name="changed" handler="linphone_gtk_playback_device_changed"/>
+                                <signal name="changed" handler="linphone_gtk_playback_device_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer4"/>
                                   <attributes>
@@ -810,8 +923,9 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="linphone_gtk_echo_cancelation_toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_echo_cancelation_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -830,6 +944,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label31">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;Audio&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -837,26 +952,32 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="video_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment4">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table2">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="n_rows">2</property>
                             <property name="n_columns">2</property>
                             <child>
                               <object class="GtkLabel" id="label9">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Video input device:</property>
                                 <property name="justify">right</property>
                               </object>
@@ -867,8 +988,9 @@
                             <child>
                               <object class="GtkComboBox" id="webcams">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="model">model4</property>
-                                <signal name="changed" handler="linphone_gtk_cam_changed"/>
+                                <signal name="changed" handler="linphone_gtk_cam_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer5"/>
                                   <attributes>
@@ -885,6 +1007,7 @@
                             <child>
                               <object class="GtkLabel" id="video_size_label">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Prefered video resolution:</property>
                               </object>
                               <packing>
@@ -895,9 +1018,10 @@
                             <child>
                               <object class="GtkComboBox" id="video_size">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="model">model5</property>
                                 <property name="active">0</property>
-                                <signal name="changed" handler="linphone_gtk_video_size_changed"/>
+                                <signal name="changed" handler="linphone_gtk_video_size_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer6"/>
                                   <attributes>
@@ -919,12 +1043,14 @@
                     <child type="label">
                       <object class="GtkLabel" id="video_frame_title">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Video&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
@@ -937,24 +1063,31 @@
             <child type="tab">
               <object class="GtkHBox" id="hbox11">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
                   <object class="GtkImage" id="image5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="stock">gtk-media-play</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">Multimedia settings</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -967,10 +1100,12 @@
             <child>
               <object class="GtkVBox" id="sip_tab">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
                   <object class="GtkFrame" id="frame11">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="tooltip_text" translatable="yes">This section defines your SIP address when not using a SIP account</property>
                     <property name="label_xalign">0</property>
@@ -978,17 +1113,20 @@
                     <child>
                       <object class="GtkAlignment" id="alignment11">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table4">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">3</property>
                             <property name="n_columns">2</property>
                             <child>
                               <object class="GtkLabel" id="label25">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Your display name (eg: John Doe):</property>
                               </object>
@@ -998,7 +1136,11 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <signal name="changed" handler="linphone_gtk_update_my_contact"/>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                                <signal name="changed" handler="linphone_gtk_update_my_contact" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1008,6 +1150,7 @@
                             <child>
                               <object class="GtkLabel" id="label26">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Your username:</property>
                               </object>
@@ -1019,6 +1162,7 @@
                             <child>
                               <object class="GtkLabel" id="label27">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Your resulting SIP address:</property>
                               </object>
@@ -1032,7 +1176,11 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <signal name="changed" handler="linphone_gtk_update_my_contact"/>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
+                                <signal name="changed" handler="linphone_gtk_update_my_contact" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1047,6 +1195,10 @@
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="editable">False</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1062,6 +1214,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="label24">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;Default identity&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -1069,23 +1222,28 @@
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame12">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment12">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkHBox" id="hbox13">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
                               <object class="GtkScrolledWindow" id="scrolledwindow2">
@@ -1101,41 +1259,99 @@
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkVButtonBox" id="vbuttonbox2">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                <child>
+                                  <object class="GtkButton" id="wizard">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <signal name="clicked" handler="linphone_gtk_display_wizard" swapped="no"/>
+                                    <child>
+                                      <object class="GtkHBox" id="hbox5">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <child>
+                                          <object class="GtkImage" id="image14">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="stock">gtk-add</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="wizard_label0">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                            <property name="label" translatable="yes">Wizard</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
                                 <child>
                                   <object class="GtkButton" id="add_proxy">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <signal name="clicked" handler="linphone_gtk_add_proxy"/>
+                                    <property name="use_action_appearance">False</property>
+                                    <signal name="clicked" handler="linphone_gtk_add_proxy" swapped="no"/>
                                     <child>
                                       <object class="GtkHBox" id="hbox14">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
                                           <object class="GtkImage" id="image7">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="stock">gtk-add</property>
                                           </object>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="add_proxy_label">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="label" translatable="yes">Add</property>
                                           </object>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -1145,7 +1361,7 @@
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
-                                    <property name="position">0</property>
+                                    <property name="position">1</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1154,28 +1370,36 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <signal name="clicked" handler="linphone_gtk_edit_proxy"/>
+                                    <property name="use_action_appearance">False</property>
+                                    <signal name="clicked" handler="linphone_gtk_edit_proxy" swapped="no"/>
                                     <child>
                                       <object class="GtkHBox" id="hbox16">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
                                           <object class="GtkImage" id="image9">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="stock">gtk-edit</property>
                                           </object>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="label_proxy2">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="label" translatable="yes">Edit</property>
                                           </object>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -1185,7 +1409,7 @@
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
-                                    <property name="position">1</property>
+                                    <property name="position">2</property>
                                   </packing>
                                 </child>
                                 <child>
@@ -1194,28 +1418,36 @@
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                    <signal name="clicked" handler="linphone_gtk_remove_proxy"/>
+                                    <property name="use_action_appearance">False</property>
+                                    <signal name="clicked" handler="linphone_gtk_remove_proxy" swapped="no"/>
                                     <child>
                                       <object class="GtkHBox" id="hbox7">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <child>
                                           <object class="GtkImage" id="image2">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="stock">gtk-delete</property>
                                           </object>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="label_proxy1">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <property name="label" translatable="yes">Remove</property>
                                           </object>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -1225,33 +1457,41 @@
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
-                                    <property name="position">2</property>
+                                    <property name="position">3</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkButton" id="create_phonics">
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">True</property>
-                                    <signal name="clicked" handler="linphone_gtk_create_fonics_account"/>
+                                    <property name="use_action_appearance">False</property>
+                                    <signal name="clicked" handler="linphone_gtk_create_fonics_account" swapped="no"/>
                                     <child>
                                       <object class="GtkHBox" id="hbox1">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <child>
                                           <object class="GtkImage" id="image1">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="stock">gtk-network</property>
                                           </object>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
                                           <object class="GtkLabel" id="label11">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="label" translatable="yes">Register to FONICS
 virtual network !</property>
                                           </object>
                                           <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
                                             <property name="position">1</property>
                                           </packing>
                                         </child>
@@ -1261,7 +1501,7 @@ virtual network !</property>
                                   <packing>
                                     <property name="expand">False</property>
                                     <property name="fill">False</property>
-                                    <property name="position">3</property>
+                                    <property name="position">4</property>
                                   </packing>
                                 </child>
                               </object>
@@ -1278,6 +1518,7 @@ virtual network !</property>
                     <child type="label">
                       <object class="GtkLabel" id="label28">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;Proxy accounts&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -1285,23 +1526,28 @@ virtual network !</property>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame13">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment13">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkHButtonBox" id="hbuttonbox3">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
                               <object class="GtkButton" id="erase_passwords">
@@ -1309,28 +1555,36 @@ virtual network !</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                <signal name="clicked" handler="linphone_gtk_clear_passwords"/>
+                                <property name="use_action_appearance">False</property>
+                                <signal name="clicked" handler="linphone_gtk_clear_passwords" swapped="no"/>
                                 <child>
                                   <object class="GtkHBox" id="hbox18">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <child>
                                       <object class="GtkImage" id="image11">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="stock">gtk-delete</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">0</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="label30">
                                         <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                         <property name="label" translatable="yes">Erase all passwords</property>
                                       </object>
                                       <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
                                         <property name="position">1</property>
                                       </packing>
                                     </child>
@@ -1350,6 +1604,7 @@ virtual network !</property>
                     <child type="label">
                       <object class="GtkLabel" id="label29">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;Privacy&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -1357,6 +1612,8 @@ virtual network !</property>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
@@ -1368,24 +1625,31 @@ virtual network !</property>
             <child type="tab">
               <object class="GtkHBox" id="hbox10">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
                   <object class="GtkImage" id="image4">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="pixbuf">stock_people.png</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">Manage SIP Accounts</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1398,29 +1662,34 @@ virtual network !</property>
             <child>
               <object class="GtkVBox" id="codec_tab">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
                   <object class="GtkFrame" id="frame9">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment9">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkVBox" id="vbox8">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <child>
                               <object class="GtkComboBox" id="codec_view">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="model">model6</property>
                                 <property name="active">0</property>
-                                <signal name="changed" handler="linphone_gtk_codec_view_changed"/>
+                                <signal name="changed" handler="linphone_gtk_codec_view_changed" swapped="no"/>
                                 <child>
                                   <object class="GtkCellRendererText" id="renderer7"/>
                                   <attributes>
@@ -1430,12 +1699,14 @@ virtual network !</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkHBox" id="hbox_codec">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <child>
                                   <object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -1453,12 +1724,15 @@ virtual network !</property>
                                     </child>
                                   </object>
                                   <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">0</property>
                                   </packing>
                                 </child>
                                 <child>
                                   <object class="GtkVButtonBox" id="vbuttonbox1">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                     <child>
                                       <object class="GtkButton" id="button4">
@@ -1467,8 +1741,9 @@ virtual network !</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="linphone_gtk_codec_up"/>
+                                        <signal name="clicked" handler="linphone_gtk_codec_up" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1483,8 +1758,9 @@ virtual network !</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                                        <property name="use_action_appearance">False</property>
                                         <property name="use_stock">True</property>
-                                        <signal name="clicked" handler="linphone_gtk_codec_down"/>
+                                        <signal name="clicked" handler="linphone_gtk_codec_down" swapped="no"/>
                                       </object>
                                       <packing>
                                         <property name="expand">False</property>
@@ -1498,28 +1774,36 @@ virtual network !</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <signal name="clicked" handler="linphone_gtk_codec_enable"/>
+                                        <property name="use_action_appearance">False</property>
+                                        <signal name="clicked" handler="linphone_gtk_codec_enable" swapped="no"/>
                                         <child>
                                           <object class="GtkHBox" id="hbox8">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <child>
                                               <object class="GtkImage" id="image3">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                 <property name="stock">gtk-yes</property>
                                               </object>
                                               <packing>
+                                                <property name="expand">True</property>
+                                                <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
                                               <object class="GtkLabel" id="label19">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                 <property name="label" translatable="yes">Enable</property>
                                               </object>
                                               <packing>
+                                                <property name="expand">True</property>
+                                                <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -1538,28 +1822,36 @@ virtual network !</property>
                                         <property name="can_focus">True</property>
                                         <property name="receives_default">True</property>
                                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                                        <signal name="clicked" handler="linphone_gtk_codec_disable"/>
+                                        <property name="use_action_appearance">False</property>
+                                        <signal name="clicked" handler="linphone_gtk_codec_disable" swapped="no"/>
                                         <child>
                                           <object class="GtkHBox" id="hbox9">
                                             <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
                                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                             <child>
                                               <object class="GtkImage" id="image8">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                 <property name="stock">gtk-no</property>
                                               </object>
                                               <packing>
+                                                <property name="expand">True</property>
+                                                <property name="fill">True</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
                                               <object class="GtkLabel" id="label20">
                                                 <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
                                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                                 <property name="label" translatable="yes">Disable</property>
                                               </object>
                                               <packing>
+                                                <property name="expand">True</property>
+                                                <property name="fill">True</property>
                                                 <property name="position">1</property>
                                               </packing>
                                             </child>
@@ -1575,11 +1867,14 @@ virtual network !</property>
                                   </object>
                                   <packing>
                                     <property name="expand">False</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -1590,6 +1885,7 @@ virtual network !</property>
                     <child type="label">
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;Codecs&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -1597,23 +1893,28 @@ virtual network !</property>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="frame10">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment10">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkTable" id="table3">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                             <property name="n_rows">3</property>
                             <property name="n_columns">2</property>
@@ -1623,8 +1924,12 @@ virtual network !</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="tooltip_text" translatable="yes">0 stands for "unlimited"</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
                                 <property name="adjustment">adjustment5</property>
-                                <signal name="value_changed" handler="linphone_gtk_upload_bw_changed"/>
+                                <signal name="value-changed" handler="linphone_gtk_upload_bw_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1641,8 +1946,12 @@ virtual network !</property>
                                 <property name="can_focus">True</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="tooltip_text" translatable="yes">0 stands for "unlimited"</property>
+                                <property name="primary_icon_activatable">False</property>
+                                <property name="secondary_icon_activatable">False</property>
+                                <property name="primary_icon_sensitive">True</property>
+                                <property name="secondary_icon_sensitive">True</property>
                                 <property name="adjustment">adjustment6</property>
-                                <signal name="value_changed" handler="linphone_gtk_download_bw_changed"/>
+                                <signal name="value-changed" handler="linphone_gtk_download_bw_changed" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1654,6 +1963,7 @@ virtual network !</property>
                             <child>
                               <object class="GtkLabel" id="label23">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Upload speed limit in Kbit/sec:</property>
                                 <property name="justify">right</property>
@@ -1666,6 +1976,7 @@ virtual network !</property>
                             <child>
                               <object class="GtkLabel" id="label22">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                                 <property name="label" translatable="yes">Download speed limit in Kbit/sec:</property>
                                 <property name="justify">right</property>
@@ -1677,9 +1988,10 @@ virtual network !</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="draw_indicator">True</property>
-                                <signal name="toggled" handler="linphone_gtk_adaptive_rate_control_toggled"/>
+                                <signal name="toggled" handler="linphone_gtk_adaptive_rate_control_toggled" swapped="no"/>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -1693,6 +2005,7 @@ virtual network !</property>
                             <child>
                               <object class="GtkLabel" id="label5">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">&lt;i&gt;Adaptive rate control is a technique to dynamically guess the available bandwidth during a call.&lt;/i&gt;</property>
                                 <property name="use_markup">True</property>
                                 <property name="wrap">True</property>
@@ -1711,6 +2024,7 @@ virtual network !</property>
                     <child type="label">
                       <object class="GtkLabel" id="label21">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="label" translatable="yes">&lt;b&gt;Bandwidth control&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
@@ -1718,6 +2032,8 @@ virtual network !</property>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1729,24 +2045,31 @@ virtual network !</property>
             <child type="tab">
               <object class="GtkHBox" id="hbox15">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <child>
                   <object class="GtkImage" id="image10">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="stock">gtk-execute</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label33">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                     <property name="label" translatable="yes">Codecs</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1759,20 +2082,24 @@ virtual network !</property>
             <child>
               <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkFrame" id="lang_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment3">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkComboBox" id="lang_combo">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="model">model7</property>
-                            <signal name="changed" handler="linphone_gtk_lang_changed"/>
+                            <signal name="changed" handler="linphone_gtk_lang_changed" swapped="no"/>
                             <child>
                               <object class="GtkCellRendererText" id="renderer9"/>
                               <attributes>
@@ -1786,6 +2113,7 @@ virtual network !</property>
                     <child type="label">
                       <object class="GtkLabel" id="lang_label">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Language&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -1793,17 +2121,20 @@ virtual network !</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkFrame" id="ui_level_frame">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">none</property>
                     <child>
                       <object class="GtkAlignment" id="alignment5">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
                           <object class="GtkCheckButton" id="ui_level">
@@ -1811,8 +2142,9 @@ virtual network !</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
                             <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="linphone_gtk_ui_level_toggled"/>
+                            <signal name="toggled" handler="linphone_gtk_ui_level_toggled" swapped="no"/>
                           </object>
                         </child>
                       </object>
@@ -1820,6 +2152,7 @@ virtual network !</property>
                     <child type="label">
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">&lt;b&gt;Level&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -1827,6 +2160,7 @@ virtual network !</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1838,22 +2172,29 @@ virtual network !</property>
             <child type="tab">
               <object class="GtkHBox" id="hbox4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkImage" id="image13">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="stock">gtk-properties</property>
                     <property name="icon-size">3</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label10">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">User interface</property>
                   </object>
                   <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1865,12 +2206,15 @@ virtual network !</property>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkHButtonBox" id="hbuttonbox2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
             <property name="layout_style">end</property>
             <child>
@@ -1879,25 +2223,33 @@ virtual network !</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <signal name="clicked" handler="linphone_gtk_parameters_closed"/>
+                <property name="use_action_appearance">False</property>
+                <signal name="clicked" handler="linphone_gtk_parameters_closed" swapped="no"/>
                 <child>
                   <object class="GtkHBox" id="hbox3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImage" id="image12">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="stock">gtk-apply</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">Done</property>
                       </object>
                       <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -1913,6 +2265,8 @@ virtual network !</property>
             </child>
           </object>
           <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="padding">5</property>
             <property name="position">1</property>
           </packing>

diff --git a/gtk/propertybox.c b/gtk/propertybox.c
index 98c44dffc5334e468db81904270586aa10a49d93..ff9d91cf0e875376572d9afb0284b0660495b321 100644 (file)
--- a/gtk/propertybox.c
+++ b/gtk/propertybox.c
@@ -119,12 +119,12 @@ void linphone_gtk_update_my_port(GtkWidget *w){
        }
        else if (strcmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(linphone_gtk_get_widget(pb, "proto_combo"))), "SIP (UDP)") == 0) {
                tr.udp_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w));
-               tr.tcp_port = 0;
+        tr.tcp_port = 0;
                tr.tls_port = 0;
        }
        else if (strcmp(gtk_combo_box_get_active_text(GTK_COMBO_BOX(linphone_gtk_get_widget(pb, "proto_combo"))), "SIP (TLS)") == 0){
                tr.udp_port = 0;
-               tr.tcp_port = 0;
+        tr.tcp_port = 0;
                tr.tls_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w));
        }
 

diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
index e5f8702f28652055ae7746486d34a7a490d10566..ee7e13413258643d445f6caf4462292b3e9ab792 100644 (file)
--- a/gtk/setupwizard.c
+++ b/gtk/setupwizard.c
@@ -18,7 +18,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #include "linphone.h"
-LinphoneAccountCreator *linphone_gtk_assistant_get_creator(GtkWidget*w);
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <pthread.h>
+static LinphoneAccountCreator *linphone_gtk_assistant_get_creator(GtkWidget*w);
+
+static const int PASSWORD_MIN_SIZE = 6;
+static const int LOGIN_MIN_SIZE = 4;
+static int is_username_available = 0;
+static int is_email_correct = 0;
+static int is_password_correct = 0;
+
+static GdkPixbuf *ok;
+static GdkPixbuf *notok;
 
 static GtkWidget *create_intro(){
        GtkWidget *vbox=gtk_vbox_new(FALSE,2);
@@ -31,83 +43,295 @@ static GtkWidget *create_intro(){
 
 static GtkWidget *create_setup_signin_choice(){
        GtkWidget *vbox=gtk_vbox_new(FALSE,2);
-       GtkWidget *t1=gtk_radio_button_new_with_label(NULL,_("Create an account by choosing a username"));
-       GtkWidget *t2=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(t1),_("I have already an account and just want to use it"));
+       GtkWidget *t1=gtk_radio_button_new_with_label(NULL,_("Create an account on linphone.org"));
+       GtkWidget *t2=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(t1),_("I have already a linphone.org account and I just want to use it"));
+       GtkWidget *t3=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(t1),_("I have already a sip account and I just want to use it"));
        gtk_box_pack_start (GTK_BOX (vbox), t1, TRUE, TRUE, 2);
        gtk_box_pack_start (GTK_BOX (vbox), t2, TRUE, TRUE, 2);
+       gtk_box_pack_start (GTK_BOX (vbox), t3, TRUE, TRUE, 2);
        gtk_widget_show_all(vbox);
        g_object_set_data(G_OBJECT(vbox),"create_account",t1);
-       g_object_set_data(G_OBJECT(vbox),"setup_account",t2);
+       g_object_set_data(G_OBJECT(vbox),"setup_linphone_account",t2);
+       g_object_set_data(G_OBJECT(vbox),"setup_account",t3);
        return vbox;
 }
 
-static void create_username_changed(GtkEntry *entry, GtkWidget *w){
+static int all_account_information_entered(GtkWidget *w) {
+       GtkEntry* username = GTK_ENTRY(g_object_get_data(G_OBJECT(w),"username"));
+       GtkEntry* domain = GTK_ENTRY(g_object_get_data(G_OBJECT(w),"domain"));
+
+       if (gtk_entry_get_text_length(username) > 0 &&
+       gtk_entry_get_text_length(domain) > 0 &&
+       g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{2,}$", gtk_entry_get_text(username), 0, 0) &&
+       g_regex_match_simple("^(sip:)?([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$", gtk_entry_get_text(domain), 0, 0)) {
+               return 1;
+       }
+       return 0;
+}
+
+static void account_informations_changed(GtkEntry *entry, GtkWidget *w) {
        GtkWidget *assistant=gtk_widget_get_toplevel(w);
        gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant),w,
-               gtk_entry_get_text_length(entry)>=3);
+               all_account_information_entered(w)>0);
 }
 
-static GtkWidget *create_username_chooser(){
-       GtkWidget *vbox=gtk_vbox_new(FALSE,2);
-       GtkWidget *hbox=gtk_hbox_new(FALSE,2);
-       GtkWidget *label=gtk_label_new(_("Please choose a username:"));
-       GtkWidget *label2=gtk_label_new(_("Username:"));
-       GtkWidget *label3=gtk_label_new(NULL);
-       GtkWidget *entry=gtk_entry_new();
-       gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
-       gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 2);
-       gtk_box_pack_start (GTK_BOX (hbox), label2, TRUE, TRUE, 2);
-       gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 2);
-       gtk_box_pack_start (GTK_BOX (vbox), label3, TRUE, TRUE, 2);
+static void linphone_account_informations_changed(GtkEntry *entry, GtkWidget *w) {
+       GtkWidget *assistant=gtk_widget_get_toplevel(w);
+       GtkEntry* username = GTK_ENTRY(g_object_get_data(G_OBJECT(w),"username"));
+
+       gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant),w,
+               gtk_entry_get_text_length(username) >= LOGIN_MIN_SIZE);
+}
+
+static GtkWidget *create_linphone_account_informations_page() {
+       GtkWidget *vbox=gtk_table_new(3, 2, TRUE);
+       GtkWidget *label=gtk_label_new(_("Enter your linphone.org username"));
+
+       GdkColor color;
+       gdk_color_parse ("red", &color);
+       GtkWidget *labelEmpty=gtk_label_new(NULL);
+       gtk_widget_modify_fg(labelEmpty, GTK_STATE_NORMAL, &color);
+
+       GtkWidget *labelUsername=gtk_label_new(_("Username:"));
+       GtkWidget *entryUsername=gtk_entry_new();
+       GtkWidget *labelPassword=gtk_label_new(_("Password:"));
+       GtkWidget *entryPassword=gtk_entry_new();
+       gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE);
+
+       gtk_table_attach_defaults(GTK_TABLE(vbox), label, 0, 2, 0, 1);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelUsername, 0, 1, 1, 2);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), entryUsername, 1, 2, 1, 2);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelPassword, 0, 1, 2, 3);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), entryPassword, 1, 2, 2, 3);
+
        gtk_widget_show_all(vbox);
-       g_object_set_data(G_OBJECT(vbox),"username",entry);
-       g_object_set_data(G_OBJECT(vbox),"errorstring",label3);
-       g_signal_connect(G_OBJECT(entry),"changed",(GCallback)create_username_changed,vbox);
+       g_object_set_data(G_OBJECT(vbox),"username",entryUsername);
+       g_object_set_data(G_OBJECT(vbox),"password",entryPassword);
+       g_object_set_data(G_OBJECT(vbox),"errorstring",labelEmpty);
+       g_signal_connect(G_OBJECT(entryUsername),"changed",(GCallback)linphone_account_informations_changed,vbox);
        return vbox;
 }
 
-static GtkWidget *create_username_checking_page(){
-       GtkWidget *vbox=gtk_vbox_new(FALSE,2);
-       GtkWidget *label=gtk_label_new(NULL);
-       GtkWidget *progress=gtk_progress_bar_new();
-       gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
-       gtk_box_pack_start (GTK_BOX (vbox), progress, TRUE, TRUE, 2);
-       g_object_set_data(G_OBJECT(vbox),"label",label);
-       g_object_set_data(G_OBJECT(vbox),"progress",progress);
+static GtkWidget *create_account_informations_page() {
+       GtkWidget *vbox=gtk_table_new(6, 2, FALSE);
+       GtkWidget *label=gtk_label_new(_("Enter your account informations"));
+
+       GdkColor color;
+       gdk_color_parse ("red", &color);
+       GtkWidget *labelEmpty=gtk_label_new(NULL);
+       gtk_widget_modify_fg(labelEmpty, GTK_STATE_NORMAL, &color);
+
+       GtkWidget *labelUsername=gtk_label_new(_("Username*"));
+       GtkWidget *labelPassword=gtk_label_new(_("Password*"));
+       GtkWidget *entryPassword=gtk_entry_new();
+       gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE);
+       GtkWidget *labelDomain=gtk_label_new(_("Domain*"));
+       GtkWidget *labelProxy=gtk_label_new(_("Proxy"));
+       GtkWidget *entryUsername=gtk_entry_new();
+       GtkWidget *entryDomain=gtk_entry_new();
+       GtkWidget *entryRoute=gtk_entry_new();
+
+       gtk_table_attach_defaults(GTK_TABLE(vbox), label, 0, 2, 0, 1);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelUsername, 0, 1, 1, 2);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), entryUsername, 1, 2, 1, 2);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelPassword, 0, 1, 2, 3);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), entryPassword, 1, 2, 2, 3);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelDomain, 0, 1, 3, 4);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), entryDomain, 1, 2, 3, 4);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelProxy, 0, 1, 4, 5);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), entryRoute, 1, 2, 4, 5);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelEmpty, 0, 2, 5, 6);
        gtk_widget_show_all(vbox);
+
+       g_object_set_data(G_OBJECT(vbox),"username",entryUsername);
+       g_object_set_data(G_OBJECT(vbox),"password",entryPassword);
+       g_object_set_data(G_OBJECT(vbox),"domain",entryDomain);
+       g_object_set_data(G_OBJECT(vbox),"proxy",entryRoute);
+       g_object_set_data(G_OBJECT(vbox),"errorstring",labelEmpty);
+       g_signal_connect(G_OBJECT(entryUsername),"changed",(GCallback)account_informations_changed,vbox);
+       g_signal_connect(G_OBJECT(entryDomain),"changed",(GCallback)account_informations_changed,vbox);
+       g_signal_connect(G_OBJECT(entryRoute),"changed",(GCallback)account_informations_changed,vbox);
+
        return vbox;
 }
 
-static void *progress_bar_update(LinphoneCore *lc, void *ctx, LinphoneWaitingState ws, const char *purpose, float progress){
-       GtkWidget *pb=(GtkWidget*)ctx;
-       if (ws==LinphoneWaitingProgress) gtk_progress_bar_pulse(GTK_PROGRESS_BAR(pb));
-       else if (ws==LinphoneWaitingFinished) gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pb),1);
-       return ctx;
+static int create_account(GtkWidget *page) {
+       LinphoneAccountCreator *creator=linphone_gtk_assistant_get_creator(gtk_widget_get_toplevel(page));
+       LinphoneProxyConfig *res=linphone_account_creator_validate(creator);
+       if (res) {
+               if (!g_regex_match_simple("^sip:[a-zA-Z]+[a-zA-Z0-9.\\-_]{2,}@sip.linphone.org$",creator->username, 0, 0)) {
+                       gchar identity[128];
+                       g_snprintf(identity, sizeof(identity), "sip:%s@sip.linphone.org", creator->username);
+                       linphone_account_creator_set_username(creator, identity);
+                       linphone_account_creator_set_domain(creator, "sip:sip.linphone.org");
+               }
+               return 1;
+       }
+       return 0;
 }
 
-static void check_username(GtkWidget *page){
-       GtkWidget *progress=(GtkWidget*)g_object_get_data(G_OBJECT(page),"progress");
-       GtkWidget *label=(GtkWidget*)g_object_get_data(G_OBJECT(page),"label");
-       LinphoneAccountCreator *creator=linphone_gtk_assistant_get_creator(gtk_widget_get_toplevel(page));
-       gchar *text=g_strdup_printf(_("Checking if '%s' is available..."),linphone_account_creator_get_username(creator));
-       LinphoneAccountCreator *c=linphone_gtk_assistant_get_creator(gtk_widget_get_toplevel(page));
-       int res;
-       gtk_label_set_text(GTK_LABEL(label),text);
-       g_free(text);
-       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress),_("Please wait..."));
-       linphone_core_set_waiting_callback(linphone_gtk_get_core(),progress_bar_update,progress);
-       res=linphone_account_creator_test_existence(c);
-       if (res==1){
-               gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress),_("Sorry this username already exists. Please try a new one."));
-       }else if (res==0){
-               gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress),_("Ok !"));
-               gtk_assistant_set_page_complete(GTK_ASSISTANT(gtk_widget_get_toplevel(page)),page,TRUE);
-       }else if (res==-1){
-               gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress),_("Communication problem, please try again later."));
+static int is_account_information_correct(GtkWidget *w) {
+       if (is_username_available == 1 && is_email_correct == 1 && is_password_correct == 1) {
+               return 1;
        }
-       linphone_core_set_waiting_callback(linphone_gtk_get_core(),linphone_gtk_wait,NULL);
+       return 0;
+}
+
+static void account_email_changed(GtkEntry *entry, GtkWidget *w) {
+       // Verifying if email entered is correct, and if form is correctly filled, let the user go next page
+
+       GtkEntry* email = GTK_ENTRY(g_object_get_data(G_OBJECT(w),"email"));
+       GtkImage* isEmailOk = GTK_IMAGE(g_object_get_data(G_OBJECT(w),"emailOk"));
+       GtkWidget *assistant=gtk_widget_get_toplevel(w);
+
+       if (g_regex_match_simple("^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$", gtk_entry_get_text(email), 0, 0)) {
+               is_email_correct = 1;
+               gtk_image_set_from_pixbuf(isEmailOk, ok);
+       }
+       else {
+               is_email_correct = 0;
+               gtk_image_set_from_pixbuf(isEmailOk, notok);
+       }
+       gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant),w,
+                       is_account_information_correct(w)>0);
+}
+
+static void account_password_changed(GtkEntry *entry, GtkWidget *w) {
+       // Verifying if passwords entered match, and if form is correctly filled, let the user go next page
+
+       GtkEntry* password = GTK_ENTRY(g_object_get_data(G_OBJECT(w),"password"));
+       GtkImage* isPasswordOk = GTK_IMAGE(g_object_get_data(G_OBJECT(w),"passwordOk"));
+       GtkEntry* password_confirm = GTK_ENTRY(g_object_get_data(G_OBJECT(w),"password_confirm"));
+       GtkWidget *assistant=gtk_widget_get_toplevel(w);
+       GtkLabel* passwordError = GTK_LABEL(g_object_get_data(G_OBJECT(w),"error"));
+
+       if (gtk_entry_get_text_length(password) >= PASSWORD_MIN_SIZE &&
+       g_ascii_strcasecmp(gtk_entry_get_text(password), gtk_entry_get_text(password_confirm)) == 0) {
+               is_password_correct = 1;
+               gtk_image_set_from_pixbuf(isPasswordOk, ok);
+               gtk_label_set_text(passwordError, "");
+       }
+       else {
+               if (gtk_entry_get_text_length(password) < PASSWORD_MIN_SIZE) {
+                       gtk_label_set_text(passwordError, "Password is too short !");
+               }
+               else if (!g_ascii_strcasecmp(gtk_entry_get_text(password), gtk_entry_get_text(password_confirm)) == 0) {
+                       gtk_label_set_text(passwordError, "Passwords don't match !");
+               }
+               is_password_correct = 0;
+               gtk_image_set_from_pixbuf(isPasswordOk, notok);
+       }
+       gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant),w,
+                       is_account_information_correct(w)>0);
+}
+
+void* check_username_availability(void* w) {
+       GtkWidget *assistant=gtk_widget_get_toplevel(GTK_WIDGET(w));
+       GtkEntry* username = GTK_ENTRY(g_object_get_data(G_OBJECT(w),"username"));
+       GtkImage* isUsernameOk = GTK_IMAGE(g_object_get_data(G_OBJECT(w),"usernameOk"));
+       GtkLabel* usernameError = GTK_LABEL(g_object_get_data(G_OBJECT(w),"error"));
+
+       LinphoneAccountCreator *creator=linphone_gtk_assistant_get_creator(assistant);
+       linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
+
+       if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
+               int account_existing = linphone_account_creator_test_existence(creator);
+               if (account_existing == 0) {
+                       is_username_available = 1;
+                       gtk_image_set_from_pixbuf(isUsernameOk, ok);
+                       gtk_label_set_text(usernameError, "");
+               }
+               else {
+                       gtk_label_set_text(usernameError, "Username is already in use !");
+                       is_username_available = 0;
+                       gtk_image_set_from_pixbuf(isUsernameOk, notok);
+               }
+       }
+       else {
+               if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
+                       gtk_label_set_text(usernameError, "Username is too short");
+               }
+               else if (!g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
+                       gtk_label_set_text(usernameError, "Unauthorized username");
+               }
+               is_username_available = 0;
+               gtk_image_set_from_pixbuf(isUsernameOk, notok);
+       }
+
+       gtk_assistant_set_page_complete(GTK_ASSISTANT(assistant),w,
+                       is_account_information_correct(w)>0);
+
+       return NULL;
+}
+
+static void account_username_changed(GtkEntry *entry, GtkWidget *w) {
+       // Verifying if username choosed is available, and if form is correctly filled, let the user go next page
+       pthread_t thread;
+       pthread_create(&thread, NULL, check_username_availability, (void*)w);
+}
+
+static GtkWidget *create_account_information_page() {
+       GtkWidget *vbox=gtk_table_new(7, 3, FALSE);
+
+       GtkWidget *label=gtk_label_new(_("(*) Required fields"));
+       GtkWidget *labelUsername=gtk_label_new(_("Username: (*)"));
+       GtkWidget *isUsernameOk=gtk_image_new_from_pixbuf(notok);
+       GtkWidget *labelPassword=gtk_label_new(_("Password: (*)"));
+       GtkWidget *isPasswordOk=gtk_image_new_from_pixbuf(notok);
+       GtkWidget *labelEmail=gtk_label_new(_("Email: (*)"));
+       GtkWidget *isEmailOk=gtk_image_new_from_pixbuf(notok);
+       GtkWidget *labelPassword2=gtk_label_new(_("Confirm your password: (*)"));
+       GtkWidget *entryUsername=gtk_entry_new();
+       GtkWidget *entryPassword=gtk_entry_new();
+       gtk_entry_set_visibility(GTK_ENTRY(entryPassword), FALSE);
+       GtkWidget *entryEmail=gtk_entry_new();
+       GtkWidget *entryPassword2=gtk_entry_new();
+       gtk_entry_set_visibility(GTK_ENTRY(entryPassword2), FALSE);
+       GtkWidget *checkNewsletter=gtk_check_button_new_with_label("Keep me informed with linphone updates");
+
+       GdkColor color;
+       gdk_color_parse ("red", &color);
+       GtkWidget *labelError=gtk_label_new(NULL);
+       gtk_widget_modify_fg(labelError, GTK_STATE_NORMAL, &color);
+
+       GtkWidget *passwordVbox1=gtk_vbox_new(FALSE,2);
+       GtkWidget *passwordVbox2=gtk_vbox_new(FALSE,2);
+       gtk_box_pack_start (GTK_BOX (passwordVbox1), labelPassword, TRUE, FALSE, 2);
+       gtk_box_pack_start (GTK_BOX (passwordVbox1), labelPassword2, TRUE, FALSE, 2);
+       gtk_box_pack_start (GTK_BOX (passwordVbox2), entryPassword, TRUE, FALSE, 2);
+       gtk_box_pack_start (GTK_BOX (passwordVbox2), entryPassword2, TRUE, FALSE, 2);
+
+       gtk_table_attach_defaults(GTK_TABLE(vbox), label, 0, 3, 0, 1);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelEmail, 0, 1, 1, 2);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), entryEmail, 1, 2, 1, 2);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), isEmailOk, 2, 3, 1, 2);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelUsername, 0, 1, 2, 3);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), entryUsername, 1, 2, 2, 3);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), isUsernameOk, 2, 3, 2, 3);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), passwordVbox1, 0, 1, 3, 4);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), passwordVbox2, 1, 2, 3, 4);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), isPasswordOk, 2, 3, 3, 4);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), labelError, 1, 4, 5, 6);
+       gtk_table_attach_defaults(GTK_TABLE(vbox), checkNewsletter, 0, 3, 6, 7);
+
+       gtk_widget_show_all(vbox);
+       g_object_set_data(G_OBJECT(vbox),"username",entryUsername);
+       g_object_set_data(G_OBJECT(vbox),"password",entryPassword);
+       g_object_set_data(G_OBJECT(vbox),"email",entryEmail);
+       g_object_set_data(G_OBJECT(vbox),"usernameOk",isUsernameOk);
+       g_object_set_data(G_OBJECT(vbox),"passwordOk",isPasswordOk);
+       g_object_set_data(G_OBJECT(vbox),"emailOk",isEmailOk);
+       g_object_set_data(G_OBJECT(vbox),"password_confirm",entryPassword2);
+       g_object_set_data(G_OBJECT(vbox),"newsletter",checkNewsletter);
+       g_object_set_data(G_OBJECT(vbox),"error",labelError);
+       g_signal_connect(G_OBJECT(entryUsername),"changed",(GCallback)account_username_changed,vbox);
+       g_signal_connect(G_OBJECT(entryPassword),"changed",(GCallback)account_password_changed,vbox);
+       g_signal_connect(G_OBJECT(entryEmail),"changed",(GCallback)account_email_changed,vbox);
+       g_signal_connect(G_OBJECT(entryPassword2),"changed",(GCallback)account_password_changed,vbox);
+       return vbox;
 }
 
+/*
 static GtkWidget *create_confirmation_page(){
        GtkWidget *vbox=gtk_vbox_new(FALSE,2);
        GtkWidget *label=gtk_label_new(NULL);
@@ -116,15 +340,15 @@ static GtkWidget *create_confirmation_page(){
        gtk_widget_show_all(vbox);
        return vbox;
 }
+*/
+
+static GtkWidget *create_error_page(){
+       GtkWidget *vbox=gtk_table_new(2, 1, FALSE);
+       GtkWidget *label=gtk_label_new(_("Error, account not validated, username already used or server unreachable.\nPlease go back and try again."));
+
+       gtk_table_attach(GTK_TABLE(vbox), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND, 0, 100);
 
-static GtkWidget *create_creation_page(){
-       GtkWidget *vbox=gtk_vbox_new(FALSE,2);
-       GtkWidget *label=gtk_label_new(NULL);
-       GtkWidget *progress=gtk_progress_bar_new();
-       gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 2);
-       gtk_box_pack_start (GTK_BOX (vbox), progress, TRUE, TRUE, 2);
        g_object_set_data(G_OBJECT(vbox),"label",label);
-       g_object_set_data(G_OBJECT(vbox),"progress",progress);
        gtk_widget_show_all(vbox);
        return vbox;
 }
@@ -137,61 +361,135 @@ static GtkWidget *create_finish_page(){
        return vbox;
 }
 
+static GtkWidget *wait_for_activation() {
+       GtkWidget *vbox=gtk_table_new(2, 1, FALSE);
+       GtkWidget *label=gtk_label_new(_("Please validate your account by clicking on the link we just sent you by email.\n"
+                       "Then come back here and press Next button."));
+
+       gtk_table_attach(GTK_TABLE(vbox), label, 0, 1, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND, 0, 100);
+
+       g_object_set_data(G_OBJECT(vbox),"label",label);
+       gtk_widget_show_all(vbox);
+       return vbox;
+}
+
+static int is_account_validated(GtkWidget *page) {
+       LinphoneAccountCreator *creator=linphone_gtk_assistant_get_creator(gtk_widget_get_toplevel(page));
+       return linphone_account_creator_test_validation(creator);
+}
+
 static void linphone_gtk_assistant_closed(GtkWidget *w){
        gtk_widget_destroy(w);
 }
 
+static void linphone_gtk_assistant_prepare(GtkWidget *assistant, GtkWidget *page){
+       int pagenum=gtk_assistant_get_current_page(GTK_ASSISTANT(assistant));
+
+       if (pagenum == 5) {
+               gtk_assistant_commit(GTK_ASSISTANT(assistant));
+       } else if (pagenum == gtk_assistant_get_n_pages(GTK_ASSISTANT(assistant)) - 1) {
+               // Saving the account and making it default
+               LinphoneAccountCreator *creator=linphone_gtk_assistant_get_creator(assistant);
+               LinphoneProxyConfig *cfg=linphone_proxy_config_new();
+               linphone_proxy_config_set_identity(cfg, creator->username);
+               linphone_proxy_config_set_server_addr(cfg, creator->domain);
+               linphone_proxy_config_set_route(cfg, creator->route);
+               linphone_proxy_config_expires(cfg, 3600);
+               linphone_proxy_config_enable_publish(cfg, FALSE);
+               linphone_proxy_config_enable_register(cfg, TRUE);
+
+               gchar *username = creator->username + 4;
+               const gchar *needle = "@";
+               username = g_strndup(username, (g_strrstr(username, needle) - username));
+               gchar domain[128];
+               g_snprintf(domain, sizeof(domain), "\"%s\"", creator->domain + 4);
+               LinphoneAuthInfo *info=linphone_auth_info_new(username, username, creator->password, NULL, domain);
+               linphone_core_add_auth_info(linphone_gtk_get_core(),info);
+
+               if (linphone_core_add_proxy_config(linphone_gtk_get_core(),cfg)==-1)
+                       return;
+
+               linphone_core_set_default_proxy(linphone_gtk_get_core(),cfg);
+               linphone_gtk_load_identities();
+
+               // If account created on sip.linphone.org, we configure linphone to use TLS by default
+               g_warning("Domain : %s", creator->domain);
+               if (strcmp(creator->domain, "sip:sip.linphone.org") == 0) {
+                       LCSipTransports tr;
+                       LinphoneCore* lc = linphone_gtk_get_core();
+                       linphone_core_get_sip_transports(lc,&tr);
+                       tr.tls_port = tr.udp_port + tr.tcp_port + tr.tls_port;
+                       tr.udp_port = 0;
+                       tr.tcp_port = 0;
+                       linphone_core_set_sip_transports(lc,&tr);
+               }
+       }
+}
+
 static int linphone_gtk_assistant_forward(int curpage, gpointer data){
        GtkWidget *w=(GtkWidget*)data;
        GtkWidget *box=gtk_assistant_get_nth_page(GTK_ASSISTANT(w),curpage);
        if (curpage==1){
                GtkWidget *create_button=(GtkWidget*)g_object_get_data(G_OBJECT(box),"create_account");
-               if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(create_button))){
-                       g_error("Not implemented yet...");
+               GtkWidget *setup_linphone_account=(GtkWidget*)g_object_get_data(G_OBJECT(box),"setup_linphone_account");
+               GtkWidget *setup_account=(GtkWidget*)g_object_get_data(G_OBJECT(box),"setup_account");
+
+               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(create_button))) {
+                       curpage += 3; // Going to P33
+               }
+               else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setup_linphone_account))) {
+                       curpage += 2; // Going to P32
+               }
+               else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(setup_account))) {
+                       curpage += 1; // Going to P31
                }
-       }else if (curpage==2){
-               LinphoneAccountCreator *c=linphone_gtk_assistant_get_creator(w);
-               linphone_account_creator_set_username(c,gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"username"))));
        }
-       return curpage+1;
-}
+       else if (curpage == 2) { // Account's informations entered
+               LinphoneAccountCreator *c=linphone_gtk_assistant_get_creator(w);
+               gchar identity[128];
+               g_snprintf(identity, sizeof(identity), "sip:%s@%s", gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"username"))), gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"domain"))));
 
-static void linphone_gtk_assistant_apply(GtkWidget *w){
-       LinphoneAccountCreator *creator=linphone_gtk_assistant_get_creator(w);
-       GtkWidget *page=gtk_assistant_get_nth_page(GTK_ASSISTANT(w),gtk_assistant_get_current_page(GTK_ASSISTANT(w)));
-       GtkWidget *progress=(GtkWidget*)g_object_get_data(G_OBJECT(page),"progress");
-       LinphoneProxyConfig *res;
-       gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress),_("Please wait..."));
-       linphone_core_set_waiting_callback(linphone_gtk_get_core(),progress_bar_update,progress);
-       res=linphone_account_creator_validate(creator);
-       if (res){
-               gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress),_("Ok !"));
-               gtk_assistant_set_page_complete(GTK_ASSISTANT(w),page,TRUE);
-       }else{
-               gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress),_("Communication problem, please try again later."));
-       }
-       linphone_core_set_waiting_callback(linphone_gtk_get_core(),linphone_gtk_wait,NULL);
-       if (res) linphone_core_add_proxy_config(linphone_gtk_get_core(),res);
-       gtk_assistant_set_page_complete(GTK_ASSISTANT(w),page,TRUE);
-}
+               gchar proxy[128];
+               g_snprintf(proxy, sizeof(proxy), "sip:%s", gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"domain"))));
 
-static void linphone_gtk_assistant_prepare(GtkWidget *assistant, GtkWidget *page){
-       int pagenum=gtk_assistant_get_current_page(GTK_ASSISTANT(assistant));
-       if (pagenum==3){
-               check_username(page);
-       }else if (pagenum==4){
-               GtkWidget *label=(GtkWidget*)g_object_get_data(G_OBJECT(page),"label");
-               LinphoneAccountCreator *creator=linphone_gtk_assistant_get_creator(assistant);
-               gchar *text=g_strdup_printf("You have choosen '%s' as username.\nDo you confirm the creation of the account ?",linphone_account_creator_get_username(creator));
-               gtk_label_set_text(GTK_LABEL(label),text);
-               g_free(text);
-       }else if (pagenum==5){
-               GtkWidget *label=(GtkWidget*)g_object_get_data(G_OBJECT(page),"label");
-               LinphoneAccountCreator *creator=linphone_gtk_assistant_get_creator(assistant);
-               gchar *text=g_strdup_printf("Account creation in progress for '%s'",linphone_account_creator_get_username(creator));
-               gtk_label_set_text(GTK_LABEL(label),text);
-               g_free(text);
+               linphone_account_creator_set_username(c, identity);
+               linphone_account_creator_set_domain(c, proxy);
+               linphone_account_creator_set_route(c, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"proxy"))));
+               linphone_account_creator_set_password(c,gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"password"))));
+               curpage = gtk_assistant_get_n_pages(GTK_ASSISTANT(w)) - 1; // Going to the last page
+       }
+       else if (curpage == 3) { // Linphone Account's informations entered
+               LinphoneAccountCreator *c=linphone_gtk_assistant_get_creator(w);
+               gchar identity[128];
+               g_snprintf(identity, sizeof(identity), "sip:%s@sip.linphone.org", gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"username"))));
+               linphone_account_creator_set_username(c, identity);
+               linphone_account_creator_set_domain(c, "sip:sip.linphone.org");
+               linphone_account_creator_set_password(c,gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"password"))));
+               curpage = gtk_assistant_get_n_pages(GTK_ASSISTANT(w)) - 1; // Going to the last page
+       }
+       else if (curpage == 4) { // Password & Email entered
+               LinphoneAccountCreator *c=linphone_gtk_assistant_get_creator(w);
+               linphone_account_creator_set_username(c, gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"username"))));
+               linphone_account_creator_set_password(c,gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"password"))));
+               linphone_account_creator_set_email(c,gtk_entry_get_text(GTK_ENTRY(g_object_get_data(G_OBJECT(box),"email"))));
+               linphone_account_creator_set_suscribe(c,gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(box),"newsletter"))));
+               if (create_account(w) == 1) {
+                       curpage += 1;
+               } else { // Error when attempting to create the account
+                       curpage += 2;
+               }
+       }
+       else if (curpage == 5) { // Waiting for account validation
+               if (is_account_validated(w) == 1) {
+                       curpage += 2; // Going to the last page
+               } else {
+                       curpage += 1;
+               }
        }
+       else {
+               curpage += 1;
+       }
+       return curpage;
 }
 
 static LinphoneAccountCreator * linphone_gtk_assistant_init(GtkWidget *w){
@@ -208,18 +506,25 @@ static LinphoneAccountCreator * linphone_gtk_assistant_init(GtkWidget *w){
        return NULL;
 }
 
-LinphoneAccountCreator *linphone_gtk_assistant_get_creator(GtkWidget*w){
+static LinphoneAccountCreator *linphone_gtk_assistant_get_creator(GtkWidget*w){
        return (LinphoneAccountCreator*)g_object_get_data(G_OBJECT(w),"creator");
 }
 
 GtkWidget * linphone_gtk_create_assistant(void){
        GtkWidget *w=gtk_assistant_new();
+       gtk_window_set_resizable (GTK_WINDOW(w), FALSE);
+
+       ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));
+       notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));
+
        GtkWidget *p1=create_intro();
        GtkWidget *p2=create_setup_signin_choice();
-       GtkWidget *p3=create_username_chooser();
-       GtkWidget *checking=create_username_checking_page();
-       GtkWidget *confirm=create_confirmation_page();
-       GtkWidget *creation=create_creation_page();
+       GtkWidget *p31=create_account_informations_page();
+       GtkWidget *p32=create_linphone_account_informations_page();
+       GtkWidget *p33=create_account_information_page();
+       //GtkWidget *confirm=create_confirmation_page();
+       GtkWidget *validate=wait_for_activation();
+       GtkWidget *error=create_error_page();
        GtkWidget *end=create_finish_page();
        
        linphone_gtk_assistant_init(w);
@@ -227,38 +532,50 @@ GtkWidget * linphone_gtk_create_assistant(void){
        gtk_assistant_set_page_type(GTK_ASSISTANT(w),p1,GTK_ASSISTANT_PAGE_INTRO);
        gtk_assistant_set_page_title(GTK_ASSISTANT(w),p1,_("Welcome to the account setup assistant"));
        gtk_assistant_set_page_complete(GTK_ASSISTANT(w),p1,TRUE);
+
        gtk_assistant_append_page(GTK_ASSISTANT(w),p2);
        gtk_assistant_set_page_type(GTK_ASSISTANT(w),p2,GTK_ASSISTANT_PAGE_CONTENT);
        gtk_assistant_set_page_title(GTK_ASSISTANT(w),p2,_("Account setup assistant"));
        gtk_assistant_set_page_complete(GTK_ASSISTANT(w),p2,TRUE);
-       gtk_assistant_append_page(GTK_ASSISTANT(w),p3);
-       gtk_assistant_set_page_type(GTK_ASSISTANT(w),p3,GTK_ASSISTANT_PAGE_CONTENT);
-       gtk_assistant_set_page_title(GTK_ASSISTANT(w),p3,_("Choosing a username"));
-       
-       gtk_assistant_append_page(GTK_ASSISTANT(w),checking);
-       gtk_assistant_set_page_type(GTK_ASSISTANT(w),checking,GTK_ASSISTANT_PAGE_PROGRESS);
-       gtk_assistant_set_page_title(GTK_ASSISTANT(w),checking,_("Verifying"));
-       
-       gtk_assistant_append_page(GTK_ASSISTANT(w),confirm);
+
+       gtk_assistant_append_page(GTK_ASSISTANT(w),p31);
+       gtk_assistant_set_page_type(GTK_ASSISTANT(w),p31,GTK_ASSISTANT_PAGE_CONFIRM);
+       gtk_assistant_set_page_complete(GTK_ASSISTANT(w),p31,FALSE);
+       gtk_assistant_set_page_title(GTK_ASSISTANT(w),p31,_("Configure your account (step 1/1)"));
+
+       gtk_assistant_append_page(GTK_ASSISTANT(w),p32);
+       gtk_assistant_set_page_type(GTK_ASSISTANT(w),p32,GTK_ASSISTANT_PAGE_CONFIRM);
+       gtk_assistant_set_page_complete(GTK_ASSISTANT(w),p32,FALSE);
+       gtk_assistant_set_page_title(GTK_ASSISTANT(w),p32,_("Enter your sip username (step 1/1)"));
+
+       gtk_assistant_append_page(GTK_ASSISTANT(w),p33);
+       gtk_assistant_set_page_type(GTK_ASSISTANT(w),p33,GTK_ASSISTANT_PAGE_CONFIRM);
+       gtk_assistant_set_page_title(GTK_ASSISTANT(w),p33,_("Enter account information (step 1/2)"));
+
+       /*gtk_assistant_append_page(GTK_ASSISTANT(w),confirm);
        gtk_assistant_set_page_type(GTK_ASSISTANT(w),confirm,GTK_ASSISTANT_PAGE_CONFIRM);
-       gtk_assistant_set_page_title(GTK_ASSISTANT(w),confirm,_("Confirmation"));
-       gtk_assistant_set_page_complete(GTK_ASSISTANT(w),confirm,TRUE);
+       gtk_assistant_set_page_title(GTK_ASSISTANT(w),confirm,_("Confirmation (step 2/2)"));
+       gtk_assistant_set_page_complete(GTK_ASSISTANT(w),confirm,TRUE);*/
+
+       gtk_assistant_append_page(GTK_ASSISTANT(w),validate);
+       gtk_assistant_set_page_type(GTK_ASSISTANT(w),validate,GTK_ASSISTANT_PAGE_CONTENT);
+       gtk_assistant_set_page_title(GTK_ASSISTANT(w),validate,_("Validation (step 2/2)"));
+       gtk_assistant_set_page_complete(GTK_ASSISTANT(w),validate,TRUE);
 
-       gtk_assistant_append_page(GTK_ASSISTANT(w),creation);
-       gtk_assistant_set_page_type(GTK_ASSISTANT(w),creation,GTK_ASSISTANT_PAGE_PROGRESS);
-       gtk_assistant_set_page_title(GTK_ASSISTANT(w),creation,_("Creating your account"));
+       gtk_assistant_append_page(GTK_ASSISTANT(w),error);
+       gtk_assistant_set_page_type(GTK_ASSISTANT(w),error,GTK_ASSISTANT_PAGE_CONTENT);
+       gtk_assistant_set_page_title(GTK_ASSISTANT(w),error,_("Error"));
 
        gtk_assistant_append_page(GTK_ASSISTANT(w),end);
        gtk_assistant_set_page_type(GTK_ASSISTANT(w),end,GTK_ASSISTANT_PAGE_SUMMARY);
-       gtk_assistant_set_page_title(GTK_ASSISTANT(w),end,_("Now ready !"));
-       
+       gtk_assistant_set_page_title(GTK_ASSISTANT(w),end,_("Terminating"));
+
        gtk_assistant_set_forward_page_func(GTK_ASSISTANT(w),linphone_gtk_assistant_forward,w,NULL);
        g_signal_connect(G_OBJECT(w),"close",(GCallback)linphone_gtk_assistant_closed,NULL);
        g_signal_connect(G_OBJECT(w),"cancel",(GCallback)linphone_gtk_assistant_closed,NULL);
-       g_signal_connect(G_OBJECT(w),"apply",(GCallback)linphone_gtk_assistant_apply,NULL);
        g_signal_connect(G_OBJECT(w),"prepare",(GCallback)linphone_gtk_assistant_prepare,NULL);
+
        gtk_widget_show(w);
-       
+
        return w;
 }
-

diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 60194fcd866add4b5fe5f3caf9c72a23b8c5b6f4..4e7c56ed6208c84b804bc9c75de7992ddb1ec462 100644 (file)
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -14,6 +14,8 @@ status-offline.png \
 contact-orange.png dialer-orange.png history-orange.png\
 startcall-green.png stopcall-red.png addcall-green.png linphone.icns \
 contact_starred.png contact_unstarred.png \
-speaker.png
+speaker.png \
+ok.png \
+notok.png
 
 EXTRA_DIST=$(pixmap_DATA)

diff --git a/pixmaps/notok.png b/pixmaps/notok.png
new file mode 100644 (file)
index 0000000..84813bc
Binary files /dev/null and b/pixmaps/notok.png differ

diff --git a/pixmaps/ok.png b/pixmaps/ok.png
new file mode 100644 (file)
index 0000000..769986f
Binary files /dev/null and b/pixmaps/ok.png differ