Skip to content
Snippets Groups Projects
Commit 849177d0 authored by Alexandre Bourget's avatar Alexandre Bourget
Browse files

Merge commit 'origin/master'

parents 8c924db9 5e9d7492
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,7 @@
GtkListStore * store;
GtkWidget *view;
GtkWidget * account_store;
//GtkWidget * account_store;
GtkWidget *item;
GtkWidget * toolbar;
......@@ -255,7 +255,7 @@ void row_activated(GtkTreeView *tree_view,
}
}
}
/*
void
fast_fill_account_list()
{
......@@ -272,7 +272,7 @@ fast_fill_account_list()
}
}
*/
GtkWidget *
......@@ -284,12 +284,12 @@ create_toolbar (){
toolbar = ret;
account_store = gtk_menu_new();
fast_fill_account_list();
//account_store = gtk_menu_new();
//fast_fill_account_list();
image = gtk_image_new_from_file( ICONS_DIR "/call.svg");
callButton = gtk_menu_tool_button_new (image, "Place a Call");
gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(callButton), GTK_WIDGET(account_store));
//gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(callButton), GTK_WIDGET(account_store));
g_signal_connect (G_OBJECT (callButton), "clicked",
G_CALLBACK (call_button), NULL);
gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(callButton), -1);
......
......@@ -147,7 +147,7 @@ accounts_changed_cb (DBusGProxy *proxy,
g_print ("Accounts changed\n");
sflphone_fill_account_list();
config_window_fill_account_list();
fast_fill_account_list();
//fast_fill_account_list();
}
gboolean
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment