merged defaultfile and the other outstanding fixes

[Henrik Brautaset Aronsen]

Den 18.09.12 13:25, skrev Dirk Hohndel:
> OK, these three patches have been pushed out. I also noted a possible
> crash (unrelated to your patches, but triggered when I played with them)
> that I fixed as well.

Here's a small patch that fixes the separator lines in the File menu in 
MacOSX.

Henrik
-------------- next part --------------
>From d3e00297c97491e235421880fc1bc7513c439f65 Mon Sep 17 00:00:00 2001
From: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>
Date: Tue, 18 Sep 2012 14:04:19 +0200
Subject: [PATCH] Proper placement for the file menu separator lines in MacOSX

After Lubomir's latest changes to the File menu, the separator
were a little off.

Signed-off-by: Henrik Brautaset Aronsen <subsurface at henrik.synth.no>
---
 macos.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/macos.c b/macos.c
index d762254..d0d7a74 100644
--- a/macos.c
+++ b/macos.c
@@ -123,10 +123,7 @@ void subsurface_ui_setup(GtkSettings *settings, GtkWidget *menubar,
 	gtk_widget_hide (menubar);
 	gtk_osxapplication_set_menu_bar(osx_app, GTK_MENU_SHELL(menubar));
 
-	sep = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Separator1");
-	if (sep)
-		gtk_widget_destroy(sep);
-	sep = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Separator2");
+	sep = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Separator3");
 	if (sep)
 		gtk_widget_destroy(sep);
 
-- 
1.7.11.5