Skip to content
Snippets Groups Projects
Commit 16af5445 authored by pierre-luc's avatar pierre-luc
Browse files

[#2106] Fixed problem in the account assistant under gtk-ui. Also, assistant.c

was moved from src/ to config/
parent 4147fc70
Branches
Tags
No related merge requests found
...@@ -13,7 +13,6 @@ sflphone_client_gnome_SOURCES = \ ...@@ -13,7 +13,6 @@ sflphone_client_gnome_SOURCES = \
main.c \ main.c \
errors.c \ errors.c \
sflnotify.c \ sflnotify.c \
assistant.c \
mainwindow.c \ mainwindow.c \
dialpad.c \ dialpad.c \
menus.c \ menus.c \
...@@ -27,7 +26,7 @@ sflphone_client_gnome_SOURCES = \ ...@@ -27,7 +26,7 @@ sflphone_client_gnome_SOURCES = \
reqaccount.c reqaccount.c
noinst_HEADERS = actions.h sflnotify.h mainwindow.h dialpad.h codeclist.h \ 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 menus.h accountlist.h sliders.h statusicon.h callable_obj.h toolbar.h
......
...@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libconfig.la ...@@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libconfig.la
libconfig_la_SOURCES = \ libconfig_la_SOURCES = \
addressbook-config.c \ addressbook-config.c \
assistant.c \
preferencesdialog.c \ preferencesdialog.c \
accountlistconfigdialog.c \ accountlistconfigdialog.c \
zrtpadvanceddialog.c \ zrtpadvanceddialog.c \
......
...@@ -197,7 +197,13 @@ void build_wizard( void ) { ...@@ -197,7 +197,13 @@ void build_wizard( void ) {
wiz = ( struct _wizard* )g_malloc( sizeof( struct _wizard)); wiz = ( struct _wizard* )g_malloc( sizeof( struct _wizard));
current = g_new0(account_t, 1); current = g_new0(account_t, 1);
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->properties = g_hash_table_new(NULL, g_str_equal);
}
current->accountID = "new";
wiz->assistant = gtk_assistant_new(); wiz->assistant = gtk_assistant_new();
......
...@@ -557,7 +557,7 @@ create_edit_menu() ...@@ -557,7 +557,7 @@ create_edit_menu()
gtk_widget_show (menu_items); gtk_widget_show (menu_items);
#endif #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); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
g_signal_connect_swapped (G_OBJECT (menu_items), "activate", g_signal_connect_swapped (G_OBJECT (menu_items), "activate",
G_CALLBACK (edit_accounts), G_CALLBACK (edit_accounts),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment