diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2002-10-02 05:36:58 +0000 |
|---|---|---|
| committer | Mark McLoughlin <mmclouglin@src.gnome.org> | 2002-10-02 05:36:58 +0000 |
| commit | 3e6bfd6af629583e51a1120ee407ccfbaeec1b27 (patch) | |
| tree | d03148f8d07673a8c97cfa75de1d890213b9e8a7 /libnautilus-private/nautilus-dnd.c | |
| parent | 3fa3cfe91a6f995ce99dedbd5f3609dccb6dec72 (diff) | |
| download | nautilus-3e6bfd6af629583e51a1120ee407ccfbaeec1b27.tar.gz | |
Merge the multihead branch into HEAD and :
2002-10-02 Mark McLoughlin <mark@skynet.ie>
* acconfig.h: define HAVE_GTK_MULTIHEAD for
egg-screen-exec methods.
* configure.in: require gtk 2.1.0 and don't
define HAVE_GTK_MULTIHEAD.
* libnautilus-private/nautilus-multihead-hacks.h: kill.
* libnautilus-private/nautilus-directory-background:
(make_root_pixmap), (set_root_pixmap): use
gdk_screen_get_display instead of assuming the default
display.
* src/nautilus-shell.c: (restore_one_window_callback):
add backwards compat support for sessions without
a screen number.
Diffstat (limited to 'libnautilus-private/nautilus-dnd.c')
| -rw-r--r-- | libnautilus-private/nautilus-dnd.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libnautilus-private/nautilus-dnd.c b/libnautilus-private/nautilus-dnd.c index 0e88b2f8d..1eb7e2dd6 100644 --- a/libnautilus-private/nautilus-dnd.c +++ b/libnautilus-private/nautilus-dnd.c @@ -69,16 +69,11 @@ void nautilus_drag_init (NautilusDragInfo *drag_info, const GtkTargetEntry *drag_types, - int drag_type_count, - GdkBitmap *stipple) + int drag_type_count) { drag_info->target_list = gtk_target_list_new (drag_types, drag_type_count); - if (stipple != NULL) { - drag_info->stipple = g_object_ref (stipple); - } - drag_info->drop_occured = FALSE; drag_info->need_to_destroy = FALSE; } @@ -89,10 +84,6 @@ nautilus_drag_finalize (NautilusDragInfo *drag_info) gtk_target_list_unref (drag_info->target_list); nautilus_drag_destroy_selection_list (drag_info->selection_list); - if (drag_info->stipple != NULL) { - g_object_unref (drag_info->stipple); - } - g_free (drag_info); } |