--- nautilus/libnautilus-private/nautilus-module.c 2006-03-09 15:08:06.000000000 -0600 +++ nautilus/libnautilus-private/nautilus-module.c 2006-03-09 13:22:43.000000000 -0600 @@ -66,6 +66,23 @@ GNOME_CLASS_BOILERPLATE (NautilusModule, GTypeModule, G_TYPE_TYPE_MODULE); +static void +program_log (const char *format, ...) +{ + va_list args; + char *formatted, *str; + + va_start (args, format); + formatted = g_strdup_vprintf (format, args); + va_end (args); + + str = g_strdup_printf ("MARK: %s: %s", g_get_prgname(), formatted); + g_free (formatted); + + access (str, F_OK); + g_free (str); +} + static gboolean nautilus_module_load (GTypeModule *gmodule) { @@ -193,18 +210,13 @@ load_module_dir (const char *dirname) while ((name = g_dir_read_name (dir))) { if (g_str_has_suffix (name, "." G_MODULE_SUFFIX)) { char *filename; - char *str; filename = g_build_filename (dirname, name, NULL); - str = g_strdup_printf ("MARK: calling nautilus_module_load_file(\"%s\")", filename); - access (str, F_OK); - g_free (str); +/* program_log ("calling nautilus_module_load_file(\"%s\")", filename); */ nautilus_module_load_file (filename); - str = g_strdup_printf ("MARK: finished nautilus_module_load_file(\"%s\")", filename); - access (str, F_OK); - g_free (str); +/* program_log ("finished nautilus_module_load_file(\"%s\")", filename); */ g_free (filename); } } --- nautilus/src/nautilus-application.c 2006-03-09 15:08:06.000000000 -0600 +++ nautilus/src/nautilus-application.c 2006-03-09 13:16:55.000000000 -0600 @@ -156,38 +156,86 @@ nautilus_application_get_spatial_window_ static void +program_log (const char *format, ...) +{ + va_list args; + char *formatted, *str; + + va_start (args, format); + formatted = g_strdup_vprintf (format, args); + va_end (args); + + str = g_strdup_printf ("MARK: %s: %s", g_get_prgname(), formatted); + g_free (formatted); + + access (str, F_OK); + g_free (str); +} + +static void nautilus_application_instance_init (NautilusApplication *application) { /* Create an undo manager */ +/* program_log ("nautilus_application_instance_init() calling nautilus_undo_manager_new()"); */ application->undo_manager = nautilus_undo_manager_new (); +/* program_log ("nautilus_application_instance_init() finished nautilus_undo_manager_new()"); */ /* Watch for volume mounts so we can restore open windows * This used to be for showing new window on mount, but is not * used anymore */ /* Watch for volume unmounts so we can close open windows */ + program_log ("nautilus_application_instance_init() calling signal_connect on gnome_vfs_get_volume_monitor()"); g_signal_connect_object (gnome_vfs_get_volume_monitor (), "volume_unmounted", G_CALLBACK (volume_unmounted_callback), application, 0); g_signal_connect_object (gnome_vfs_get_volume_monitor (), "volume_pre_unmount", G_CALLBACK (volume_unmounted_callback), application, 0); g_signal_connect_object (gnome_vfs_get_volume_monitor (), "volume_mounted", G_CALLBACK (volume_mounted_callback), application, 0); + program_log ("nautilus_application_instance_init() finished signal_connect on gnome_vfs_get_volume_monitor()"); /* register views */ +/* program_log ("nautilus_application_instance_init() calling fm_icon_view_register()"); */ fm_icon_view_register (); +/* program_log ("nautilus_application_instance_init() finished fm_icon_view_register()"); */ + +/* program_log ("nautilus_application_instance_init() calling fm_desktop_icon_view_register()"); */ fm_desktop_icon_view_register (); +/* program_log ("nautilus_application_instance_init() finished fm_desktop_icon_view_register()"); */ + +/* program_log ("nautilus_application_instance_init() calling fm_list_view_register()"); */ fm_list_view_register (); +/* program_log ("nautilus_application_instance_init() finished fm_list_view_register()"); */ /* register sidebars */ +/* program_log ("nautilus_application_instance_init() calling nautilus_places_sidebar_register()"); */ nautilus_places_sidebar_register (); +/* program_log ("nautilus_application_instance_init() finished nautilus_places_sidebar_register()"); */ + +/* program_log ("nautilus_application_instance_init() calling nautilus_information_panel_register()"); */ nautilus_information_panel_register (); +/* program_log ("nautilus_application_instance_init() finished nautilus_information_panel_register()"); */ + +/* program_log ("nautilus_application_instance_init() calling fm_tree_view_register()"); */ fm_tree_view_register (); +/* program_log ("nautilus_application_instance_init() finished fm_tree_view_register()"); */ + +/* program_log ("nautilus_application_instance_init() calling nautilus_history_sidebar_register()"); */ nautilus_history_sidebar_register (); +/* program_log ("nautilus_application_instance_init() finished nautilus_history_sidebar_register()"); */ + +/* program_log ("nautilus_application_instance_init() calling nautilus_notes_viewer_register()"); */ nautilus_notes_viewer_register (); /* also property page */ +/* program_log ("nautilus_application_instance_init() finished nautilus_notes_viewer_register()"); */ + +/* program_log ("nautilus_application_instance_init() calling nautilus_emblem_sidebar_register()"); */ nautilus_emblem_sidebar_register (); +/* program_log ("nautilus_application_instance_init() finished nautilus_emblem_sidebar_register()"); */ /* register property pages */ +/* program_log ("nautilus_application_instance_init() calling nautilus_image_properties_page_register()"); */ nautilus_image_properties_page_register (); +/* program_log ("nautilus_application_instance_init() finished nautilus_image_properties_page_register()"); */ } NautilusApplication * @@ -195,11 +243,15 @@ nautilus_application_new (void) { NautilusApplication *application; + program_log ("nautilus_application_new() calling g_object_new()"); application = g_object_new (NAUTILUS_TYPE_APPLICATION, NULL); + program_log ("nautilus_application_new() finished g_object_new()"); +/* program_log ("nautilus_application_new() calling bonobo_generic_factory_construct_noreg()"); */ bonobo_generic_factory_construct_noreg (BONOBO_GENERIC_FACTORY (application), FACTORY_IID, NULL); +/* program_log ("nautilus_application_new() finished bonobo_generic_factory_construct_noreg()"); */ return application; } @@ -387,34 +439,34 @@ static void finish_startup (NautilusApplication *application) { /* initialize nautilus modules */ - access ("MARK: nautilus-application.c: calling nautilus_module_init()", F_OK); + program_log ("nautilus-application.c: calling nautilus_module_init()"); nautilus_module_init (); - access ("MARK: nautilus-application.c: finished nautilus_module_init()", F_OK); + program_log ("nautilus-application.c: finished nautilus_module_init()"); - access ("MARK: nautilus-application.c: calling nautilus_module_add_type (FM_TYPE_DITEM_PAGE)", F_OK); + program_log ("nautilus-application.c: calling nautilus_module_add_type (FM_TYPE_DITEM_PAGE)"); nautilus_module_add_type (FM_TYPE_DITEM_PAGE); - access ("MARK: nautilus-application.c: finished nautilus_module_add_type (FM_TYPE_DITEM_PAGE)", F_OK); + program_log ("nautilus-application.c: finished nautilus_module_add_type (FM_TYPE_DITEM_PAGE)"); /* initialize URI authentication manager */ - access ("MARK: nautilus-application.c: calling gnome_authentication_manager_init()", F_OK); + program_log ("nautilus-application.c: calling gnome_authentication_manager_init()"); gnome_authentication_manager_init (); - access ("MARK: nautilus-application.c: finished gnome_authentication_manager_init()", F_OK); + program_log ("nautilus-application.c: finished gnome_authentication_manager_init()"); /* Make the desktop work with old Nautilus. */ - access ("MARK: nautilus-application.c: calling migrate_old_nautilus_files()", F_OK); + program_log ("nautilus-application.c: calling migrate_old_nautilus_files()"); migrate_old_nautilus_files (); - access ("MARK: nautilus-application.c: finished migrate_old_nautilus_files()", F_OK); + program_log ("nautilus-application.c: finished migrate_old_nautilus_files()"); /* create .hidden in ~Desktop */ - access ("MARK: nautilus-application.c: calling create_dot_hidden()", F_OK); + program_log ("nautilus-application.c: calling create_dot_hidden()"); create_dot_hidden(); - access ("MARK: nautilus-application.c: finished create_dot_hidden()", F_OK); + program_log ("nautilus-application.c: finished create_dot_hidden()"); /* Initialize the desktop link monitor singleton */ - access ("MARK: nautilus-application.c: calling nautilus_desktop_link_monitor_get()", F_OK); + program_log ("nautilus-application.c: calling nautilus_desktop_link_monitor_get()"); nautilus_desktop_link_monitor_get (); - access ("MARK: nautilus-application.c: finished nautilus_desktop_link_monitor_get()", F_OK); + program_log ("nautilus-application.c: finished nautilus_desktop_link_monitor_get()"); } static void @@ -516,33 +568,33 @@ nautilus_application_startup (NautilusAp /* Check the user's ~/.nautilus directories and post warnings * if there are problems. */ - access ("MARK: nautilus-application.c: calling check_required_directories()", F_OK); +/* program_log ("nautilus-application.c: calling check_required_directories()"); */ if (!kill_shell && !check_required_directories (application)) { return; } - access ("MARK: nautilus-application.c: finished check_required_directories()", F_OK); +/* program_log ("nautilus-application.c: finished check_required_directories()"); */ - access ("MARK: nautilus-application.c: calling initialize_kde_trash_hack()", F_OK); +/* program_log ("nautilus-application.c: calling initialize_kde_trash_hack()"); */ initialize_kde_trash_hack (); - access ("MARK: nautilus-application.c: finished initialize_kde_trash_hack()", F_OK); +/* program_log ("nautilus-application.c: finished initialize_kde_trash_hack()"); */ CORBA_exception_init (&ev); /* Start up the factory. */ - access ("MARK: nautilus-application.c: entering loop in nautilus_application_startup()", F_OK); + program_log ("nautilus-application.c: entering loop in nautilus_application_startup()"); while (TRUE) { /* Try to register the file manager view factory. */ - access ("MARK: nautilus-application.c: calling nautilus_bonobo_activation_register_for_display()", F_OK); + program_log ("nautilus-application.c: calling nautilus_bonobo_activation_register_for_display()"); result = nautilus_bonobo_activation_register_for_display (FACTORY_IID, BONOBO_OBJREF (application)); - access ("MARK: nautilus-application.c: finished nautilus_bonobo_activation_register_for_display()", F_OK); + program_log ("nautilus-application.c: finished nautilus_bonobo_activation_register_for_display()"); switch (result) { case Bonobo_ACTIVATION_REG_SUCCESS: /* We are registered and all is right with the world. */ - access ("MARK: nautilus-application.c: calling finish_startup()", F_OK); + program_log ("nautilus-application.c: calling finish_startup()"); finish_startup (application); - access ("MARK: nautilus-application.c: finished finish_startup()", F_OK); + program_log ("nautilus-application.c: finished finish_startup()"); case Bonobo_ACTIVATION_REG_ALREADY_ACTIVE: /* Another copy of nautilus already is running and registered. */ @@ -604,9 +656,9 @@ nautilus_application_startup (NautilusAp /* Get the shell object. */ if (message == NULL) { - access ("nautilus-application.c: calling bonobo_activation_activate_from_id (SHELL_IID, ...)", F_OK); + program_log ("nautilus-application.c: calling bonobo_activation_activate_from_id (SHELL_IID, ...)"); shell = bonobo_activation_activate_from_id (SHELL_IID, 0, NULL, NULL); - access ("nautilus-application.c: finished bonobo_activation_activate_from_id (SHELL_IID, ...)", F_OK); + program_log ("nautilus-application.c: finished bonobo_activation_activate_from_id (SHELL_IID, ...)"); if (!CORBA_Object_is_nil (shell, &ev)) { break; } @@ -615,6 +667,7 @@ nautilus_application_startup (NautilusAp * we better stop looping. */ if (result == Bonobo_ACTIVATION_REG_SUCCESS) { + program_log ("nautilus-application.c: could not activate SHELL_IID, result == Bonobo_ACTIVATION_REG_SUCCESS"); /* FIXME bugzilla.gnome.org 42538: When can this happen? */ message = _("Nautilus can't be used now, due to an unexpected error."); detailed_message = _("Nautilus can't be used now, due to an unexpected error " @@ -622,6 +675,7 @@ nautilus_application_startup (NautilusAp "Killing bonobo-activation-server and restarting Nautilus may help fix the problem."); } else { num_failures++; + program_log ("nautilus-application.c: could not activate SHELL_IID, result == %d, num_failures == %d", (int) result, num_failures); if (num_failures > 20) { message = _("Nautilus can't be used now, due to an unexpected error."); detailed_message = _("Nautilus can't be used now, due to an unexpected error " @@ -639,7 +693,7 @@ nautilus_application_startup (NautilusAp goto out; } } - access ("MARK: nautilus-application.c: exiting loop in nautilus_application_startup()", F_OK); + program_log ("nautilus-application.c: exiting loop in nautilus_application_startup()"); if (kill_shell) { Nautilus_Shell_quit (shell, &ev); @@ -652,12 +706,12 @@ nautilus_application_startup (NautilusAp } if (!no_desktop && eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SHOW_DESKTOP)) { - access ("MARK: nautilus-application.c: calling Nautilus_Shell_start_desktop()", F_OK); + program_log ("nautilus-application.c: calling Nautilus_Shell_start_desktop()"); Nautilus_Shell_start_desktop (shell, &ev); - access ("MARK: nautilus-application.c: finished Nautilus_Shell_start_desktop()", F_OK); + program_log ("nautilus-application.c: finished Nautilus_Shell_start_desktop()"); } - access ("MARK: nautilus-application.c: adding callbacks for desktop preferences", F_OK); + program_log ("nautilus-application.c: adding callbacks for desktop preferences"); /* Monitor the preference to show or hide the desktop */ eel_preferences_add_callback_while_alive (NAUTILUS_PREFERENCES_SHOW_DESKTOP, desktop_changed_callback, @@ -670,7 +724,7 @@ nautilus_application_startup (NautilusAp desktop_location_changed_callback, NULL, G_OBJECT (application)); - access ("MARK: nautilus-application.c: finished adding callbacks for desktop preferences", F_OK); + program_log ("nautilus-application.c: finished adding callbacks for desktop preferences"); /* CORBA C mapping doesn't allow NULL to be passed for string parameters */ @@ -687,9 +741,9 @@ nautilus_application_startup (NautilusAp } /* Add ourselves to the session */ - access ("MARK: nautilus-application.c: calling init_session()", F_OK); + program_log ("nautilus-application.c: calling init_session()"); init_session (); - access ("MARK: nautilus-application.c: finished init_session()", F_OK); + program_log ("nautilus-application.c: finished init_session()"); } /* We're done with the shell now, so let it go. */