diff options
author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-12-31 17:41:30 +0100 |
---|---|---|
committer | Cosimo Cecchi <cosimoc@gnome.org> | 2011-01-11 11:43:55 +0100 |
commit | e4975471d233f1217bca48fae17519a285336645 (patch) | |
tree | 76e413eb80519f63351eb53d51e8084f83396ab6 | |
parent | d0985e6d5ed7f6732bb4ee4b836192852adface2 (diff) | |
download | nautilus-e4975471d233f1217bca48fae17519a285336645.tar.gz |
view: remove commented out "Format..." action code
-rw-r--r-- | src/file-manager/fm-actions.h | 3 | ||||
-rw-r--r-- | src/file-manager/nautilus-directory-view-ui.xml | 4 | ||||
-rw-r--r-- | src/nautilus-view.c | 121 |
3 files changed, 3 insertions, 125 deletions
diff --git a/src/file-manager/fm-actions.h b/src/file-manager/fm-actions.h index bbfe37e50..4c16a8b4e 100644 --- a/src/file-manager/fm-actions.h +++ b/src/file-manager/fm-actions.h @@ -74,21 +74,18 @@ #define FM_ACTION_MOUNT_VOLUME "Mount Volume" #define FM_ACTION_UNMOUNT_VOLUME "Unmount Volume" #define FM_ACTION_EJECT_VOLUME "Eject Volume" -#define FM_ACTION_FORMAT_VOLUME "Format Volume" #define FM_ACTION_START_VOLUME "Start Volume" #define FM_ACTION_STOP_VOLUME "Stop Volume" #define FM_ACTION_POLL "Poll" #define FM_ACTION_SELF_MOUNT_VOLUME "Self Mount Volume" #define FM_ACTION_SELF_UNMOUNT_VOLUME "Self Unmount Volume" #define FM_ACTION_SELF_EJECT_VOLUME "Self Eject Volume" -#define FM_ACTION_SELF_FORMAT_VOLUME "Self Format Volume" #define FM_ACTION_SELF_START_VOLUME "Self Start Volume" #define FM_ACTION_SELF_STOP_VOLUME "Self Stop Volume" #define FM_ACTION_SELF_POLL "Self Poll" #define FM_ACTION_LOCATION_MOUNT_VOLUME "Location Mount Volume" #define FM_ACTION_LOCATION_UNMOUNT_VOLUME "Location Unmount Volume" #define FM_ACTION_LOCATION_EJECT_VOLUME "Location Eject Volume" -#define FM_ACTION_LOCATION_FORMAT_VOLUME "Location Format Volume" #define FM_ACTION_LOCATION_START_VOLUME "Location Start Volume" #define FM_ACTION_LOCATION_STOP_VOLUME "Location Stop Volume" #define FM_ACTION_LOCATION_POLL "Location Poll" diff --git a/src/file-manager/nautilus-directory-view-ui.xml b/src/file-manager/nautilus-directory-view-ui.xml index 5e7af674c..e45ef608b 100644 --- a/src/file-manager/nautilus-directory-view-ui.xml +++ b/src/file-manager/nautilus-directory-view-ui.xml @@ -39,7 +39,6 @@ <menuitem name="Self Mount Volume" action="Self Mount Volume"/> <menuitem name="Self Unmount Volume" action="Self Unmount Volume"/> <menuitem name="Self Eject Volume" action="Self Eject Volume"/> - <menuitem name="Self Format Volume" action="Self Format Volume"/> <menuitem name="Self Start Volume" action="Self Start Volume"/> <menuitem name="Self Stop Volume" action="Self Stop Volume"/> <menuitem name="Self Poll" action="Self Poll"/> @@ -122,7 +121,6 @@ <menuitem name="Self Mount Volume" action="Self Mount Volume"/> <menuitem name="Self Unmount Volume" action="Self Unmount Volume"/> <menuitem name="Self Eject Volume" action="Self Eject Volume"/> - <menuitem name="Self Format Volume" action="Self Format Volume"/> <menuitem name="Self Start Volume" action="Self Start Volume"/> <menuitem name="Self Stop Volume" action="Self Stop Volume"/> <menuitem name="Self Poll" action="Self Poll"/> @@ -190,7 +188,6 @@ <menuitem name="Mount Volume" action="Mount Volume"/> <menuitem name="Unmount Volume" action="Unmount Volume"/> <menuitem name="Eject Volume" action="Eject Volume"/> - <menuitem name="Format Volume" action="Format Volume"/> <menuitem name="Start Volume" action="Start Volume"/> <menuitem name="Stop Volume" action="Stop Volume"/> <menuitem name="Poll" action="Poll"/> @@ -221,7 +218,6 @@ <menuitem name="Location Mount Volume" action="Location Mount Volume"/> <menuitem name="Location Unmount Volume" action="Location Unmount Volume"/> <menuitem name="Location Eject Volume" action="Location Eject Volume"/> - <menuitem name="Location Format Volume" action="Location Format Volume"/> <menuitem name="Location Start Volume" action="Location Start Volume"/> <menuitem name="Location Stop Volume" action="Location Stop Volume"/> <menuitem name="Location Poll" action="Location Poll"/> diff --git a/src/nautilus-view.c b/src/nautilus-view.c index 4fdd44408..593d4d1d2 100644 --- a/src/nautilus-view.c +++ b/src/nautilus-view.c @@ -6313,29 +6313,6 @@ action_unmount_volume_callback (GtkAction *action, nautilus_file_list_free (selection); } -static void -action_format_volume_callback (GtkAction *action, - gpointer data) -{ -#ifdef TODO_GIO - NautilusFile *file; - GList *selection, *l; - FMDirectoryView *view; - - view = FM_DIRECTORY_VIEW (data); - - selection = nautilus_view_get_selection (view); - for (l = selection; l != NULL; l = l->next) { - file = NAUTILUS_FILE (l->data); - - if (something) { - g_spawn_command_line_async ("gfloppy", NULL); - } - } - nautilus_file_list_free (selection); -#endif -} - static void action_eject_volume_callback (GtkAction *action, gpointer data) @@ -6512,27 +6489,6 @@ action_self_eject_volume_callback (GtkAction *action, g_object_unref (mount_op); } -static void -action_self_format_volume_callback (GtkAction *action, - gpointer data) -{ - NautilusFile *file; - FMDirectoryView *view; - - view = FM_DIRECTORY_VIEW (data); - - file = fm_directory_view_get_directory_as_file (view); - if (file == NULL) { - return; - } - -#ifdef TODO_GIO - if (something) { - g_spawn_command_line_async ("gfloppy", NULL); - } -#endif -} - static void action_self_start_volume_callback (GtkAction *action, gpointer data) @@ -6656,27 +6612,6 @@ action_location_eject_volume_callback (GtkAction *action, g_object_unref (mount_op); } -static void -action_location_format_volume_callback (GtkAction *action, - gpointer data) -{ - NautilusFile *file; - FMDirectoryView *view; - - view = FM_DIRECTORY_VIEW (data); - - file = view->details->location_popup_directory_as_file; - if (file == NULL) { - return; - } - -#ifdef TODO_GIO - if (something) { - g_spawn_command_line_async ("gfloppy", NULL); - } -#endif -} - static void action_location_start_volume_callback (GtkAction *action, gpointer data) @@ -7216,10 +7151,6 @@ static const GtkActionEntry directory_view_entries[] = { /* label, accelerator */ N_("_Eject"), NULL, /* tooltip */ N_("Eject the selected volume"), G_CALLBACK (action_eject_volume_callback) }, - /* name, stock id */ { "Format Volume", NULL, - /* label, accelerator */ N_("_Format"), NULL, - /* tooltip */ N_("Format the selected volume"), - G_CALLBACK (action_format_volume_callback) }, /* name, stock id */ { "Start Volume", NULL, /* label, accelerator */ N_("_Start"), NULL, /* tooltip */ N_("Start the selected volume"), @@ -7244,10 +7175,6 @@ static const GtkActionEntry directory_view_entries[] = { /* label, accelerator */ N_("_Eject"), NULL, /* tooltip */ N_("Eject the volume associated with the open folder"), G_CALLBACK (action_self_eject_volume_callback) }, - /* name, stock id */ { "Self Format Volume", NULL, - /* label, accelerator */ N_("_Format"), NULL, - /* tooltip */ N_("Format the volume associated with the open folder"), - G_CALLBACK (action_self_format_volume_callback) }, /* name, stock id */ { "Self Start Volume", NULL, /* label, accelerator */ N_("_Start"), NULL, /* tooltip */ N_("Start the volume associated with the open folder"), @@ -7325,10 +7252,6 @@ static const GtkActionEntry directory_view_entries[] = { /* label, accelerator */ N_("_Eject"), NULL, /* tooltip */ N_("Eject the volume associated with this folder"), G_CALLBACK (action_location_eject_volume_callback) }, - /* name, stock id */ { "Location Format Volume", NULL, - /* label, accelerator */ N_("_Format"), NULL, - /* tooltip */ N_("Format the volume associated with this folder"), - G_CALLBACK (action_location_format_volume_callback) }, /* name, stock id */ { "Location Start Volume", NULL, /* label, accelerator */ N_("_Start"), NULL, /* tooltip */ N_("Start the volume associated with this folder"), @@ -7644,7 +7567,6 @@ file_should_show_foreach (NautilusFile *file, gboolean *show_unmount, gboolean *show_eject, gboolean *show_connect, - gboolean *show_format, gboolean *show_start, gboolean *show_stop, gboolean *show_poll, @@ -7656,7 +7578,6 @@ file_should_show_foreach (NautilusFile *file, *show_unmount = FALSE; *show_eject = FALSE; *show_connect = FALSE; - *show_format = FALSE; *show_start = FALSE; *show_stop = FALSE; *show_poll = FALSE; @@ -7667,13 +7588,6 @@ file_should_show_foreach (NautilusFile *file, if (nautilus_file_can_mount (file)) { *show_mount = TRUE; - -#ifdef TODO_GIO - if (something && - g_find_program_in_path ("gfloppy")) { - *show_format = TRUE; - } -#endif } if (nautilus_file_can_start (file) || nautilus_file_can_start_degraded (file)) { @@ -7715,7 +7629,6 @@ file_should_show_self (NautilusFile *file, gboolean *show_mount, gboolean *show_unmount, gboolean *show_eject, - gboolean *show_format, gboolean *show_start, gboolean *show_stop, gboolean *show_poll, @@ -7724,7 +7637,6 @@ file_should_show_self (NautilusFile *file, *show_mount = FALSE; *show_unmount = FALSE; *show_eject = FALSE; - *show_format = FALSE; *show_start = FALSE; *show_stop = FALSE; *show_poll = FALSE; @@ -7741,12 +7653,6 @@ file_should_show_self (NautilusFile *file, *show_mount = TRUE; } -#ifdef TODO_GIO - if (something && g_find_program_in_path ("gfloppy")) { - *show_format = TRUE; - } -#endif - if (nautilus_file_can_start (file) || nautilus_file_can_start_degraded (file)) { *show_start = TRUE; } @@ -7915,7 +7821,6 @@ real_update_menus_volumes (FMDirectoryView *view, gboolean show_unmount; gboolean show_eject; gboolean show_connect; - gboolean show_format; gboolean show_start; gboolean show_stop; gboolean show_poll; @@ -7923,7 +7828,6 @@ real_update_menus_volumes (FMDirectoryView *view, gboolean show_self_mount; gboolean show_self_unmount; gboolean show_self_eject; - gboolean show_self_format; gboolean show_self_start; gboolean show_self_stop; gboolean show_self_poll; @@ -7934,7 +7838,6 @@ real_update_menus_volumes (FMDirectoryView *view, show_unmount = (selection != NULL); show_eject = (selection != NULL); show_connect = (selection != NULL && selection_count == 1); - show_format = (selection != NULL && selection_count == 1); show_start = (selection != NULL && selection_count == 1); show_stop = (selection != NULL && selection_count == 1); show_poll = (selection != NULL && selection_count == 1); @@ -7943,14 +7846,13 @@ real_update_menus_volumes (FMDirectoryView *view, for (l = selection; l != NULL && (show_mount || show_unmount || show_eject || show_connect - || show_format || show_start - || show_stop || show_poll); + || show_start || show_stop + || show_poll); l = l->next) { gboolean show_mount_one; gboolean show_unmount_one; gboolean show_eject_one; gboolean show_connect_one; - gboolean show_format_one; gboolean show_start_one; gboolean show_stop_one; gboolean show_poll_one; @@ -7961,7 +7863,6 @@ real_update_menus_volumes (FMDirectoryView *view, &show_unmount_one, &show_eject_one, &show_connect_one, - &show_format_one, &show_start_one, &show_stop_one, &show_poll_one, @@ -7971,7 +7872,6 @@ real_update_menus_volumes (FMDirectoryView *view, show_unmount &= show_unmount_one; show_eject &= show_eject_one; show_connect &= show_connect_one; - show_format &= show_format_one; show_start &= show_start_one; show_stop &= show_stop_one; show_poll &= show_poll_one; @@ -7994,10 +7894,6 @@ real_update_menus_volumes (FMDirectoryView *view, gtk_action_set_visible (action, show_eject); action = gtk_action_group_get_action (view->details->dir_action_group, - FM_ACTION_FORMAT_VOLUME); - gtk_action_set_visible (action, show_format); - - action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_START_VOLUME); gtk_action_set_visible (action, show_start); if (show_start) { @@ -8060,14 +7956,13 @@ real_update_menus_volumes (FMDirectoryView *view, gtk_action_set_visible (action, show_poll); show_self_mount = show_self_unmount = show_self_eject = - show_self_format = show_self_start = show_self_stop = show_self_poll = FALSE; + show_self_start = show_self_stop = show_self_poll = FALSE; file = fm_directory_view_get_directory_as_file (view); file_should_show_self (file, &show_self_mount, &show_self_unmount, &show_self_eject, - &show_self_format, &show_self_start, &show_self_stop, &show_self_poll, @@ -8086,10 +7981,6 @@ real_update_menus_volumes (FMDirectoryView *view, gtk_action_set_visible (action, show_self_eject); action = gtk_action_group_get_action (view->details->dir_action_group, - FM_ACTION_SELF_FORMAT_VOLUME); - gtk_action_set_visible (action, show_self_format); - - action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_SELF_START_VOLUME); gtk_action_set_visible (action, show_self_start); if (show_self_start) { @@ -8162,7 +8053,6 @@ real_update_location_menu_volumes (FMDirectoryView *view) gboolean show_unmount; gboolean show_eject; gboolean show_connect; - gboolean show_format; gboolean show_start; gboolean show_stop; gboolean show_poll; @@ -8177,7 +8067,6 @@ real_update_location_menu_volumes (FMDirectoryView *view) &show_unmount, &show_eject, &show_connect, - &show_format, &show_start, &show_stop, &show_poll, @@ -8196,10 +8085,6 @@ real_update_location_menu_volumes (FMDirectoryView *view) gtk_action_set_visible (action, show_eject); action = gtk_action_group_get_action (view->details->dir_action_group, - FM_ACTION_LOCATION_FORMAT_VOLUME); - gtk_action_set_visible (action, show_format); - - action = gtk_action_group_get_action (view->details->dir_action_group, FM_ACTION_LOCATION_START_VOLUME); gtk_action_set_visible (action, show_start); if (show_start) { |