From: Dirk Hohndel <dirk@hohndel.org>
Date: Sat, 18 Aug 2012 02:52:49 +0000 (-0700)
Subject: Minor Macos menu entry modification fix
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=5b56aa1435ddd20e61e5bac515c0a74eb051eca5;p=ext%2Fsubsurface.git

Minor Macos menu entry modification fix

We have removed a menu separator from the gtk gui and that was still
referenced in the Macos code. And just in case, we are now testing
for the widget for the other separator to be non-NULL before
destroying it.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---

diff --git a/macos.c b/macos.c
index 931d4fa..1b7da1e 100644
--- a/macos.c
+++ b/macos.c
@@ -98,10 +98,9 @@ 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/Separator3");
-	gtk_widget_destroy(sep);
 	sep = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Separator2");
-	gtk_widget_destroy(sep);
+	if (sep)
+		gtk_widget_destroy(sep);
 
 	menu_item = gtk_ui_manager_get_widget(ui_manager, "/MainMenu/FileMenu/Quit");
 	gtk_widget_hide (menu_item);