From ea7fa744d4c0d698c99c37372c98c52643381cce Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 29 Oct 2012 17:39:30 +0200 Subject: [lc-p] remove unnecessary GDK_DRAWABLE cast http://git.gnome.org/browse/nautilus/commit/?id=c2c4076ceb2216ff5e696b4e78aeb63e0f86c437 --- libcaja-private/caja-icon-dnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libcaja-private/caja-icon-dnd.c') diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c index f114b46a..fd28b4e2 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, -- cgit v1.2.1 From 558280660418ef9e27e36ddd0619225c691e44b7 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Thu, 25 Oct 2012 18:34:52 +0200 Subject: [all] silence warnings from GCC 4.6 GCC 4.6 introduced a new warning about variables declared and initialized, but not really used in the function body. Remove all of these occurrences to build cleanly. http://git.gnome.org/browse/nautilus/commit/?id=d4230de8667764e02dbb966b5d806ff78ced2fd5 --- libcaja-private/caja-icon-dnd.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'libcaja-private/caja-icon-dnd.c') diff --git a/libcaja-private/caja-icon-dnd.c b/libcaja-private/caja-icon-dnd.c index fd28b4e2..376490dc 100644 --- a/libcaja-private/caja-icon-dnd.c +++ b/libcaja-private/caja-icon-dnd.c @@ -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 -- cgit v1.2.1