summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-icon-dnd.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-12-23 11:14:36 -0800
committerStefano Karapetsas <[email protected]>2012-12-23 11:14:36 -0800
commit3ec2cb1ade8ed91ed472091adcc592485dc49f4d (patch)
tree122f234160898266040a89a6767871856bd607c9 /libcaja-private/caja-icon-dnd.c
parent8379b1dc107c9e0daf31ef1b654c9ab44d9bac23 (diff)
parentc598aa7e65d9e370c63f883acbbb6504044c2531 (diff)
downloadcaja-3ec2cb1ade8ed91ed472091adcc592485dc49f4d.tar.bz2
caja-3ec2cb1ade8ed91ed472091adcc592485dc49f4d.tar.xz
Merge pull request #65 from jasmineaura/develop
Most of remaining deprecations, some cleanups, and a leak fix
Diffstat (limited to 'libcaja-private/caja-icon-dnd.c')
-rw-r--r--libcaja-private/caja-icon-dnd.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c
index f114b46a..376490dc 100644
--- a/libcaja-private/caja-icon-dnd.c
+++ b/libcaja-private/caja-icon-dnd.c
@@ -456,7 +456,7 @@ set_direct_save_uri (GtkWidget *widget, GdkDragContext *context, CajaDragInfo *d
g_object_unref (child);
/* Change the uri property */
- gdk_property_change (GDK_DRAWABLE (gdk_drag_context_get_source_window (context)),
+ gdk_property_change (gdk_drag_context_get_source_window (context),
gdk_atom_intern (CAJA_ICON_DND_XDNDDIRECTSAVE_TYPE, FALSE),
gdk_atom_intern ("text/plain", FALSE), 8,
GDK_PROP_MODE_REPLACE, (const guchar *) uri,
@@ -1577,7 +1577,6 @@ caja_icon_dnd_begin_drag (CajaIconContainer *container,
int start_y)
{
CajaIconDndInfo *dnd_info;
- GdkDragContext *context;
g_return_if_fail (CAJA_IS_ICON_CONTAINER (container));
g_return_if_fail (event != NULL);
@@ -1594,11 +1593,11 @@ caja_icon_dnd_begin_drag (CajaIconContainer *container,
gtk_adjustment_get_value (gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (container)));
/* start the drag */
- context = gtk_drag_begin (GTK_WIDGET (container),
- dnd_info->drag_info.target_list,
- actions,
- button,
- (GdkEvent *) event);
+ gtk_drag_begin (GTK_WIDGET (container),
+ dnd_info->drag_info.target_list,
+ actions,
+ button,
+ (GdkEvent *) event);
}
static gboolean