Trim trailing white spaces on empty lines.

[geeqie.git] / src / view_dir.c

diff --git a/src/view_dir.c b/src/view_dir.c
index 5ba3077..77446ce 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 - 2009 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Author: Laurent Monin
  *
@@ -31,7 +31,7 @@
 static PixmapFolders *folder_icons_new(GtkWidget *widget)
 {
        PixmapFolders *pf = g_new0(PixmapFolders, 1);
-       
+
 #if 1
        GtkIconSize size = GTK_ICON_SIZE_MENU;
 
@@ -126,10 +126,11 @@ ViewDir *vd_new(DirViewType type, FileData *dir_fd)
        g_signal_connect(G_OBJECT(vd->view), "button_release_event",
                         G_CALLBACK(vd_release_cb), vd);
 
-       if (dir_fd) vd_set_fd(vd, dir_fd);
-
        file_data_register_notify_func(vd_notify_cb, vd, NOTIFY_PRIORITY_HIGH);
 
+       /* vd_set_fd expects that vd_notify_cb is already registered */
+       if (dir_fd) vd_set_fd(vd, dir_fd);
+
        gtk_widget_show(vd->view);
 
        return vd;
@@ -240,7 +241,7 @@ static void vd_rename_finished_cb(gboolean success, const gchar *new_path, gpoin
        ViewDir *vd = data;
        if (success)
                {
-               FileData *fd = file_data_new_simple(new_path);
+               FileData *fd = file_data_new_dir(new_path);
                GtkTreeIter iter;
 
                if (vd_find_row(vd, fd, &iter))
@@ -267,7 +268,7 @@ static gboolean vd_rename_cb(TreeEditData *td, const gchar *old, const gchar *ne
        g_free(base);
 
        file_util_rename_dir(fd, new_path, vd->view, vd_rename_finished_cb, vd);
-       
+
        g_free(new_path);
 
        return FALSE;
@@ -365,9 +366,9 @@ static void vd_drop_menu_filter_cb(GtkWidget *widget, gpointer data)
        const gchar *path;
        GList *list;
        const gchar *key;
-       
+
        if (!vd->drop_fd) return;
-       
+
        key = g_object_get_data(G_OBJECT(widget), "filter_key");
 
        path = vd->drop_fd->path;
@@ -403,13 +404,13 @@ GtkWidget *vd_drop_menu(ViewDir *vd, gint active)
                const EditorDescription *editor = work->data;
                gchar *key;
                work = work->next;
-               
+
                if (!editor_is_filter(editor->key)) continue;
                key = g_strdup(editor->key);
                item = menu_item_add_sensitive(menu, editor->name, active, G_CALLBACK(vd_drop_menu_filter_cb), vd);
                g_object_set_data_full(G_OBJECT(item), "filter_key", key, vd_drop_menu_edit_item_free);
                }
-       
+
        g_list_free(editors_list);
 
        menu_item_add_divider(menu);
@@ -434,7 +435,7 @@ static void vd_pop_menu_up_cb(GtkWidget *widget, gpointer data)
 
        if (vd->select_func)
                {
-               FileData *fd = file_data_new_simple(path);
+               FileData *fd = file_data_new_dir(path);
                vd->select_func(vd, fd, vd->select_data);
                file_data_unref(fd);
                }
@@ -560,7 +561,7 @@ static void vd_pop_menu_new_rename_cb(gboolean success, const gchar *new_path, g
                        break;
                case DIRVIEW_TREE:
                        {
-                       FileData *new_fd = file_data_new_simple(new_path);
+                       FileData *new_fd = file_data_new_dir(new_path);
                        fd = vdtree_populate_path(vd, new_fd, TRUE, TRUE);
                        file_data_unref(new_fd);
                        }
@@ -603,7 +604,6 @@ static void vd_pop_menu_rename_cb(GtkWidget *widget, gpointer data)
 GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
 {
        GtkWidget *menu;
-       GtkWidget *item;
        gboolean active;
        gboolean rename_delete_active = FALSE;
        gboolean new_folder_active = FALSE;
@@ -673,11 +673,11 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd)
        menu_item_add_divider(menu);
 
 
-       item = menu_item_add_radio(menu, _("View as _List"), GINT_TO_POINTER(DIRVIEW_LIST), vd->type == DIRVIEW_LIST,
-                                           G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
+       menu_item_add_radio(menu, _("View as _List"), GINT_TO_POINTER(DIRVIEW_LIST), vd->type == DIRVIEW_LIST,
+                        G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
 
-       item = menu_item_add_radio(menu, _("View as _Tree"), GINT_TO_POINTER(DIRVIEW_TREE), vd->type == DIRVIEW_TREE,
-                                           G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
+       menu_item_add_radio(menu, _("View as _Tree"), GINT_TO_POINTER(DIRVIEW_TREE), vd->type == DIRVIEW_TREE,
+                        G_CALLBACK(vd_pop_submenu_dir_view_as_cb), vd);
 
        menu_item_add_divider(menu);
 
@@ -727,8 +727,6 @@ static void vd_dnd_get(GtkWidget *widget, GdkDragContext *context,
 {
        ViewDir *vd = data;
        GList *list;
-       gchar *uritext = NULL;
-       gint length = 0;
 
        if (!vd->click_fd) return;
 
@@ -737,16 +735,10 @@ static void vd_dnd_get(GtkWidget *widget, GdkDragContext *context,
                case TARGET_URI_LIST:
                case TARGET_TEXT_PLAIN:
                        list = g_list_prepend(NULL, vd->click_fd);
-                       uritext = uri_text_from_filelist(list, &length, (info == TARGET_TEXT_PLAIN));
+                       uri_selection_data_set_uris_from_filelist(selection_data, list);
                        g_list_free(list);
                        break;
                }
-       if (uritext)
-               {
-               gtk_selection_data_set(selection_data, selection_data->target,
-                                      8, (guchar *)uritext, length);
-               g_free(uritext);
-               }
 }
 
 static void vd_dnd_begin(GtkWidget *widget, GdkDragContext *context, gpointer data)
@@ -763,7 +755,7 @@ static void vd_dnd_end(GtkWidget *widget, GdkDragContext *context, gpointer data
 
        vd_color_set(vd, vd->click_fd, FALSE);
 
-       if (vd->type == DIRVIEW_LIST && context->action == GDK_ACTION_MOVE)
+       if (vd->type == DIRVIEW_LIST && gdk_drag_context_get_selected_action(context) == GDK_ACTION_MOVE)
                {
                vd_refresh(vd);
                }
@@ -796,7 +788,7 @@ static void vd_dnd_drop_receive(GtkWidget *widget,
                gint active;
                gboolean done = FALSE;
 
-               list = uri_filelist_from_text((gchar *)selection_data->data, TRUE);
+               list = uri_filelist_from_gtk_selection_data(selection_data);
                if (!list) return;
 
                active = access_file(fd->path, W_OK | X_OK);
@@ -805,13 +797,13 @@ static void vd_dnd_drop_receive(GtkWidget *widget,
 
                if (active)
                        {
-                       if (context->actions == GDK_ACTION_COPY)
+                       if (gdk_drag_context_get_actions(context) == GDK_ACTION_COPY)
                                {
                                file_util_copy_simple(list, fd->path, vd->widget);
                                done = TRUE;
                                list = NULL;
                                }
-                       else if (context->actions == GDK_ACTION_MOVE)
+                       else if (gdk_drag_context_get_actions(context) == GDK_ACTION_MOVE)
                                {
                                file_util_move_simple(list, fd->path, vd->widget);
                                done = TRUE;
@@ -871,9 +863,10 @@ static gboolean vd_auto_scroll_idle_cb(gpointer data)
                gint x, y;
                gint w, h;
 
-               window = vd->view->window;
+               window = gtk_widget_get_window(vd->view);
                gdk_window_get_pointer(window, &x, &y, NULL);
-               gdk_drawable_get_size(window, &w, &h);
+               w = gdk_window_get_width(window);
+               h = gdk_window_get_height(window);
                if (x >= 0 && x < w && y >= 0 && y < h)
                        {
                        vd_dnd_drop_update(vd, x, y);
@@ -910,7 +903,7 @@ static gboolean vd_dnd_drop_motion(GtkWidget *widget, GdkDragContext *context,
                }
        else
                {
-               gdk_drag_status(context, context->suggested_action, time);
+               gdk_drag_status(context, gdk_drag_context_get_suggested_action(context), time);
                }
 
        vd_dnd_drop_update(vd, x, y);
@@ -1109,14 +1102,14 @@ static void vd_notify_cb(FileData *fd, NotifyType type, gpointer data)
                                g_free(source_base);
                                }
                        }
-               
+
                if (refresh) vd_refresh(vd);
                }
 
        if (vd->type == DIRVIEW_TREE)
                {
                GtkTreeIter iter;
-               FileData *base_fd = file_data_new_simple(base);
+               FileData *base_fd = file_data_new_dir(base);
 
                if (vd_find_row(vd, base_fd, &iter))
                        {