[nautilus-actions/gnome-2-28] Remove New menu and Preferences cross-references

[Pierre Wieser <pwieser src gnome org>]

commit 95483044c252fed29f7ffe1f031ace2a3fbdd089
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Oct 19 05:22:03 2009 +0200

    Remove New menu and Preferences cross-references

 ChangeLog                |    8 ++++++++
 src/nact/nact-imenubar.c |    3 +--
 src/nact/nact-window.c   |    7 +++++--
 3 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 519809d..135db85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-10-19 Pierre Wieser <pwieser trychlos org>
+
+	* src/nact/nact-imenubar.c:
+	Remove New menu and Preferences cross-references.
+
+	* src/nact/nact-window.c (nact_window_signal_connect):
+	Check GObject validity.
+
 2009-10-14 Pierre Wieser <pwieser trychlos org>
 
 	* src/nact/nact-window.c (instance_dispose):
diff --git a/src/nact/nact-imenubar.c b/src/nact/nact-imenubar.c
index f841d81..0767fac 100644
--- a/src/nact/nact-imenubar.c
+++ b/src/nact/nact-imenubar.c
@@ -178,13 +178,11 @@ typedef struct {
 static const MenuActionStruct menu_actions[] = {
 		{ "FileMenu", "NewActionItem" },
 		{ "FileMenu", "NewProfileItem" },
-		{ "FileMenu", "NewMenuItem" },
 		{ "FileMenu", "SaveItem" },
 		{ "FileMenu", "QuitItem" },
 		{ "EditMenu", "DuplicateItem" },
 		{ "EditMenu", "DeleteItem" },
 		{ "EditMenu", "ReloadActionsItem" },
-		{ "EditMenu", "PreferencesItem" },
 		{ "ToolsMenu", "ImportItem" },
 		{ "ToolsMenu", "ExportItem" },
 		{ "HelpMenu", "HelpItem" },
@@ -321,6 +319,7 @@ nact_imenubar_init( NactMainWindow *window )
 		GtkAction *action = gtk_ui_manager_get_action( ui_manager, path );
 		GtkWidget *widget = gtk_ui_manager_get_widget( ui_manager, path );
 		g_object_set_data( G_OBJECT( widget ), "nact-imenubar-action", action );
+		g_debug( "path=%s, widget=%p", path, ( void * ) widget );
 		nact_window_signal_connect( NACT_WINDOW( window ), G_OBJECT( widget ), "select", G_CALLBACK( on_menu_item_selected ));
 		nact_window_signal_connect( NACT_WINDOW( window ), G_OBJECT( widget ), "deselect", G_CALLBACK( on_menu_item_deselected ));
 		g_free( path );
diff --git a/src/nact/nact-window.c b/src/nact/nact-window.c
index 6d7316d..0f6cdec 100644
--- a/src/nact/nact-window.c
+++ b/src/nact/nact-window.c
@@ -355,10 +355,13 @@ void
 nact_window_signal_connect( NactWindow *window, GObject *instance, const gchar *signal, GCallback fn )
 {
 	static const gchar *thisfn = "nact_window_signal_connect";
+	gulong handler_id;
+	NactWindowRecordedSignal *str;
 
-	gulong handler_id = g_signal_connect( instance, signal, fn, window );
+	g_return_if_fail( instance );
+	handler_id = g_signal_connect( instance, signal, fn, window );
 
-	NactWindowRecordedSignal *str = g_new0( NactWindowRecordedSignal, 1 );
+	str = g_new0( NactWindowRecordedSignal, 1 );
 	str->instance = instance;
 	str->handler_id = handler_id;
 	window->private->signals = g_slist_prepend( window->private->signals, str );