Merge branch 'master' into conference

sflphone-client-gnome/src/config/accountconfigdialog.c

@@ -790,6 +790,8 @@ GtkWidget * create_advanced_tab(account_t **a)
 	gtk_entry_set_text(GTK_ENTRY(stunServerEntry), stun_server);
 	gtk_table_attach_defaults(GTK_TABLE(table), stunServerEntry, 1, 2, 8, 9);
 	 
+	use_stun_cb (GTK_WIDGET (useStunRadioButton), NULL);
+
     // This will trigger a signal, and the above two
     // widgets need to be instanciated before that.
 	g_signal_connect(useStunRadioButton, "toggled", G_CALLBACK(use_stun_cb), useStunRadioButton);		    		

sflphone-client-gnome/src/mainwindow.c

@@ -198,6 +198,7 @@ create_main_window ()
 	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
 
 	widget = create_toolbar_actions (ui_manager);
+	gtk_toolbar_set_style (GTK_TOOLBAR (widget), GTK_TOOLBAR_BOTH);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
 
 	gtk_box_pack_start (GTK_BOX (vbox), current_calls->tree, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);