Merge vd(list|tree)_release_cb() in vd_release_cb().

I made some assumptions here i hope correct.

diff --git a/src/view_dir.c b/src/view_dir.c
index 31640c3..6fc0796 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -937,3 +937,47 @@ void vd_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell,
                     "cell-background-set", set, NULL);
 }
 
+gint vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
+{
+       ViewDir *vd = data;
+       GtkTreePath *tpath;
+       GtkTreeIter iter;
+       FileData *fd = NULL;
+
+       vd_color_set(vd, vd->click_fd, FALSE);
+
+       if (bevent->button != 1) return TRUE;
+
+       if ((bevent->x != 0 || bevent->y != 0) &&
+           gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
+                                         &tpath, NULL, NULL, NULL))
+               {
+               GtkTreeModel *store;
+
+               store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
+               gtk_tree_model_get_iter(store, &iter, tpath);
+               switch (vd->type)
+                       {
+                       case DIRVIEW_LIST:
+                               gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &fd, -1);
+                               break;
+                       case DIRVIEW_TREE:
+                               {
+                               NodeData *nd;
+                               gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
+                               fd = (nd) ? nd->fd : NULL;
+                               };
+                               break;
+                       }
+               
+               gtk_tree_path_free(tpath);
+               }
+
+       if (fd && vd->click_fd == fd)
+               {
+               vdlist_select_row(vd, vd->click_fd);
+               }
+
+       return TRUE;
+}
+

diff --git a/src/view_dir.h b/src/view_dir.h
index a1b7b85..f33d381 100644 (file)
--- a/src/view_dir.h
+++ b/src/view_dir.h
@@ -50,6 +50,7 @@ void vd_menu_position_cb(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, gpo
 void vd_activate_cb(GtkTreeView *tview, GtkTreePath *tpath, GtkTreeViewColumn *column, gpointer data);
 void vd_color_cb(GtkTreeViewColumn *tree_column, GtkCellRenderer *cell, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data);
 
+gint vd_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data);
 
 #endif
 

diff --git a/src/view_dir_list.c b/src/view_dir_list.c
index ca9ac89..c3c8d45 100644 (file)
--- a/src/view_dir_list.c
+++ b/src/view_dir_list.c
@@ -349,37 +349,6 @@ static gint vdlist_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
        return TRUE;
 }
 
-static gint vdlist_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
-{
-       ViewDir *vd = data;
-       GtkTreePath *tpath;
-       GtkTreeIter iter;
-       FileData *fd = NULL;
-
-       vd_color_set(vd, vd->click_fd, FALSE);
-
-       if (bevent->button != 1) return TRUE;
-
-       if ((bevent->x != 0 || bevent->y != 0) &&
-           gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
-                                         &tpath, NULL, NULL, NULL))
-               {
-               GtkTreeModel *store;
-
-               store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
-               gtk_tree_model_get_iter(store, &iter, tpath);
-               gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &fd, -1);
-               gtk_tree_path_free(tpath);
-               }
-
-       if (fd && vd->click_fd == fd)
-               {
-               vdlist_select_row(vd, vd->click_fd);
-               }
-
-       return TRUE;
-}
-
 static void vdlist_destroy_cb(GtkWidget *widget, gpointer data)
 {
        ViewDir *vd = data;
@@ -441,7 +410,7 @@ ViewDir *vdlist_new(ViewDir *vd, const gchar *path)
        g_signal_connect(G_OBJECT(vd->view), "button_press_event",
                         G_CALLBACK(vdlist_press_cb), vd);
        g_signal_connect(G_OBJECT(vd->view), "button_release_event",
-                        G_CALLBACK(vdlist_release_cb), vd);
+                        G_CALLBACK(vd_release_cb), vd);
 
        if (path) vdlist_set_path(vd, path);
 

diff --git a/src/view_dir_tree.c b/src/view_dir_tree.c
index 0490707..15970f8 100644 (file)
--- a/src/view_dir_tree.c
+++ b/src/view_dir_tree.c
@@ -863,38 +863,6 @@ static gint vdtree_press_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer
        return (bevent->button != 1);
 }
 
-static gint vdtree_release_cb(GtkWidget *widget, GdkEventButton *bevent, gpointer data)
-{
-       ViewDir *vd = data;
-       GtkTreePath *tpath;
-       GtkTreeIter iter;
-       NodeData *nd = NULL;
-
-       if (!vd->click_fd) return FALSE;
-       vd_color_set(vd, vd->click_fd, FALSE);
-
-       if (bevent->button != 1) return TRUE;
-
-       if ((bevent->x != 0 || bevent->y != 0) &&
-           gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(widget), bevent->x, bevent->y,
-                                         &tpath, NULL, NULL, NULL))
-               {
-               GtkTreeModel *store;
-
-               store = gtk_tree_view_get_model(GTK_TREE_VIEW(widget));
-               gtk_tree_model_get_iter(store, &iter, tpath);
-               gtk_tree_model_get(store, &iter, DIR_COLUMN_POINTER, &nd, -1);
-               gtk_tree_path_free(tpath);
-               }
-
-       if (nd && vd->click_fd == nd->fd)
-               {
-               vdtree_select_row(vd, vd->click_fd);
-               }
-
-       return FALSE;
-}
-
 static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTreePath *tpath, gpointer data)
 {
        ViewDir *vd = data;
@@ -1033,7 +1001,7 @@ ViewDir *vdtree_new(ViewDir *vd, const gchar *path)
        g_signal_connect(G_OBJECT(vd->view), "button_press_event",
                         G_CALLBACK(vdtree_press_cb), vd);
        g_signal_connect(G_OBJECT(vd->view), "button_release_event",
-                        G_CALLBACK(vdtree_release_cb), vd);
+                        G_CALLBACK(vd_release_cb), vd);
 
        vdtree_set_path(vd, path);