removed unneeded includes

2004-11-19  Alexander Larsson  <alexl@redhat.com>

	* libnautilus-private/nautilus-mime-actions.c:
	removed unneeded includes

	* src/nautilus-application.c:
	* src/nautilus-desktop-window.c:
	Removed app_id property on NautilusWindow

	* src/nautilus-main.c: (main):
	Remove old code

	* src/nautilus-navigation-window.c:
	* src/nautilus-sidebar-title.c:
	* src/nautilus-window-menus.c:
	* src/file-manager/fm-ditem-page.c:
	Remove bonobo comments

	* src/nautilus-window.c:
	Remove app_id property
	fix last bonobo details

	* src/file-manager/fm-actions.h:
	* src/file-manager/fm-directory-view.c:
	* src/file-manager/nautilus-directory-view-ui.xml:
	remove edit launcher action

13 files changed, 32 insertions, 104 deletions

diff --git a/ChangeLog b/ChangeLog
index 2720afca5..fea93094b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,32 @@
 2004-11-19  Alexander Larsson  <alexl@redhat.com>
 
+	* libnautilus-private/nautilus-mime-actions.c:
+	removed unneeded includes
+	
+	* src/nautilus-application.c:
+	* src/nautilus-desktop-window.c:
+	Removed app_id property on NautilusWindow
+	
+	* src/nautilus-main.c: (main):
+	Remove old code
+	
+	* src/nautilus-navigation-window.c:
+	* src/nautilus-sidebar-title.c:
+	* src/nautilus-window-menus.c:
+	* src/file-manager/fm-ditem-page.c:
+	Remove bonobo comments
+	
+	* src/nautilus-window.c:
+	Remove app_id property
+	fix last bonobo details
+	
+	* src/file-manager/fm-actions.h:
+	* src/file-manager/fm-directory-view.c:
+	* src/file-manager/nautilus-directory-view-ui.xml:
+	remove edit launcher action
+
+2004-11-19  Alexander Larsson  <alexl@redhat.com>
+
 	* configure.in:
 	Require new eel
 	
diff --git a/libnautilus-private/nautilus-mime-actions.c b/libnautilus-private/nautilus-mime-actions.c
index 830301535..dad4a4e18 100644
--- a/libnautilus-private/nautilus-mime-actions.c
+++ b/libnautilus-private/nautilus-mime-actions.c
@@ -28,7 +28,6 @@
 #include "nautilus-file-attributes.h"
 #include "nautilus-file.h"
 #include "nautilus-metadata.h"
-#include <bonobo-activation/bonobo-activation-activate.h>
 #include <eel/eel-glib-extensions.h>
 #include <eel/eel-string.h>
 #include <libgnomevfs/gnome-vfs-application-registry.h>
diff --git a/src/file-manager/fm-actions.h b/src/file-manager/fm-actions.h
index 1421669d0..74fc42449 100644
--- a/src/file-manager/fm-actions.h
+++ b/src/file-manager/fm-actions.h
@@ -39,7 +39,6 @@
 #define FM_ACTION_PASTE "Paste"
 #define FM_ACTION_PASTE_FILES_INTO "Paste Files Into"
 #define FM_ACTION_NEW_LAUNCHER "New Launcher"
-#define FM_ACTION_EDIT_LAUNCHER "Edit Launcher"
 #define FM_ACTION_RENAME "Rename"
 #define FM_ACTION_DUPLICATE "Duplicate"
 #define FM_ACTION_CREATE_LINK "Create Link"
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 7aaf3dc1b..0d1f2d9f2 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -760,43 +760,6 @@ action_other_application_callback (GtkAction *action,
 }
 
 static void
