X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=f17120319610c1de7b508a0391ca5158a19d4ac3;hb=605e063203f8a2a35a5c3be1e7129e80099dd68a;hp=acaa9c4f6a2510d3a57d265550fcb77b6a296d37;hpb=565736a471e9ba66cbc68ce76c90d5e0c2fa57cf;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index acaa9c4..f171203 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -22,7 +22,6 @@ GtkWidget *error_label;
 GtkWidget *vpane, *hpane;
 int        error_count;
 
-#define DIVELIST_DEFAULT_FONT "Sans 8"
 const char *divelist_font;
 
 struct units output_units;
@@ -681,9 +680,6 @@ void init_ui(int *argcp, char ***argvp)
 
 	divelist_font = subsurface_get_conf("divelist_font", PREF_STRING);
 
-	if (!divelist_font)
-		divelist_font = DIVELIST_DEFAULT_FONT;
-
 	error_info_bar = NULL;
 	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	g_set_application_name ("subsurface");
@@ -709,7 +705,8 @@ void init_ui(int *argcp, char ***argvp)
 	main_vbox = vbox;
 
 	menubar = get_menubar_menu(win);
-	gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
+
+	subsurface_ui_setup(settings, menubar, vbox);
 
 	vpane = gtk_vpaned_new();
 	gtk_box_pack_start(GTK_BOX(vbox), vpane, TRUE, TRUE, 3);