[nautilus] canvas-container: remove commented out code



commit c05b1181517abbf53646c806b0c82c9bedaa002d
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Sep 1 12:22:54 2014 -0700

    canvas-container: remove commented out code

 libnautilus-private/nautilus-canvas-container.c |   68 -----------------------
 1 files changed, 0 insertions(+), 68 deletions(-)
---
diff --git a/libnautilus-private/nautilus-canvas-container.c b/libnautilus-private/nautilus-canvas-container.c
index f9ffda2..d693288 100644
--- a/libnautilus-private/nautilus-canvas-container.c
+++ b/libnautilus-private/nautilus-canvas-container.c
@@ -51,8 +51,6 @@
 #define DEBUG_FLAG NAUTILUS_DEBUG_CANVAS_CONTAINER
 #include "nautilus-debug.h"
 
-#define TAB_NAVIGATION_DISABLED
-
 /* Interval for updating the rubberband selection, in milliseconds.  */
 #define RUBBERBAND_TIMEOUT_INTERVAL 10
 
@@ -1128,13 +1126,6 @@ resort (NautilusCanvasContainer *container)
        sort_icons (container, &container->details->icons);
 }
 
-#if 0
-static double
-get_grid_width (NautilusCanvasContainer *container)
-{
-       return STANDARD_ICON_GRID_WIDTH;
-}
-#endif
 typedef struct {
        double width;
        double height;
@@ -3649,57 +3640,6 @@ keyboard_space (NautilusCanvasContainer *container,
        }
 }
 
-/* look for the first canvas that matches the longest part of a given
- * search pattern
- */
-typedef struct {
-       gunichar *name;
-       int last_match_length;
-} BestNameMatch;
-
-#ifndef TAB_NAVIGATION_DISABLED
-static void
-select_previous_or_next_icon (NautilusCanvasContainer *container, 
-                               gboolean next, 
-                               GdkEventKey *event)
-{
-       NautilusCanvasIcon *icon;
-       const GList *item;
-
-       item = NULL;
-       /* Chose the icon to start with.
-        * If we have a keyboard focus, start with it.
-        * Otherwise, use the single selected icon.
-        */
-       icon = container->details->keyboard_focus;
-       if (icon == NULL) {
-               icon = get_first_selected_icon (container);
-       }
-
-       if (icon != NULL) {
-               /* must have at least @canvas in the list */
-               g_assert (container->details->icons != NULL);
-               item = g_list_find (container->details->icons, icon);
-               g_assert (item != NULL);
-               
-               item = next ? item->next : item->prev;
-               if (item == NULL) {
-                       item = next ? g_list_first (container->details->icons) : g_list_last 
(container->details->icons);
-               }
-
-       } else if (container->details->icons != NULL) {
-               /* no selection yet, pick the first or last item to select */
-               item = next ? g_list_first (container->details->icons) : g_list_last 
(container->details->icons);
-       }
-
-       icon = (item != NULL) ? item->data : NULL;
-
-       if (icon != NULL) {
-               keyboard_move_to (container, icon, NULL, event);
-       }
-}
-#endif
-
 static void
 destroy (GtkWidget *object)
 {
@@ -4600,14 +4540,6 @@ key_press_event (GtkWidget *widget,
                        keyboard_space (container, event);
                        handled = TRUE;
                        break;
-#ifndef TAB_NAVIGATION_DISABLED
-               case GDK_KEY_Tab:
-               case GDK_KEY_ISO_Left_Tab:
-                       select_previous_or_next_icon (container, 
-                                                       (event->state & GDK_SHIFT_MASK) == 0, event);
-                       handled = TRUE;
-                       break;
-#endif
                case GDK_KEY_Return:
                case GDK_KEY_KP_Enter:
                        if ((event->state & GDK_SHIFT_MASK) != 0) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]