-edit_launcher (FMDirectoryView *view,
-	       NautilusFile    *file)
-{
-	char *uri;
-
-	uri = nautilus_file_get_uri (file);
-
-	nautilus_launch_application_from_command (gtk_widget_get_screen (GTK_WIDGET (view)),
-						  "gnome-desktop-item-edit", 
-						  "gnome-desktop-item-edit",
-						  uri, 
-						  FALSE);
-	g_free (uri);
-}
-
-  /* BONOBOTODO: do we use this anymore? */
-static void
-action_edit_launcher_callback (GtkAction *action,
-			       gpointer callback_data)
-{
-	GList *selection;
-	FMDirectoryView *view;
-
-	g_assert (FM_IS_DIRECTORY_VIEW (callback_data));
-
-	view = FM_DIRECTORY_VIEW (callback_data);
-
-       	selection = fm_directory_view_get_selection (view);
-
-	if (selection_contains_one_item_in_menu_callback (view, selection)) {
-		edit_launcher (view, NAUTILUS_FILE (selection->data));
-	}
-
-	nautilus_file_list_free (selection);
-}
-
-static void
 trash_or_delete_selected_files (FMDirectoryView *view)
 {
         GList *selection;
@@ -2019,7 +1982,6 @@ done_loading (FMDirectoryView *view)
 
 	/* This can be called during destruction, in which case there
 	 * is no NautilusWindowInfo any more.
-	 * BONOBOTODO: is this comment true now?
 	 */
 	if (view->details->window != NULL) {
 		nautilus_window_info_report_load_complete (view->details->window, NAUTILUS_VIEW (view));
@@ -5096,7 +5058,6 @@ create_popup_menu (FMDirectoryView *view, const char *popup_path)
 			     gtk_widget_get_screen (GTK_WIDGET (view)));
 	gtk_widget_show (GTK_WIDGET (menu));
 
-	/* BONOBOTODO: This is likely still needed, but perhaps not? */
 	g_signal_connect_object (menu, "hide",
 				 G_CALLBACK (popup_menu_hidden), G_OBJECT (view), G_CONNECT_SWAPPED);
 	
@@ -5762,10 +5723,6 @@ static GtkActionEntry directory_view_entries[] = {
     N_("Open with Other _Application..."), NULL,                /* label, accelerator */
     N_("Choose another application with which to open the selected item"),                   /* tooltip */ 
     G_CALLBACK (action_other_application_callback) },
-  { "Edit Launcher", NULL,                  /* name, stock id */
-    N_("Edit Launcher"), NULL,                /* label, accelerator */
-    N_("Edit the launcher information"),                   /* tooltip */ 
-    G_CALLBACK (action_edit_launcher_callback) },
   { "Open Scripts Folder", NULL,                  /* name, stock id */
     N_("_Open Scripts Folder"), NULL,                /* label, accelerator */
     N_("Show the folder containing the scripts that appear in this menu"),                   /* tooltip */ 
@@ -6348,11 +6305,6 @@ real_update_menus (FMDirectoryView *view)
 	gtk_action_set_visible (action, vfolder_directory);
 	gtk_action_set_sensitive (action, can_create_files);
 
-	action = gtk_action_group_get_action (view->details->dir_action_group,
-					      FM_ACTION_EDIT_LAUNCHER);
-	gtk_action_set_visible (action, vfolder_directory);
-	gtk_action_set_sensitive (action, selection_count == 1);
-
 	real_update_menus_volumes (view, selection, selection_count);
 
 	nautilus_file_list_free (selection);
@@ -7766,7 +7718,6 @@ fm_directory_view_set_property (GObject         *object,
   switch (prop_id)  {
   case PROP_WINDOW:
 	  g_assert (directory_view->details->window == NULL);
-	  /* BONOBOTODO: does this ref? check out lifecycle here */
 	  fm_directory_view_set_parent_window (directory_view, NAUTILUS_WINDOW_INFO (g_value_get_object (value)));
 		  
       break;
diff --git a/src/file-manager/fm-ditem-page.c b/src/file-manager/fm-ditem-page.c
index b339b619b..dcc3aa298 100644
--- a/src/file-manager/fm-ditem-page.c
+++ b/src/file-manager/fm-ditem-page.c
@@ -21,9 +21,6 @@
  *
  */
 
-/* This object exports the bonobo context menus and property pages
- * using the new extension interface. */ 
-
 #include <config.h>
 #include "fm-ditem-page.h"
 
diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml
index d8692004f..83b9aee2c 100644
--- a/src/file-manager/nautilus-directory-view-ui.xml
+++ b/src/file-manager/nautilus-directory-view-ui.xml
@@ -27,8 +27,6 @@
 			<placeholder name="OtherApplicationPlaceholder">
 				<menuitem name="OtherApplication" action="OtherApplication2"/>
 			</placeholder>
-			<menuitem name="Edit Launcher"
-				  action="Edit Launcher"/>
 			<menu action="Scripts">
 				 <placeholder name="Scripts Placeholder"/>
 				 <separator name="After Scripts"/>
@@ -114,7 +112,6 @@
 		<placeholder name="OtherApplicationPlaceholder">
 		        <menuitem name="OtherApplication2" action="OtherApplication2"/>
 		</placeholder>
-		<menuitem name="Edit Launcher" action="Edit Launcher"/>
 		<menu action="Scripts">
 			 <placeholder name="Scripts Placeholder"/>
 			 <separator name="After Scripts"/>
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index f4579a46b..5358b7422 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -934,7 +934,6 @@ create_window (NautilusApplication *application,
 	
 	window = NAUTILUS_WINDOW (gtk_widget_new (window_type,
 						  "app", application,
-						  "app_id", "nautilus",
 						  "screen", screen,
 						  NULL));
 	/* Must be called after construction finished */
diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c
index 6c1264c57..e340b15f0 100644
--- a/src/nautilus-desktop-window.c
+++ b/src/nautilus-desktop-window.c
@@ -108,7 +108,6 @@ nautilus_desktop_window_new (NautilusApplication *application,
 	window = NAUTILUS_DESKTOP_WINDOW
 		(gtk_widget_new (nautilus_desktop_window_get_type(),
 				 "app", application,
-				 "app_id", "nautilus",
 				 "width_request", width_request,
 				 "height_request", height_request,
 				 "screen", screen,
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index 0545a46e1..63040110d 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -282,10 +282,6 @@ main (int argc, char *argv[])
 	/* Initialize the services that we use. */
 	LIBXML_TEST_VERSION
 
-	if (g_getenv ("NAUTILUS_ENABLE_TEST_COMPONENTS") != NULL) {
-		bonobo_activation_set_test_components_enabled (TRUE);
-	}
-
 	/* Initialize preferences. This is needed so that proper 
 	 * defaults are available before any preference peeking 
 	 * happens.
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index 8e5086469..96a931ce2 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -610,7 +610,6 @@ create_view_as_menu_item (NautilusWindow *window,
 
 	info = nautilus_view_factory_lookup (identifier);
 
-	/* BONOBOTODO: nicer way for the labels */
 	menu_label = g_strdup_printf (_("View as %s"), _(info->label));
 	menu_item = gtk_menu_item_new_with_mnemonic (menu_label);
 	g_free (menu_label);
@@ -641,9 +640,6 @@ load_view_as_menu (NautilusWindow *window)
         for (node = window->details->short_list_viewers, index = 0; 
              node != NULL; 
              node = node->next, ++index) {
-        	/* Menu item in option menu. This doesn't use Bonobo, for various
-        	 * historical and technical reasons.
-        	 */
                 menu_item = create_view_as_menu_item (window, node->data, index);
                 gtk_menu_shell_append (GTK_MENU_SHELL (new_menu), menu_item);
 
diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c
index 9d13134e3..90ce30825 100644
--- a/src/nautilus-sidebar-title.c
+++ b/src/nautilus-sidebar-title.c
@@ -311,11 +311,12 @@ nautilus_sidebar_title_theme_changed (gpointer user_data)
 	}
 }
 
-/* get a property from the current content view's property bag if we can */
 static char*
 get_property_from_component (NautilusSidebarTitle *sidebar_title, const char *property)
 {
-	/* BONOBOTODO: way to get icon and summary_text from main view */
+	/* There used to be a way to get icon and summary_text from main view,
+	 *  but its not used right now, so this sas stubbed out for now
+	 */
 	return NULL;
 }
 
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 79dcacf34..cc4edf5be 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -154,7 +154,7 @@ nautilus_menus_append_bookmark_to_menu (NautilusWindow *window,
 
 	bookmark_holder = bookmark_holder_new (bookmark, window, refresh_callback, failed_callback);
 
-	/* We double the underscores here to escape them so Bonobo will know they are
+	/* We double the underscores here to escape them so gtk+ will know they are
 	 * not keyboard accelerator character prefixes. If we ever find we need to
 	 * escape more than just the underscores, we'll add a menu helper function
 	 * instead of a string utility. (Like maybe escaping control characters.)
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index c3e2e09a4..96cc59b74 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -98,7 +98,6 @@
 
 enum {
 	ARG_0,
-	ARG_APP_ID,
 	ARG_APP
 };
 
@@ -215,12 +214,6 @@ nautilus_window_init (NautilusWindow *window)
 	nautilus_main_event_loop_register (GTK_OBJECT (window));
 
 	nautilus_window_allow_stop (window, FALSE);
-
-#ifdef BONOBO_DONE
-	/* BONOBOTODO: this crashes, because ->application is not set in initializer */
-	/* Set up undo manager */
-	nautilus_undo_manager_attach (window->application->undo_manager, G_OBJECT (window));
-#endif
 }
 
 /* Unconditionally synchronize the GtkUIManager of WINDOW. */
@@ -488,6 +481,7 @@ void
 nautilus_window_constructed (NautilusWindow *window)
 {
 	nautilus_window_set_initial_window_geometry (window);
+	nautilus_undo_manager_attach (window->application->undo_manager, G_OBJECT (window));
 }
 
 static void
@@ -501,12 +495,6 @@ nautilus_window_set_property (GObject *object,
 	window = NAUTILUS_WINDOW (object);
 	
 	switch (arg_id) {
-	case ARG_APP_ID:
-		if (g_value_get_string (value) == NULL) {
-			return;
-		}
-		/* BONOBOTODO: WTF? */
-		break;
 	case ARG_APP:
 		window->application = NAUTILUS_APPLICATION (g_value_get_object (value));
 		break;
@@ -520,11 +508,6 @@ nautilus_window_get_property (GObject *object,
 			      GParamSpec *pspec)
 {
 	switch (arg_id) {
-	case ARG_APP_ID:
-		/* BONOBOTODO: WTF? */
-		g_value_set_static_string (value,
-					   "none");
-		break;
 	case ARG_APP:
 		g_value_set_object (value, NAUTILUS_WINDOW (object)->application);
 		break;
@@ -693,9 +676,7 @@ add_view_as_menu_item (NautilusWindow *window,
 
 	info = nautilus_view_factory_lookup (identifier);
 
-	/* BONOBOTODO: nicer way for labels */
 	label = g_strdup_printf (_("View as %s"), _(info->label_with_mnemonic));
-	/* BONOBOTODO: nicer way for labels */
 	tip = g_strdup_printf (_("Display this location with \"%s\""),
 			       _(info->label));
 	
@@ -1152,13 +1133,6 @@ real_set_content_view_widget (NautilusWindow *window,
 	if (new_view != NULL) {
 		widget = nautilus_view_get_widget (new_view);
 		gtk_widget_show (widget);
-
-		/* When creating the desktop window the UI needs to
-		 * be in sync. Otherwise I get failed assertions in
-		 * bonobo while trying to reference something called
-		 * `/commands/Unmount Volume Conditional'
-		 */
-		nautilus_window_ui_update (window);
 	}
 
 	window->content_view = new_view;
@@ -1485,13 +1459,6 @@ nautilus_window_class_init (NautilusWindowClass *class)
 	class->load_view_as_menu = real_load_view_as_menu;
 
 	g_object_class_install_property (G_OBJECT_CLASS (class),
-					 ARG_APP_ID,
-					 g_param_spec_string ("app_id",
-							      _("Application ID"),
-							      _("The application ID of the window."),
-							      NULL,
-							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-	g_object_class_install_property (G_OBJECT_CLASS (class),
 					 ARG_APP,
 					 g_param_spec_object ("app",
 							      _("Application"),