rpms/nautilus
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- Rediff the XDS patch

Browse Source
This commit is contained in:
Tomas Bzatek 2008-12-04 10:46:20 +00:00
parent dfaaca61cc
commit 954e1636c3
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nautilus-2.22.0-treeview-xds-dnd.patch → nautilus-2.22.0-treeview-xds-dnd-2.patch
View File

@ -1,7 +1,6 @@
Index: libnautilus-private/nautilus-tree-view-drag-dest.c diff -up nautilus-2.25.1/libnautilus-private/nautilus-tree-view-drag-dest.c.orig nautilus-2.25.1/libnautilus-private/nautilus-tree-view-drag-dest.c
=================================================================== --- nautilus-2.25.1/libnautilus-private/nautilus-tree-view-drag-dest.c.orig 2008-10-06 11:54:32.000000000 +0200
--- libnautilus-private/nautilus-tree-view-drag-dest.c (Revision 14599) +++ nautilus-2.25.1/libnautilus-private/nautilus-tree-view-drag-dest.c 2008-12-04 11:35:04.174034560 +0100
+++ libnautilus-private/nautilus-tree-view-drag-dest.c (Arbeitskopie)
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
* *
@ -10,9 +9,9 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
*/ */
/* nautilus-tree-view-drag-dest.c: Handles drag and drop for treeviews which /* nautilus-tree-view-drag-dest.c: Handles drag and drop for treeviews which
@@ -34,9 +35,13 @@ @@ -33,9 +34,13 @@
#include <eel/eel-gtk-macros.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libgnome/gnome-macros.h>
#include "nautilus-file-dnd.h" #include "nautilus-file-dnd.h"
+#include "nautilus-file-changes-queue.h" +#include "nautilus-file-changes-queue.h"
#include "nautilus-icon-dnd.h" #include "nautilus-icon-dnd.h"
@ -24,7 +23,7 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
#define AUTO_SCROLL_MARGIN 20 #define AUTO_SCROLL_MARGIN 20
@@ -55,6 +60,8 @@ struct _NautilusTreeViewDragDestDetails @@ -54,6 +59,8 @@ struct _NautilusTreeViewDragDestDetails
guint highlight_id; guint highlight_id;
guint scroll_id; guint scroll_id;
guint expand_id; guint expand_id;
@ -33,7 +32,7 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
}; };
enum { enum {
@@ -81,7 +88,8 @@ static const GtkTargetEntry drag_types [ @@ -80,7 +87,8 @@ static const GtkTargetEntry drag_types [
/* prefer "_NETSCAPE_URL" over "text/uri-list" to satisfy web browsers. */ /* prefer "_NETSCAPE_URL" over "text/uri-list" to satisfy web browsers. */
{ NAUTILUS_ICON_DND_NETSCAPE_URL_TYPE, 0, NAUTILUS_ICON_DND_NETSCAPE_URL }, { NAUTILUS_ICON_DND_NETSCAPE_URL_TYPE, 0, NAUTILUS_ICON_DND_NETSCAPE_URL },
{ NAUTILUS_ICON_DND_URI_LIST_TYPE, 0, NAUTILUS_ICON_DND_URI_LIST }, { NAUTILUS_ICON_DND_URI_LIST_TYPE, 0, NAUTILUS_ICON_DND_URI_LIST },
@ -43,7 +42,7 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
}; };
@@ -245,6 +253,12 @@ get_drag_data (NautilusTreeViewDragDest @@ -244,6 +252,12 @@ get_drag_data (NautilusTreeViewDragDest
target = gtk_drag_dest_find_target (GTK_WIDGET (dest->details->tree_view), target = gtk_drag_dest_find_target (GTK_WIDGET (dest->details->tree_view),
context, context,
NULL); NULL);
@ -56,7 +55,7 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
gtk_drag_get_data (GTK_WIDGET (dest->details->tree_view), gtk_drag_get_data (GTK_WIDGET (dest->details->tree_view),
context, target, time); context, target, time);
@@ -264,6 +278,9 @@ free_drag_data (NautilusTreeViewDragDest @@ -263,6 +277,9 @@ free_drag_data (NautilusTreeViewDragDest
nautilus_drag_destroy_selection_list (dest->details->drag_list); nautilus_drag_destroy_selection_list (dest->details->drag_list);
dest->details->drag_list = NULL; dest->details->drag_list = NULL;
} }
@ -66,7 +65,7 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
} }
static char * static char *
@@ -408,6 +425,7 @@ get_drop_action (NautilusTreeViewDragDes @@ -407,6 +424,7 @@ get_drop_action (NautilusTreeViewDragDes
return context->suggested_action; return context->suggested_action;
case NAUTILUS_ICON_DND_TEXT: case NAUTILUS_ICON_DND_TEXT:
@ -74,7 +73,7 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
return GDK_ACTION_COPY; return GDK_ACTION_COPY;
case NAUTILUS_ICON_DND_KEYWORD: case NAUTILUS_ICON_DND_KEYWORD:
@@ -718,6 +736,35 @@ receive_dropped_keyword (NautilusTreeVie @@ -717,6 +735,35 @@ receive_dropped_keyword (NautilusTreeVie
g_free (drop_target_uri); g_free (drop_target_uri);
} }
@ -110,7 +109,7 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
static gboolean static gboolean
drag_data_received_callback (GtkWidget *widget, drag_data_received_callback (GtkWidget *widget,
GdkDragContext *context, GdkDragContext *context,
@@ -767,6 +814,10 @@ drag_data_received_callback (GtkWidget * @@ -766,6 +813,10 @@ drag_data_received_callback (GtkWidget *
receive_dropped_keyword (dest, context, x, y); receive_dropped_keyword (dest, context, x, y);
success = TRUE; success = TRUE;
break; break;
@ -121,7 +120,7 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
} }
dest->details->drop_occurred = FALSE; dest->details->drop_occurred = FALSE;
@@ -782,6 +833,79 @@ drag_data_received_callback (GtkWidget * @@ -781,6 +832,79 @@ drag_data_received_callback (GtkWidget *
return TRUE; return TRUE;
} }
@ -201,7 +200,7 @@ Index: libnautilus-private/nautilus-tree-view-drag-dest.c
static gboolean static gboolean
drag_drop_callback (GtkWidget *widget, drag_drop_callback (GtkWidget *widget,
GdkDragContext *context, GdkDragContext *context,
@@ -791,8 +915,24 @@ drag_drop_callback (GtkWidget *widget, @@ -790,8 +914,24 @@ drag_drop_callback (GtkWidget *widget,
gpointer data) gpointer data)
{ {
NautilusTreeViewDragDest *dest; NautilusTreeViewDragDest *dest;

9
nautilus.spec
View File

@ -19,7 +19,7 @@
Name: nautilus Name: nautilus
Summary: File manager for GNOME Summary: File manager for GNOME
Version: 2.25.1 Version: 2.25.1
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: User Interface/Desktops Group: User Interface/Desktops
Source: http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2 Source: http://download.gnome.org/sources/%{name}/2.24/%{name}-%{version}.tar.bz2
@ -94,7 +94,7 @@ Patch7: rtl-fix.patch
Patch10: nautilus-gvfs-desktop-key-2.patch Patch10: nautilus-gvfs-desktop-key-2.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=171655 # http://bugzilla.gnome.org/show_bug.cgi?id=171655
Patch15: nautilus-2.22.0-treeview-xds-dnd.patch Patch15: nautilus-2.22.0-treeview-xds-dnd-2.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=519743 # http://bugzilla.gnome.org/show_bug.cgi?id=519743
Patch17: nautilus-filetype-symlink-fix.patch Patch17: nautilus-filetype-symlink-fix.patch
@ -135,7 +135,7 @@ for developing nautilus extensions.
%patch7 -p1 -b .rtl-fix %patch7 -p1 -b .rtl-fix
# %patch8 -p1 -b .hide-white-screen # %patch8 -p1 -b .hide-white-screen
%patch10 -p1 -b .gvfs-desktop-key %patch10 -p1 -b .gvfs-desktop-key
%patch15 -p0 -b .xds %patch15 -p1 -b .xds
%patch17 -p0 -b .symlink %patch17 -p0 -b .symlink
%build %build
@ -265,6 +265,9 @@ fi
%changelog %changelog
* Thu Dec 4 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.25.1-2
- Rediff the XDS patch
* Tue Dec 2 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.25.1-1 * Tue Dec 2 2008 Tomas Bzatek <tbzatek@redhat.com> - 2.25.1-1
- Update to 2.25.1 - Update to 2.25.1