diff --git a/sflphone-gtk/src/configwindow.c b/sflphone-gtk/src/configwindow.c
index 826410061a1de62b3d36ddb483706569e6296c09..51940dfe5a094314fb3dc619cdad9b20e9b340c6 100644
--- a/sflphone-gtk/src/configwindow.c
+++ b/sflphone-gtk/src/configwindow.c
@@ -60,6 +60,16 @@ GtkWidget *moveDownButton;
account_t *selectedAccount;
+// Account properties
+enum {
+ COLUMN_ACCOUNT_ALIAS,
+ COLUMN_ACCOUNT_TYPE,
+ COLUMN_ACCOUNT_STATUS,
+ COLUMN_ACCOUNT_ACTIVE,
+ COLUMN_ACCOUNT_DATA,
+ COLUMN_ACCOUNT_COUNT
+};
+
// Codec properties ID
enum {
COLUMN_CODEC_ACTIVE,
@@ -90,11 +100,11 @@ config_window_fill_account_list()
g_print("fill account list : %s\n" , g_hash_table_lookup(a->properties, ACCOUNT_ENABLED));
gtk_list_store_append (accountStore, &iter);
gtk_list_store_set(accountStore, &iter,
- 0, g_hash_table_lookup(a->properties, ACCOUNT_ALIAS), // Name
- 1, g_hash_table_lookup(a->properties, ACCOUNT_TYPE), // Protocol
- 2, account_state_name(a->state), // Status
- 3, (g_strcasecmp(g_hash_table_lookup(a->properties, ACCOUNT_ENABLED),"TRUE") == 0)? TRUE:FALSE, // Enable/Disable
- 4, a, // Pointer
+ COLUMN_ACCOUNT_ALIAS, g_hash_table_lookup(a->properties, ACCOUNT_ALIAS), // Name
+ COLUMN_ACCOUNT_TYPE, g_hash_table_lookup(a->properties, ACCOUNT_TYPE), // Protocol
+ COLUMN_ACCOUNT_STATUS, account_state_name(a->state), // Status
+ COLUMN_ACCOUNT_ACTIVE, (g_strcasecmp(g_hash_table_lookup(a->properties, ACCOUNT_ENABLED),"TRUE") == 0)? TRUE:FALSE, // Enable/Disable
+ COLUMN_ACCOUNT_DATA, a, // Pointer
-1);
}
}
@@ -548,7 +558,7 @@ select_account(GtkTreeSelection *selection, GtkTreeModel *model)
}
val.g_type = G_TYPE_POINTER;
- gtk_tree_model_get_value(model, &iter, 4, &val);
+ gtk_tree_model_get_value(model, &iter, COLUMN_ACCOUNT_DATA, &val);
selectedAccount = (account_t*)g_value_get_pointer(&val);
g_value_unset(&val);
@@ -644,14 +654,14 @@ enable_account(GtkCellRendererToggle *rend , gchar* path, gpointer data )
// Get pointer on object
gtk_tree_model_get(model, &iter,
- 3, &enable,
- 4, &acc,
+ COLUMN_ACCOUNT_ACTIVE, &enable,
+ COLUMN_ACCOUNT_DATA, &acc,
-1);
enable = !enable;
// Store value
gtk_list_store_set(GTK_LIST_STORE(model), &iter,
- 3, enable,
+ COLUMN_ACCOUNT_ACTIVE, enable,
-1);
gtk_tree_path_free(treePath);
@@ -751,7 +761,7 @@ bold_if_default_account(GtkTreeViewColumn *col,
gpointer data)
{
GValue val = { 0, };
- gtk_tree_model_get_value(tree_model, iter, 4, &val);
+ gtk_tree_model_get_value(tree_model, iter, COLUMN_ACCOUNT_DATA, &val);
account_t *current = (account_t*)g_value_get_pointer(&val);
g_value_unset(&val);
if(g_strcasecmp(current->accountID, account_list_get_default()) == 0)
@@ -872,7 +882,7 @@ create_accounts_tab()
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledWindow), GTK_SHADOW_IN);
gtk_box_pack_start(GTK_BOX(ret), scrolledWindow, TRUE, TRUE, 0);
- accountStore = gtk_list_store_new(5,
+ accountStore = gtk_list_store_new(COLUMN_ACCOUNT_COUNT,
G_TYPE_STRING, // Name
G_TYPE_STRING, // Protocol
G_TYPE_STRING, // Status
@@ -887,12 +897,12 @@ create_accounts_tab()
accountStore);
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(accountStore),
- 2 , GTK_SORT_ASCENDING);
+ 2 , GTK_SORT_DESCENDING);
renderer = gtk_cell_renderer_text_new();
treeViewColumn = gtk_tree_view_column_new_with_attributes ("Alias",
renderer,
- "markup", 0,
+ "markup", COLUMN_ACCOUNT_ALIAS,
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(treeView), treeViewColumn);
gtk_tree_view_column_set_cell_data_func(treeViewColumn, renderer, bold_if_default_account, NULL,NULL);
@@ -903,7 +913,7 @@ create_accounts_tab()
renderer = gtk_cell_renderer_text_new();
treeViewColumn = gtk_tree_view_column_new_with_attributes (_("Protocol"),
renderer,
- "markup", 1,
+ "markup", COLUMN_ACCOUNT_TYPE,
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(treeView), treeViewColumn);
gtk_tree_view_column_set_cell_data_func(treeViewColumn, renderer, bold_if_default_account, NULL,NULL);
@@ -911,13 +921,13 @@ create_accounts_tab()
renderer = gtk_cell_renderer_text_new();
treeViewColumn = gtk_tree_view_column_new_with_attributes (_("Status"),
renderer,
- "markup", 2,
+ "markup", COLUMN_ACCOUNT_STATUS,
NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW(treeView), treeViewColumn);
gtk_tree_view_column_set_cell_data_func(treeViewColumn, renderer, bold_if_default_account, NULL,NULL);
renderer = gtk_cell_renderer_toggle_new();
- treeViewColumn = gtk_tree_view_column_new_with_attributes("", renderer, "active", 3 , NULL);
+ treeViewColumn = gtk_tree_view_column_new_with_attributes("", renderer, "active", COLUMN_ACCOUNT_ACTIVE , NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(treeView), treeViewColumn);
g_signal_connect( G_OBJECT(renderer) , "toggled" , G_CALLBACK(enable_account), (gpointer)treeView );
diff --git a/sflphone-gtk/src/menus.c b/sflphone-gtk/src/menus.c
index fa3a2e3c56d603799739d2d98be4f7299bbbf125..9a352ea0948474d71f5ec8fc330a7539dcb21843 100644
--- a/sflphone-gtk/src/menus.c
+++ b/sflphone-gtk/src/menus.c
@@ -672,6 +672,7 @@ show_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
menu_items = gtk_check_menu_item_new_with_mnemonic(alias);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
g_object_set_data( G_OBJECT( menu_items ) , "account" , acc );
+ g_free( alias );
if( account_list_get_current() == NULL ){
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_items),
(g_strcasecmp( acc->accountID , account_list_get_default()) == 0)? TRUE : FALSE);
@@ -686,7 +687,6 @@ show_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
gtk_widget_show (menu_items);
}
}
- g_free( alias );
}
if (event)
diff --git a/src/managerimpl.cpp b/src/managerimpl.cpp
index a37f0d610b360a6166be5884c9b1ae5e35d029e2..32a3f3dd9fbe1bd74a36b72161421c06f63d10f4 100644
--- a/src/managerimpl.cpp
+++ b/src/managerimpl.cpp
@@ -2136,7 +2136,6 @@ ManagerImpl::addAccount(const std::map< ::DBus::String, ::DBus::String >& detail
saveConfig();
- _debug("ADD ACCOUNT\n");
if (_dbus) _dbus->getConfigurationManager()->accountsChanged();
}