summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-10-27 16:33:39 +0200
committerJasmine Hassan <[email protected]>2012-11-16 09:45:52 +0200
commit2e0b6b0a2e689d5af0ca719ee0ef29f90c4f2e0c (patch)
tree303b76ec41aec3d58c4f8c13c1c82adc44e0216f
parent765d89de748d29e99e0babf08091985133f9c377 (diff)
downloadcaja-2e0b6b0a2e689d5af0ca719ee0ef29f90c4f2e0c.tar.bz2
caja-2e0b6b0a2e689d5af0ca719ee0ef29f90c4f2e0c.tar.xz
[icon-dnd] remove commented out obsolete code
http://git.gnome.org/browse/nautilus/commit/?id=c5eba3314c99059aa1fff13aedcb1004966fdd55
-rw-r--r--libcaja-private/caja-icon-dnd.c63
1 files changed, 1 insertions, 62 deletions
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index 449ceab8..470a767e 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.c
@@ -940,63 +940,6 @@ stop_auto_scroll (CajaIconContainer *container)
caja_drag_autoscroll_stop (&container->details->dnd_info->drag_info);
}
-static gboolean
-confirm_switch_to_manual_layout (CajaIconContainer *container)
-{
-#if 0
- const char *message;
- const char *detail;
- GtkDialog *dialog;
- int response;
-
- /* FIXME bugzilla.gnome.org 40915: Use of the word "directory"
- * makes this FMIconView specific. Move these messages into
- * FMIconView so CajaIconContainer can be used for things
- * that are not directories?
- */
- if (caja_icon_container_has_stored_icon_positions (container))
- {
- if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list))
- {
- message = no_translate("Do you want to switch to manual layout and leave this item where you dropped it? "
- "This will clobber the stored manual layout.");
- detail = no_translate("This folder uses automatic layout.");
- }
- else
- {
- message = no_translate("Do you want to switch to manual layout and leave these items where you dropped them? "
- "This will clobber the stored manual layout.");
- detail = no_translate("This folder uses automatic layout.");
- }
- }
- else
- {
- if (eel_g_list_exactly_one_item (container->details->dnd_info->drag_info.selection_list))
- {
- message = no_translate("Do you want to switch to manual layout and leave this item where you dropped it?");
- detail = no_translate("This folder uses automatic layout.");
- }
- else
- {
- message = no_translate("Do you want to switch to manual layout and leave these items where you dropped them?");
- detail = no_translate("This folder uses automatic layout.");
-
- }
- }
-
- dialog = eel_show_yes_no_dialog (message, detail, _("Switch to Manual Layout?"),
- GTK_STOCK_CANCEL,
- GTK_WINDOW (gtk_widget_get_toplevel(GTK_WIDGET(container))));
-
- response = gtk_dialog_run (dialog);
- gtk_object_destroy (GTK_OBJECT (dialog));
-
- return response == GTK_RESPONSE_YES;
-#else
- return FALSE;
-#endif
-}
-
static void
handle_local_move (CajaIconContainer *container,
double world_x, double world_y)
@@ -1011,11 +954,7 @@ handle_local_move (CajaIconContainer *container,
if (container->details->auto_layout)
{
- if (!confirm_switch_to_manual_layout (container))
- {
- return;
- }
- caja_icon_container_freeze_icon_positions (container);
+ return;
}
time (&now);