diff --git a/sflphone-gtk/configure.ac b/sflphone-gtk/configure.ac
index 3459abc5a2d7b55ab1324eae06b35bd758f299a6..dbd986daa348ea3198ae7b7c4a8f371852a524b4 100644
--- a/sflphone-gtk/configure.ac
+++ b/sflphone-gtk/configure.ac
@@ -28,6 +28,7 @@ PKG_CHECK_MODULES(DEPS, \
gtk+-2.0 >= 2.2 \
glib-2.0 >= 2.2 \
gtkglext-1.0 >= 1.0.0 \
+ libgnomeui-2.0 >= 2.20 \
)
diff --git a/sflphone-gtk/src/Makefile.am b/sflphone-gtk/src/Makefile.am
index 47e5621c4b7b087327f5e2e9ddd3d2a3cac5b639..838bc8de0378dbd695f180cd97edfe2747d44a21 100644
--- a/sflphone-gtk/src/Makefile.am
+++ b/sflphone-gtk/src/Makefile.am
@@ -5,6 +5,7 @@ sflphone_gtk_SOURCES = \
errors.c \
dbus.c \
sflnotify.c \
+ druid.c \
mainwindow.c \
calllist.c \
dialpad.c \
@@ -22,7 +23,7 @@ sflphone_gtk_SOURCES = \
glwidget.c \
MemManager.c
-noinst_HEADERS = actions.h dbus.h sflnotify.h mainwindow.h calllist.h dialpad.h codeclist.h\
+noinst_HEADERS = actions.h dbus.h sflnotify.h mainwindow.h calllist.h dialpad.h codeclist.h druid.h\
callmanager-glue.h errors.h sflphone_const.h configurationmanager-glue.h instance-glue.h menus.h calltab.h calltree.h configwindow.h \
accountlist.h accountwindow.h marshaller.h sliders.h statusicon.h
EXTRA_DIST = marshaller.list
diff --git a/sflphone-gtk/src/druid.c b/sflphone-gtk/src/druid.c
new file mode 100644
index 0000000000000000000000000000000000000000..872caab02e516a744b6282aeef3dbea4fe0bd705
--- /dev/null
+++ b/sflphone-gtk/src/druid.c
@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ *
+ * 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 3 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <druid.h>
+
+static struct _wizard *wiz;
+static int account_type;
+account_t* current;
+
+void
+build_account_configuration( int type )
+{
+ // table
+ wiz->table = gtk_table_new ( 8, 4 , FALSE/* homogeneous */);
+ gtk_table_set_row_spacings( GTK_TABLE(wiz->table), 10);
+ gtk_table_set_col_spacings( GTK_TABLE(wiz->table), 10);
+ if( type == _SIP )
+ gtk_box_pack_start(GTK_BOX(GNOME_DRUID_PAGE_STANDARD(wiz->sip_account)->vbox),wiz->table, TRUE, TRUE, 2);
+ else
+ gtk_box_pack_start(GTK_BOX(GNOME_DRUID_PAGE_STANDARD(wiz->iax_account)->vbox),wiz->table, TRUE, TRUE, 2);
+
+ // alias field
+ wiz->label = gtk_label_new_with_mnemonic ("_Alias");
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->label, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC (wiz->label), 0, 0.5);
+ wiz->alias = gtk_entry_new();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (wiz->label), wiz->alias);
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->alias, 2, 4, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+ // name field
+ wiz->label = gtk_label_new_with_mnemonic ("_Name");
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->label, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC (wiz->label), 0, 0.5);
+ wiz->name = gtk_entry_new();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (wiz->label), wiz->name);
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->name, 2, 4, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+ if( type == _SIP )
+ {
+ // user part field
+ wiz->label = gtk_label_new_with_mnemonic ("_Userpart");
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->label, 0, 2, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC (wiz->label), 0, 0.5);
+ wiz->userpart = gtk_entry_new();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (wiz->label), wiz->userpart);
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->userpart, 2, 4, 2, 3, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ }
+
+ // server field
+ wiz->label = gtk_label_new_with_mnemonic ("_Server");
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->label, 0, 2, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC (wiz->label), 0, 0.5);
+ wiz->server = gtk_entry_new();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (wiz->label), wiz->server);
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->server, 2, 4, 3, 4, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+ // username field
+ wiz->label = gtk_label_new_with_mnemonic ("_Username");
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->label, 0, 2, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC (wiz->label), 0, 0.5);
+ wiz->username = gtk_entry_new();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (wiz->label), wiz->username);
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->username, 2, 4, 4, 5, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+ // password field
+ wiz->label = gtk_label_new_with_mnemonic ("_Password");
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->label, 0, 2, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC (wiz->label), 0, 0.5);
+ wiz->password = gtk_entry_new();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (wiz->label), wiz->password);
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->password, 2, 4, 5, 6, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+ // mailbox field
+ wiz->label = gtk_label_new_with_mnemonic ("_Mailbox");
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->label, 0, 2, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC (wiz->label), 0, 0.5);
+ wiz->mailbox = gtk_entry_new();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (wiz->label), wiz->mailbox);
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->mailbox, 2, 4, 6, 7, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+
+}
+
+void
+update_account_parameters( int type )
+{
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_ALIAS), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->alias))));
+
+ if( type == _SIP ){
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_SIP_FULL_NAME), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->name))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_SIP_USER_PART), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->userpart))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_SIP_HOST_PART), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->server))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_SIP_PASSWORD), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->password))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_SIP_AUTH_NAME), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->username))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_SIP_STUN_ENABLED), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->enable))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_SIP_STUN_SERVER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->addr))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_MAILBOX), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->mailbox))));
+
+ }
+ else if( type == _IAX ){
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_FULL_NAME), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->name))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_USER), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->username))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_HOST), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->server))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_IAX_PASS), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->password))));
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_MAILBOX), g_strdup((gchar *)gtk_entry_get_text(GTK_ENTRY(wiz->mailbox))));
+ }
+ //dbus_add_account(current);
+}
+
+void
+build_nat_window( void )
+{
+ // table
+ wiz->table = gtk_table_new ( 2, 4 , FALSE/* homogeneous */);
+ gtk_table_set_row_spacings( GTK_TABLE(wiz->table), 10);
+ gtk_table_set_col_spacings( GTK_TABLE(wiz->table), 10);
+ gtk_box_pack_start(GTK_BOX(GNOME_DRUID_PAGE_STANDARD(wiz->nat)->vbox),wiz->table, TRUE, TRUE, 2);
+
+ // enable
+ wiz->enable = gtk_check_button_new_with_mnemonic("_Enabled");
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wiz->enable), FALSE);
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->enable, 0, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_widget_set_sensitive( GTK_WIDGET( wiz->enable ) , TRUE );
+ g_signal_connect( G_OBJECT( GTK_TOGGLE_BUTTON(wiz->enable)) , "toggled" , G_CALLBACK( enable_stun ), NULL);
+
+ // server address
+ wiz->label = gtk_label_new_with_mnemonic ("_Server address");
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->label, 0, 2, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_misc_set_alignment(GTK_MISC (wiz->label), 0, 0.5);
+ wiz->addr = gtk_entry_new();
+ gtk_label_set_mnemonic_widget (GTK_LABEL (wiz->label), wiz->addr);
+ gtk_table_attach ( GTK_TABLE( wiz->table ), wiz->addr, 2, 4, 1, 2, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
+ gtk_widget_set_sensitive( GTK_WIDGET( wiz->addr ), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wiz->enable)));
+
+}
+
+void
+build_registration_test( void )
+{
+}
+
+void
+set_account_type( GtkWidget* widget , gpointer data )
+{
+
+ if( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget )) ){
+ account_type = _SIP;
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_TYPE), g_strdup("SIP"));
+ }else{
+ account_type = _IAX ;
+ g_hash_table_replace(current->properties, g_strdup(ACCOUNT_TYPE), g_strdup("IAX"));
+ }
+}
+
+void
+enable_stun( GtkWidget* widget )
+{
+ gtk_widget_set_sensitive( GTK_WIDGET( wiz->addr ), gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)));
+}
+
+void
+goto_right_account( void )
+{
+ if( account_type == _SIP )
+ gnome_druid_set_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->sip_account));
+ else
+ gnome_druid_set_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->iax_account));
+}
+
+void
+goto_accounts_page( void )
+{
+ gnome_druid_set_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->account_type));
+}
+
+void
+goto_nat_page( void )
+{
+ update_account_parameters( _SIP );
+ gnome_druid_set_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->nat));
+}
+
+void
+goto_end_page( void )
+{
+ dbus_add_account( current );
+ gnome_druid_set_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->page_end));
+}
+
+void
+goto_sip_account_page( void )
+{
+ gnome_druid_set_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->sip_account));
+}
+
+void
+quit_wizard( void )
+{
+ return;
+}
+
+void
+build_wizard( void )
+{
+ wiz = ( struct _wizard* )g_malloc( sizeof( struct _wizard));
+ current = g_new0(account_t, 1);
+ current->properties = g_hash_table_new(NULL, g_str_equal);
+
+ wiz->logo = gdk_pixbuf_new_from_file(ICON_DIR "/sflphone.png", NULL);
+
+ wiz->druid = gnome_druid_new_with_window( "SFLphone" , NULL , TRUE , &wiz->window );
+ wiz->first_page = gnome_druid_page_edge_new( GNOME_EDGE_START );
+ gnome_druid_append_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->first_page ) );
+ gnome_druid_page_edge_set_title( GNOME_DRUID_PAGE_EDGE( wiz->first_page ), "SFLphone 0.8-5");
+ gnome_druid_page_edge_set_text( GNOME_DRUID_PAGE_EDGE( wiz->first_page ),
+ " Welcome. \n\n\n This wizard will help you configure an account.\n\n\n Answer the call ! " );
+
+ /** Page 1 */
+ wiz->account_type = gnome_druid_page_standard_new();
+ gnome_druid_page_standard_set_title( GNOME_DRUID_PAGE_STANDARD( wiz->account_type), "Select a VoIP protocol");
+ gnome_druid_page_standard_set_logo( GNOME_DRUID_PAGE_STANDARD( wiz->account_type) , wiz->logo );
+ gnome_druid_append_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->account_type ));
+ wiz->protocols = gtk_vbox_new(FALSE , 10);
+ gtk_box_pack_start(GTK_BOX(GNOME_DRUID_PAGE_STANDARD(wiz->account_type)->vbox),wiz->protocols, TRUE, TRUE, 2);
+ wiz->sip = gtk_radio_button_new_with_label(NULL,"SIP (Session Initiation Protocol)");
+ gtk_box_pack_start( GTK_BOX(wiz->protocols) , wiz->sip , TRUE, TRUE, 0);
+ wiz->iax = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(wiz->sip), "IAX2 (InterAsterix Exchange)");
+ gtk_box_pack_start( GTK_BOX(wiz->protocols) , wiz->iax , TRUE, TRUE, 0);
+ g_signal_connect(G_OBJECT( wiz->sip ) , "clicked" , G_CALLBACK( set_account_type ) , NULL);
+
+ /** Page 2 */
+ wiz->sip_account = gnome_druid_page_standard_new();
+ gnome_druid_page_standard_set_title( GNOME_DRUID_PAGE_STANDARD( wiz->sip_account), "SIP account configuration");
+ gnome_druid_page_standard_set_logo( GNOME_DRUID_PAGE_STANDARD( wiz->sip_account) , wiz->logo );
+ gnome_druid_append_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->sip_account ));
+ build_account_configuration( _SIP );
+
+ /** Page 3 */
+ wiz->iax_account = gnome_druid_page_standard_new();
+ gnome_druid_page_standard_set_title( GNOME_DRUID_PAGE_STANDARD( wiz->iax_account), "IAX2 account configuration");
+ gnome_druid_page_standard_set_logo( GNOME_DRUID_PAGE_STANDARD( wiz->iax_account) , wiz->logo );
+ gnome_druid_append_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->iax_account ));
+ build_account_configuration( _IAX );
+
+ /** Page 4 */
+ wiz->nat = gnome_druid_page_standard_new();
+ gnome_druid_page_standard_set_title( GNOME_DRUID_PAGE_STANDARD( wiz->nat), "Nat detection");
+ gnome_druid_page_standard_set_logo( GNOME_DRUID_PAGE_STANDARD( wiz->nat) , wiz->logo );
+ gnome_druid_append_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->nat ));
+ build_nat_window();
+
+ /** Page 5 */
+ wiz->page_end = gnome_druid_page_edge_new( GNOME_EDGE_FINISH );
+ gnome_druid_page_edge_set_title( GNOME_DRUID_PAGE_EDGE( wiz->page_end), "Account Registration");
+ gnome_druid_page_edge_set_logo( GNOME_DRUID_PAGE_EDGE( wiz->page_end) , wiz->logo );
+ gnome_druid_append_page( GNOME_DRUID( wiz->druid ) , GNOME_DRUID_PAGE( wiz->page_end ));
+ gnome_druid_page_edge_set_text( GNOME_DRUID_PAGE_EDGE( wiz->page_end ),
+ " Congratulations! \n\n You have been successfully registered " );
+
+ /** Events */
+ g_signal_connect( G_OBJECT( wiz->account_type ) , "next" , G_CALLBACK( goto_right_account ) , NULL );
+ g_signal_connect( G_OBJECT( wiz->iax_account ) , "back" , G_CALLBACK( goto_accounts_page ), NULL );
+ g_signal_connect( G_OBJECT( wiz->sip_account ) , "next" , G_CALLBACK( goto_nat_page ), NULL );
+ g_signal_connect( G_OBJECT( wiz->iax_account ) , "next" , G_CALLBACK( goto_end_page ), NULL );
+ g_signal_connect( G_OBJECT( wiz->nat ) , "back" , G_CALLBACK( goto_sip_account_page ), NULL );
+ g_signal_connect( G_OBJECT( wiz->page_end ) , "finish" , G_CALLBACK( quit_wizard ), NULL );
+
+
+ gtk_widget_show_all(wiz->window);
+}
+
+
diff --git a/sflphone-gtk/src/druid.h b/sflphone-gtk/src/druid.h
new file mode 100644
index 0000000000000000000000000000000000000000..d06e354ec611702fdb64231d28f916bb18af1c7e
--- /dev/null
+++ b/sflphone-gtk/src/druid.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2008 Savoir-Faire Linux inc.
+ * Author: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
+ *
+ * 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 3 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __DRUID_H
+#define __DRUID_H
+
+#include <libgnomeui/libgnomeui.h>
+#include <accountlist.h>
+#include <sflphone_const.h>
+
+#define _SIP 0
+#define _IAX 1
+
+struct _wizard
+{
+ GtkWidget *window;
+ GtkWidget *druid;
+ GdkPixbuf *logo;
+ GtkWidget *first_page;
+ /** Page 1 - Protocol selection */
+ GtkWidget *account_type;
+ GtkWidget *protocols;
+ GtkWidget *sip;
+ GtkWidget *iax;
+ /** Page 2 - SIP account creation */
+ GtkWidget *sip_account;
+ GtkWidget *table;
+ GtkWidget *label;
+ GtkWidget *alias;
+ GtkWidget *name;
+ GtkWidget *userpart;
+ GtkWidget *server;
+ GtkWidget *username;
+ GtkWidget *password;
+ GtkWidget *test;
+ GtkWidget *state;
+ GtkWidget *mailbox;
+ /** Page 3 - IAX account creation */
+ GtkWidget *iax_account;
+ /** Page 4 - Nat detection */
+ GtkWidget *nat;
+ GtkWidget *enable;
+ GtkWidget *addr;
+ /** Page 5 - Test registration */
+ GtkWidget *page_end;
+
+};
+
+/**
+ * @file druid.h
+ * @brief Implement the configuration wizard
+ */
+void set_account_type( GtkWidget* widget , gpointer data );
+void enable_stun( GtkWidget *widget );
+void goto_right_account( void );
+void goto_accounts_page( void );
+void goto_nat_page( void );
+void goto_end_page( void );
+void goto_sip_account_page( void );
+void quit_wizard( void );
+void update_account_parameters( int type );
+void build_nat_window( void );
+void build_configuration_account( int type );
+void build_wizard();
+
+
+#endif
diff --git a/sflphone-gtk/src/mainwindow.c b/sflphone-gtk/src/mainwindow.c
index 872bb5f1cb6a6e9aba7f01ed7ae730cc7271daa8..e7a9d25d771accd7bdadaead5d1269db41a42fd6 100644
--- a/sflphone-gtk/src/mainwindow.c
+++ b/sflphone-gtk/src/mainwindow.c
@@ -168,7 +168,7 @@ create_main_window ()
// Welcome screen
if (account_list_get_size() == 0)
{
- GtkWidget * dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(window),
+ /*GtkWidget * dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW(window),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_INFO,
GTK_BUTTONS_YES_NO,
@@ -181,9 +181,12 @@ create_main_window ()
if (response == GTK_RESPONSE_YES)
{
show_accounts_window();
- }
-
+ }*/
+ build_wizard();
}
+
+
+
}
GtkAccelGroup *