[Nautilus-list] Review of patch round 3

[Darin Adler <darin eazel com>]

Patch is looking better and better to me. I found a few more problems:

================================

on 4/16/01 11:11 AM, Miguel de Icaza at miguel ximian com wrote:

> @@ -373,6 +451,7 @@
> nautilus_first_time_druid_show (application, start_desktop, urls);
> return;
> }
> +    migrate_trashcan ();
> 
> /* initialize the sound machinery */
> nautilus_sound_initialize ();

No call to migrate_old_nautilus_files! Unused function! (Have you ever
tested it?)

> @@ -885,6 +899,7 @@
> return TRUE;
> }
> 
> +#ifdef TRANSITIONAL_NAUTILUS
> /* set up the "GMC to Nautilus Transition" page */
> static void
> set_up_gmc_transition_page (NautilusDruidPageEazel *page)
> @@ -925,7 +940,7 @@
> gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox),
> transfer_gmc_icons);
> gtk_signal_connect (GTK_OBJECT (checkbox), "toggled", GTK_SIGNAL_FUNC
> (transition_value_changed), &transfer_gmc_icons);
> 
> -#if 0
> +#ifdef TRANSITIONAL_NAUTILUS
> /* This option is currently disabled, per bugzilla.eazel.com 7557 */
> 
> checkbox = gtk_check_button_new_with_label (_("Launch Nautilus when GNOME
> starts up."));
> @@ -936,7 +951,7 @@
> 
> gtk_widget_show_all (main_box);
> }
> -
> +#endif
> 
> static gboolean
> medusa_value_changed (GtkWidget *checkbox, gboolean *value)

That middle one needs to be #if 0, not #ifdef TRANSITIONAL_NAUTILUS (I think
I mentioned that last time).

> +    if (action != ACTIVATION_ACTION_DO_NOTHING &&
> +        (strcmp (gnome_vfs_mime_type_from_name_or_default (uri, ""),
> +             "application/x-gnome-app-info") == 0)) {
> +
> +        executable_path = gnome_vfs_get_local_path_from_uri (uri);
> +        if (executable_path) {
> +            entry = gnome_desktop_entry_load (executable_path);
> +
> +            if (entry) {
> +                gnome_desktop_entry_launch (entry);
> +            }
> +
> +            gnome_desktop_entry_free (entry);
> +        }
> +        
> +        g_free (executable_path);
> +        action = ACTIVATION_ACTION_DO_NOTHING;
> +    }
> +    

A couple of "if (x)" in here without != NULL.

================================

    -- Darin