Remove commented out code.

[geeqie.git] / src / view_dir_tree.c

diff --git a/src/view_dir_tree.c b/src/view_dir_tree.c
index 9de21d5..88b78c4 100644 (file)
--- a/src/view_dir_tree.c
+++ b/src/view_dir_tree.c
@@ -1,7 +1,7 @@
 /*
  * Geeqie
  * (C) 2006 John Ellis
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: John Ellis
  *
@@ -53,10 +53,10 @@ static void set_cursor(GtkWidget *widget, GdkCursorType cursor_type)
 {
        GdkCursor *cursor = NULL;
 
-       if (!widget || !widget->window) return;
+       if (!widget || !gtk_widget_get_window(widget)) return;
 
        if (cursor_type > -1) cursor = gdk_cursor_new(cursor_type);
-       gdk_window_set_cursor(widget->window, cursor);
+       gdk_window_set_cursor(gtk_widget_get_window(widget), cursor);
        if (cursor) gdk_cursor_unref(cursor);
        gdk_flush();
 }
@@ -159,7 +159,7 @@ static void vdtree_node_free(NodeData *nd)
 {
        if (!nd) return;
 
-       file_data_unref(nd->fd);
+       if (nd->fd) file_data_unref(nd->fd);
        g_free(nd);
 }
 
@@ -281,7 +281,7 @@ static GList *parts_list_add_node_points(ViewDir *vd, GList *list)
                        NodeData *nd;
 
                        gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
-                       if (strcmp(nd->fd->name, pd->name) == 0)
+                       if (nd->fd && strcmp(nd->fd->name, pd->name) == 0)
                                {
                                fd = nd->fd;
                                }
@@ -307,27 +307,6 @@ static GList *parts_list_add_node_points(ViewDir *vd, GList *list)
        return list;
 }
 
-/*
- *----------------------------------------------------------------------------
- * misc
- *----------------------------------------------------------------------------
- */
-
-#if 0
-static void vdtree_row_deleted_cb(GtkTreeModel *tree_model, GtkTreePath *tpath, gpointer data)
-{
-       GtkTreeIter iter;
-       NodeData *nd;
-
-       gtk_tree_model_get_iter(tree_model, &iter, tpath);
-       gtk_tree_model_get(tree_model, &iter, DIR_COLUMN_POINTER, &nd, -1);
-
-       if (!nd) return;
-
-       file_data_unref(nd->fd);
-       g_free(nd);
-}
-#endif
 
 /*
  *----------------------------------------------------------------------------
@@ -419,7 +398,7 @@ static void vdtree_add_by_data(ViewDir *vd, FileData *fd, GtkTreeIter *parent)
        /* all nodes are created with an "empty" node, so that the expander is shown
         * this is removed when the child is populated */
        end = g_new0(NodeData, 1);
-       end->fd = file_data_new_simple("");
+       end->fd = NULL;
        end->expanded = TRUE;
 
        gtk_tree_store_append(store, &empty, &child);
@@ -462,7 +441,7 @@ gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean f
 
        if (nd->expanded)
                {
-               if (!isdir(nd->fd->path))
+               if (!nd->fd || !isdir(nd->fd->path))
                        {
                        if (vd->click_fd == nd->fd) vd->click_fd = NULL;
                        if (vd->drop_fd == nd->fd) vd->drop_fd = NULL;
@@ -475,6 +454,7 @@ gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean f
                        DEBUG_1("Too frequent update of %s", nd->fd->path);
                        return TRUE;
                        }
+               file_data_check_changed_files(nd->fd); /* make sure we have recent info */
                if (nd->fd->version == nd->version) return TRUE;
                }
 
@@ -495,16 +475,15 @@ gboolean vdtree_populate_path_by_iter(ViewDir *vd, GtkTreeIter *iter, gboolean f
                if (target_fd->path[n] == G_DIR_SEPARATOR && target_fd->path[n+1] == '.')
                        {
                        gchar *name8;
-                       struct stat sbuf;
 
                        n++;
 
                        while (target_fd->path[n] != '\0' && target_fd->path[n] != G_DIR_SEPARATOR) n++;
                        name8 = g_strndup(target_fd->path, n);
 
-                       if (stat_utf8(name8, &sbuf))
+                       if (isdir(name8))
                                {
-                               list = g_list_prepend(list, file_data_new_simple(name8));
+                               list = g_list_prepend(list, file_data_new_dir(name8));
                                }
 
                        g_free(name8);
@@ -720,6 +699,10 @@ gboolean vdtree_set_fd(ViewDir *vd, FileData *dir_fd)
                        {
                        /* setting the cursor scrolls the view; do not do that unless it is necessary */
                        gtk_tree_view_set_cursor(GTK_TREE_VIEW(vd->view), tpath, NULL, FALSE);
+                       
+                       /* gtk_tree_view_set_cursor scrolls the window itself, but it sometimes
+                          does not work (switch from dir_list to dir_tree) */
+                       tree_view_row_make_visible(GTK_TREE_VIEW(vd->view), &iter, TRUE);
                        }
                gtk_tree_path_free(tpath);
                gtk_tree_path_free(old_tpath);
@@ -728,13 +711,6 @@ gboolean vdtree_set_fd(ViewDir *vd, FileData *dir_fd)
        return TRUE;
 }
 
-#if 0
-const gchar *vdtree_get_path(ViewDir *vd)
-{
-       return vd->path;
-}
-#endif
-
 void vdtree_refresh(ViewDir *vd)
 {
        vdtree_populate_path(vd, vd->dir_fd, FALSE, TRUE);
@@ -776,7 +752,7 @@ gboolean vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
 
        switch (event->keyval)
                {
-               case GDK_Menu:
+               case GDK_KEY_Menu:
                        vd->click_fd = fd;
                        vd_color_set(vd, vd->click_fd, TRUE);
 
@@ -785,9 +761,9 @@ gboolean vdtree_press_key_cb(GtkWidget *widget, GdkEventKey *event, gpointer dat
 
                        return TRUE;
                        break;
-               case GDK_plus:
-               case GDK_Right:
-               case GDK_KP_Add:
+               case GDK_KEY_plus:
+               case GDK_KEY_Right:
+               case GDK_KEY_KP_Add:
                        if (fd)
                                {
                                vdtree_populate_path_by_iter(vd, &iter, FALSE, vd->dir_fd);
@@ -900,6 +876,10 @@ static gint vdtree_sort_cb(GtkTreeModel *store, GtkTreeIter *a, GtkTreeIter *b,
        gtk_tree_model_get(store, a, DIR_COLUMN_POINTER, &nda, -1);
        gtk_tree_model_get(store, b, DIR_COLUMN_POINTER, &ndb, -1);
 
+       if (!nda->fd && !ndb->fd) return 0;
+       if (!nda->fd) return 1;
+       if (!ndb->fd) return -1;
+
        if (options->file_sort.case_sensitive)
                return strcmp(nda->fd->collate_key_name, ndb->fd->collate_key_name);
        else
@@ -918,7 +898,7 @@ static void vdtree_setup_root(ViewDir *vd)
        FileData *fd;
 
 
-       fd = file_data_new_simple(path);
+       fd = file_data_new_dir(path);
        vdtree_add_by_data(vd, fd, NULL);
 
        vdtree_expand_by_data(vd, fd, TRUE);