summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-tree-view-drag-dest.c
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-05-02 01:09:20 +0200
committerraveit65 <[email protected]>2019-05-06 13:53:37 +0200
commita110c542bd7a16625f03c97e2fefa3be8da50c85 (patch)
tree7af078f9084b33eb0d5df7f3657a1f8049ff6b83 /libcaja-private/caja-tree-view-drag-dest.c
parent476f56a25be636970b336d525a7766b6d1eb3fff (diff)
downloadcaja-a110c542bd7a16625f03c97e2fefa3be8da50c85.tar.bz2
caja-a110c542bd7a16625f03c97e2fefa3be8da50c85.tar.xz
libcaja-private: reduce the scope of some variables
Diffstat (limited to 'libcaja-private/caja-tree-view-drag-dest.c')
-rw-r--r--libcaja-private/caja-tree-view-drag-dest.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/libcaja-private/caja-tree-view-drag-dest.c b/libcaja-private/caja-tree-view-drag-dest.c
index c05acafb..041e26a5 100644
--- a/libcaja-private/caja-tree-view-drag-dest.c
+++ b/libcaja-private/caja-tree-view-drag-dest.c
@@ -335,7 +335,6 @@ static CajaFile *
file_for_path (CajaTreeViewDragDest *dest, GtkTreePath *path)
{
CajaFile *file;
- char *uri;
if (path)
{
@@ -343,6 +342,8 @@ file_for_path (CajaTreeViewDragDest *dest, GtkTreePath *path)
}
else
{
+ char *uri;
+
uri = get_root_uri (dest);
file = NULL;
@@ -506,7 +507,6 @@ drag_motion_callback (GtkWidget *widget,
CajaTreeViewDragDest *dest;
GtkTreePath *path;
GtkTreePath *drop_path, *old_drop_path;
- GtkTreeModel *model;
GtkTreeIter drop_iter;
GtkTreeViewDropPosition pos;
GdkWindow *bin_window;
@@ -549,6 +549,8 @@ drag_motion_callback (GtkWidget *widget,
if (action)
{
+ GtkTreeModel *model;
+
set_drag_dest_row (dest, drop_path);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
if (drop_path == NULL || (old_drop_path != NULL &&
@@ -907,8 +909,6 @@ drag_data_received_callback (GtkWidget *widget,
gpointer data)
{
CajaTreeViewDragDest *dest;
- const char *tmp;
- int length;
gboolean success, finished;
dest = CAJA_TREE_VIEW_DRAG_DEST (data);
@@ -949,11 +949,16 @@ drag_data_received_callback (GtkWidget *widget,
success = TRUE;
break;
case CAJA_ICON_DND_RAW:
+ {
+ const char *tmp;
+ int length;
+
length = gtk_selection_data_get_length (selection_data);
tmp = gtk_selection_data_get_data (selection_data);
receive_dropped_raw (dest, tmp, length, context, x, y);
success = TRUE;
break;
+ }
case CAJA_ICON_DND_KEYWORD:
receive_dropped_keyword (dest, context, x, y);
success = TRUE;
@@ -1015,9 +1020,8 @@ set_direct_save_uri (CajaTreeViewDragDest *dest,
GdkDragContext *context,
int x, int y)
{
- GFile *base, *child;
char *drop_uri;
- char *filename, *uri;
+ char *uri;
g_assert (dest->details->direct_save_uri == NULL);
@@ -1026,9 +1030,13 @@ set_direct_save_uri (CajaTreeViewDragDest *dest,
drop_uri = get_drop_target_uri_at_pos (dest, x, y);
if (drop_uri != NULL)
{
+ char *filename;
+
filename = get_direct_save_filename (context);
if (filename != NULL)
{
+ GFile *base, *child;
+
/* Resolve relative path */
base = g_file_new_for_uri (drop_uri);
child = g_file_get_child (base, filename);