From 16af54453114bdbd54598f0149f7a45792bbff79 Mon Sep 17 00:00:00 2001
From: pierre-luc <pierre-luc.bacon@savoirfairelinux.com>
Date: Fri, 28 Aug 2009 11:49:08 -0400
Subject: [PATCH] [#2106] Fixed problem in the account assistant under gtk-ui.
Also, assistant.c was moved from src/ to config/
---
sflphone-client-gnome/src/Makefile.am | 3 +--
sflphone-client-gnome/src/config/Makefile.am | 1 +
sflphone-client-gnome/src/{ => config}/assistant.c | 10 ++++++++--
sflphone-client-gnome/src/{ => config}/assistant.h | 0
sflphone-client-gnome/src/menus.c | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
rename sflphone-client-gnome/src/{ => config}/assistant.c (98%)
rename sflphone-client-gnome/src/{ => config}/assistant.h (100%)
diff --git a/sflphone-client-gnome/src/Makefile.am b/sflphone-client-gnome/src/Makefile.am
index a63c7db317..80a6165a81 100644
--- a/sflphone-client-gnome/src/Makefile.am
+++ b/sflphone-client-gnome/src/Makefile.am
@@ -13,7 +13,6 @@ sflphone_client_gnome_SOURCES = \
main.c \
errors.c \
sflnotify.c \
- assistant.c \
mainwindow.c \
dialpad.c \
menus.c \
@@ -27,7 +26,7 @@ sflphone_client_gnome_SOURCES = \
reqaccount.c
noinst_HEADERS = actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \
- assistant.h reqaccount.h errors.h sflphone_const.h \
+ reqaccount.h errors.h sflphone_const.h \
menus.h accountlist.h sliders.h statusicon.h callable_obj.h toolbar.h
diff --git a/sflphone-client-gnome/src/config/Makefile.am b/sflphone-client-gnome/src/config/Makefile.am
index f1bc2f9d92..3a4f01d7d7 100644
--- a/sflphone-client-gnome/src/config/Makefile.am
+++ b/sflphone-client-gnome/src/config/Makefile.am
@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libconfig.la
libconfig_la_SOURCES = \
addressbook-config.c \
+ assistant.c \
preferencesdialog.c \
accountlistconfigdialog.c \
zrtpadvanceddialog.c \
diff --git a/sflphone-client-gnome/src/assistant.c b/sflphone-client-gnome/src/config/assistant.c
similarity index 98%
rename from sflphone-client-gnome/src/assistant.c
rename to sflphone-client-gnome/src/config/assistant.c
index f7c979c07c..fb7a75e6c8 100644
--- a/sflphone-client-gnome/src/assistant.c
+++ b/sflphone-client-gnome/src/config/assistant.c
@@ -197,9 +197,15 @@ 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);
+ current->properties = NULL;
+ current->properties = dbus_account_details(NULL);
+ if (current->properties == NULL) {
+ DEBUG("Failed to get default values. Creating from scratch");
+ current->properties = g_hash_table_new(NULL, g_str_equal);
+ }
+ current->accountID = "new";
- wiz->assistant = gtk_assistant_new( );
+ wiz->assistant = gtk_assistant_new();
gtk_window_set_title( GTK_WINDOW(wiz->assistant), _("SFLphone account creation wizard") );
gtk_window_set_position(GTK_WINDOW(wiz->assistant), GTK_WIN_POS_CENTER);
diff --git a/sflphone-client-gnome/src/assistant.h b/sflphone-client-gnome/src/config/assistant.h
similarity index 100%
rename from sflphone-client-gnome/src/assistant.h
rename to sflphone-client-gnome/src/config/assistant.h
diff --git a/sflphone-client-gnome/src/menus.c b/sflphone-client-gnome/src/menus.c
index 0e7931ab5e..8c19df5aa3 100644
--- a/sflphone-client-gnome/src/menus.c
+++ b/sflphone-client-gnome/src/menus.c
@@ -557,7 +557,7 @@ create_edit_menu()
gtk_widget_show (menu_items);
#endif
- menu_items = gtk_menu_item_new_with_mnemonic( _("_Accounts") );
+ menu_items = gtk_menu_item_new_with_mnemonic( _("_Manage accounts") );
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
g_signal_connect_swapped (G_OBJECT (menu_items), "activate",
G_CALLBACK (edit_accounts),
--
GitLab