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 ab8f469..1d39fd0 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 - 2010 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();
 }
@@ -475,6 +475,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;
                }
 
@@ -779,7 +780,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);
 
@@ -788,9 +789,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);