r10453 - in /desktop/unstable/nautilus/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed Apr 25 22:32:57 UTC 2007
Author: joss
Date: Wed Apr 25 22:32:56 2007
New Revision: 10453
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10453
Log:
* 10_location_titlebar.patch: include gnome-vfs-utils.h
(closes: #421027).
* Refresh other patches.
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch
desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch
desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch
desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch
desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch
desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch
desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch
desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch
desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Wed Apr 25 22:32:56 2007
@@ -1,3 +1,11 @@
+nautilus (2.18.1-2) UNRELEASED; urgency=low
+
+ * 10_location_titlebar.patch: include gnome-vfs-utils.h
+ (closes: #421027).
+ * Refresh other patches.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 26 Apr 2007 00:32:07 +0200
+
nautilus (2.18.1-1) unstable; urgency=low
[ Josselin Mouette ]
Modified: desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch (original)
+++ desktop/unstable/nautilus/debian/patches/01_prompt_same_file.patch Wed Apr 25 22:32:56 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.16.3/libnautilus-private/nautilus-file-operations.c
+Index: nautilus-2.18.1/libnautilus-private/nautilus-file-operations.c
===================================================================
---- nautilus-2.16.3.orig/libnautilus-private/nautilus-file-operations.c 2007-04-19 21:48:30.868578500 +0200
-+++ nautilus-2.16.3/libnautilus-private/nautilus-file-operations.c 2007-04-19 22:29:17.681494750 +0200
-@@ -1114,6 +1114,34 @@
+--- nautilus-2.18.1.orig/libnautilus-private/nautilus-file-operations.c 2007-04-10 14:06:07.000000000 +0200
++++ nautilus-2.18.1/libnautilus-private/nautilus-file-operations.c 2007-04-26 00:30:31.407642250 +0200
+@@ -1115,6 +1115,34 @@
return is_dir;
}
@@ -37,7 +37,7 @@
static int
handle_transfer_overwrite (const GnomeVFSXferProgressInfo *progress_info,
-@@ -1122,12 +1150,14 @@
+@@ -1123,12 +1151,14 @@
int result;
char *text, *primary_text, *secondary_text, *formatted_name, *base_name;
GnomeVFSURI *file_uri, *parent_uri;
@@ -54,7 +54,7 @@
formatted_name = extract_and_ellipsize_file_name_for_dialog
(parent_for_error_dialog (transfer_info),
progress_info->target_name);
-@@ -1135,19 +1165,30 @@
+@@ -1136,19 +1166,30 @@
if (transfer_info->kind == TRANSFER_MOVE) {
primary_text = g_strdup_printf (_("Could not move \"%s\" to the new location."),
formatted_name);
Modified: desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch (original)
+++ desktop/unstable/nautilus/debian/patches/03_sftp_connect.patch Wed Apr 25 22:32:56 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.16.3/src/file-manager/fm-directory-view.c
+Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c
===================================================================
---- nautilus-2.16.3.orig/src/file-manager/fm-directory-view.c 2006-12-09 00:57:19.000000000 +0100
-+++ nautilus-2.16.3/src/file-manager/fm-directory-view.c 2006-12-13 21:58:45.000000000 +0100
-@@ -7236,6 +7236,8 @@
+--- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c 2007-04-26 00:30:37.448019750 +0200
++++ nautilus-2.18.1/src/file-manager/fm-directory-view.c 2007-04-26 00:30:42.220318000 +0200
+@@ -7281,6 +7281,8 @@
uri = nautilus_file_get_activation_uri (file);
if (uri != NULL &&
(eel_istr_has_prefix (uri, "ftp:") ||
Modified: desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch (original)
+++ desktop/unstable/nautilus/debian/patches/04_show_backup_files.patch Wed Apr 25 22:32:56 2007
@@ -1,8 +1,8 @@
-diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
-index f223bd7..74cb45c 100644
---- a/src/file-manager/fm-directory-view.c
-+++ b/src/file-manager/fm-directory-view.c
-@@ -1237,6 +1237,7 @@ action_show_hidden_files_callback (GtkAc
+Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c
+===================================================================
+--- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c 2007-04-26 00:30:42.220318000 +0200
++++ nautilus-2.18.1/src/file-manager/fm-directory-view.c 2007-04-26 00:30:47.528649750 +0200
+@@ -1246,6 +1246,7 @@
directory_view = FM_DIRECTORY_VIEW (callback_data);
directory_view->details->show_hidden_files = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action));
Modified: desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch (original)
+++ desktop/unstable/nautilus/debian/patches/05_places-sidebar_single-click.patch Wed Apr 25 22:32:56 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.16.3/src/nautilus-places-sidebar.c
+Index: nautilus-2.18.1/src/nautilus-places-sidebar.c
===================================================================
---- nautilus-2.16.3.orig/src/nautilus-places-sidebar.c 2006-09-14 10:24:30.000000000 +0200
-+++ nautilus-2.16.3/src/nautilus-places-sidebar.c 2007-01-03 00:29:53.000000000 +0100
-@@ -453,9 +453,7 @@
+--- nautilus-2.18.1.orig/src/nautilus-places-sidebar.c 2007-04-10 14:05:31.000000000 +0200
++++ nautilus-2.18.1/src/nautilus-places-sidebar.c 2007-04-26 00:30:54.709098500 +0200
+@@ -454,9 +454,7 @@
}
static void
@@ -13,7 +13,7 @@
gpointer user_data)
{
NautilusPlacesSidebar *sidebar;
-@@ -464,11 +462,8 @@
+@@ -465,11 +463,8 @@
char *uri;
sidebar = NAUTILUS_PLACES_SIDEBAR (user_data);
@@ -27,7 +27,7 @@
gtk_tree_model_get
(model, &iter, PLACES_SIDEBAR_COLUMN_URI, &uri, -1);
-@@ -1543,8 +1538,8 @@
+@@ -1557,8 +1552,8 @@
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
g_signal_connect_object
Modified: desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch (original)
+++ desktop/unstable/nautilus/debian/patches/06_dont_create_Desktop.patch Wed Apr 25 22:32:56 2007
@@ -1,7 +1,7 @@
Index: libnautilus-private/nautilus-monitor.c
===================================================================
---- libnautilus-private/nautilus-monitor.c.orig 2006-10-30 14:29:49.000000000 +0100
-+++ libnautilus-private/nautilus-monitor.c 2007-01-30 23:04:30.000000000 +0100
+--- libnautilus-private/nautilus-monitor.c.orig 2007-04-10 14:06:07.000000000 +0200
++++ libnautilus-private/nautilus-monitor.c 2007-04-26 00:30:58.445332000 +0200
@@ -38,6 +38,13 @@
GnomeVFSMonitorHandle *handle;
};
@@ -51,8 +51,8 @@
Index: libnautilus-private/nautilus-monitor.h
===================================================================
---- libnautilus-private/nautilus-monitor.h.orig 2002-02-21 20:26:47.000000000 +0100
-+++ libnautilus-private/nautilus-monitor.h 2007-01-30 23:04:30.000000000 +0100
+--- libnautilus-private/nautilus-monitor.h.orig 2007-04-10 14:06:07.000000000 +0200
++++ libnautilus-private/nautilus-monitor.h 2007-04-26 00:30:58.445332000 +0200
@@ -30,6 +30,7 @@
typedef struct NautilusMonitor NautilusMonitor;
@@ -63,9 +63,9 @@
NautilusMonitor *nautilus_monitor_directory (const char *uri);
Index: src/nautilus-application.c
===================================================================
---- src/nautilus-application.c.orig 2006-11-07 11:44:15.000000000 +0100
-+++ src/nautilus-application.c 2007-01-30 23:04:30.000000000 +0100
-@@ -237,7 +237,7 @@
+--- src/nautilus-application.c.orig 2007-04-10 14:05:31.000000000 +0200
++++ src/nautilus-application.c 2007-04-26 00:30:58.445332000 +0200
+@@ -239,7 +239,7 @@
}
static gboolean
@@ -74,7 +74,7 @@
{
char *user_directory;
char *desktop_directory;
-@@ -250,20 +250,24 @@
+@@ -252,20 +252,24 @@
g_assert (NAUTILUS_IS_APPLICATION (application));
@@ -107,7 +107,7 @@
failed_count = eel_string_list_get_length (directories);
-@@ -392,7 +396,7 @@
+@@ -394,7 +398,7 @@
}
static void
@@ -116,7 +116,7 @@
{
/* initialize nautilus modules */
nautilus_module_init ();
-@@ -408,8 +412,9 @@
+@@ -410,8 +414,9 @@
/* Make the desktop work with old Nautilus. */
migrate_old_nautilus_files ();
@@ -128,7 +128,7 @@
}
static void
-@@ -512,7 +517,7 @@
+@@ -514,7 +519,7 @@
/* Check the user's ~/.nautilus directories and post warnings
* if there are problems.
*/
@@ -137,7 +137,7 @@
return;
}
-@@ -530,7 +535,7 @@
+@@ -532,7 +537,7 @@
case Bonobo_ACTIVATION_REG_SUCCESS:
/* We are registered and all is right with the world. */
application->shell_registered = TRUE;
Modified: desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch (original)
+++ desktop/unstable/nautilus/debian/patches/07_desktop_file_activation.patch Wed Apr 25 22:32:56 2007
@@ -1,7 +1,7 @@
-Index: nautilus-2.16.3/libnautilus-private/nautilus-file.c
+Index: nautilus-2.18.1/libnautilus-private/nautilus-file.c
===================================================================
---- nautilus-2.16.3.orig/libnautilus-private/nautilus-file.c 2007-02-17 00:16:10.000000000 +0100
-+++ nautilus-2.16.3/libnautilus-private/nautilus-file.c 2007-02-18 17:31:07.000000000 +0100
+--- nautilus-2.18.1.orig/libnautilus-private/nautilus-file.c 2007-04-10 14:06:07.000000000 +0200
++++ nautilus-2.18.1/libnautilus-private/nautilus-file.c 2007-04-26 00:31:03.621655500 +0200
@@ -40,6 +40,7 @@
#include "nautilus-link-desktop-file.h"
#include "nautilus-metadata.h"
@@ -10,7 +10,7 @@
#include "nautilus-search-directory.h"
#include "nautilus-search-directory-file.h"
#include "nautilus-thumbnails.h"
-@@ -2735,6 +2736,33 @@
+@@ -2754,6 +2755,33 @@
monitor_remove, (file, client));
}
@@ -44,7 +44,7 @@
/* Return the uri associated with the passed-in file, which may not be
* the actual uri if the file is an desktop file or a nautilus
-@@ -2749,7 +2777,9 @@
+@@ -2768,7 +2796,9 @@
return NULL;
}
@@ -55,7 +55,7 @@
return g_strdup (file->details->activation_uri);
}
-@@ -5207,6 +5237,12 @@
+@@ -5226,6 +5256,12 @@
return nautilus_file_is_mime_type (file, "application/x-desktop");
}
@@ -68,11 +68,11 @@
/**
* nautilus_file_is_directory
*
-Index: nautilus-2.16.3/src/file-manager/fm-directory-view.c
+Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c
===================================================================
---- nautilus-2.16.3.orig/src/file-manager/fm-directory-view.c 2007-02-17 00:16:10.000000000 +0100
-+++ nautilus-2.16.3/src/file-manager/fm-directory-view.c 2007-02-18 17:21:06.000000000 +0100
-@@ -4571,7 +4571,8 @@
+--- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c 2007-04-26 00:30:47.528649750 +0200
++++ nautilus-2.18.1/src/file-manager/fm-directory-view.c 2007-04-26 00:31:03.625655750 +0200
+@@ -4606,7 +4606,8 @@
{
return (nautilus_file_is_directory (file) ||
NAUTILUS_IS_DESKTOP_ICON_FILE (file) ||
@@ -82,7 +82,7 @@
}
static ActivationAction
-@@ -4652,12 +4653,14 @@
+@@ -4687,12 +4688,14 @@
for (node = selection; node != NULL; node = node->next) {
file = NAUTILUS_FILE (node->data);
@@ -101,10 +101,10 @@
/* Only use the default app for open if there is not
a mime mismatch, otherwise we can't use it in the
open with menu */
-Index: nautilus-2.16.3/libnautilus-private/nautilus-file.h
+Index: nautilus-2.18.1/libnautilus-private/nautilus-file.h
===================================================================
---- nautilus-2.16.3.orig/libnautilus-private/nautilus-file.h 2007-02-18 17:09:51.000000000 +0100
-+++ nautilus-2.16.3/libnautilus-private/nautilus-file.h 2007-02-18 17:11:32.000000000 +0100
+--- nautilus-2.18.1.orig/libnautilus-private/nautilus-file.h 2007-04-10 14:06:07.000000000 +0200
++++ nautilus-2.18.1/libnautilus-private/nautilus-file.h 2007-04-26 00:31:03.629656000 +0200
@@ -155,6 +155,7 @@
char * nautilus_file_get_symbolic_link_target_uri (NautilusFile *file);
gboolean nautilus_file_is_broken_symbolic_link (NautilusFile *file);
Modified: desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch (original)
+++ desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch Wed Apr 25 22:32:56 2007
@@ -1,8 +1,8 @@
-Index: nautilus-2.14.3/libnautilus-private/apps_nautilus_preferences.schemas.in
-===================================================================
---- nautilus-2.14.3.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2006-01-11 23:40:26.000000000 +0100
-+++ nautilus-2.14.3/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-04-21 20:42:53.000000000 +0200
-@@ -704,6 +704,21 @@
+Index: nautilus-2.18.1/libnautilus-private/apps_nautilus_preferences.schemas.in
+===================================================================
+--- nautilus-2.18.1.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-04-10 14:06:07.000000000 +0200
++++ nautilus-2.18.1/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-04-26 00:31:10.438081500 +0200
+@@ -705,6 +705,21 @@
</locale>
</schema>
@@ -24,10 +24,10 @@
<schema>
<key>/schemas/apps/nautilus/preferences/start_with_sidebar</key>
<applyto>/apps/nautilus/preferences/start_with_sidebar</applyto>
-Index: nautilus-2.14.3/libnautilus-private/nautilus-global-preferences.c
-===================================================================
---- nautilus-2.14.3.orig/libnautilus-private/nautilus-global-preferences.c 2006-03-18 08:13:49.000000000 +0100
-+++ nautilus-2.14.3/libnautilus-private/nautilus-global-preferences.c 2007-04-21 20:42:53.000000000 +0200
+Index: nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.c
+===================================================================
+--- nautilus-2.18.1.orig/libnautilus-private/nautilus-global-preferences.c 2007-04-10 14:06:07.000000000 +0200
++++ nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.c 2007-04-26 00:31:10.438081500 +0200
@@ -376,6 +376,10 @@
PREFERENCE_BOOLEAN,
GINT_TO_POINTER (TRUE)
@@ -39,10 +39,10 @@
{ NAUTILUS_PREFERENCES_START_WITH_SIDEBAR,
PREFERENCE_BOOLEAN,
GINT_TO_POINTER (TRUE)
-Index: nautilus-2.14.3/libnautilus-private/nautilus-global-preferences.h
-===================================================================
---- nautilus-2.14.3.orig/libnautilus-private/nautilus-global-preferences.h 2005-12-15 15:32:57.000000000 +0100
-+++ nautilus-2.14.3/libnautilus-private/nautilus-global-preferences.h 2007-04-21 20:42:53.000000000 +0200
+Index: nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.h
+===================================================================
+--- nautilus-2.18.1.orig/libnautilus-private/nautilus-global-preferences.h 2007-04-10 14:06:07.000000000 +0200
++++ nautilus-2.18.1/libnautilus-private/nautilus-global-preferences.h 2007-04-26 00:31:10.438081500 +0200
@@ -84,6 +84,7 @@
#define NAUTILUS_PREFERENCES_START_WITH_LOCATION_BAR "preferences/start_with_location_bar"
#define NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY "preferences/always_use_location_entry"
@@ -51,11 +51,11 @@
#define NAUTILUS_PREFERENCES_START_WITH_SIDEBAR "preferences/start_with_sidebar"
#define NAUTILUS_PREFERENCES_START_WITH_TOOLBAR "preferences/start_with_toolbar"
#define NAUTILUS_PREFERENCES_SIDE_PANE_VIEW "preferences/side_pane_view"
-Index: nautilus-2.14.3/src/nautilus-navigation-window.c
-===================================================================
---- nautilus-2.14.3.orig/src/nautilus-navigation-window.c 2006-03-18 08:13:50.000000000 +0100
-+++ nautilus-2.14.3/src/nautilus-navigation-window.c 2007-04-21 20:53:23.000000000 +0200
-@@ -813,20 +813,25 @@
+Index: nautilus-2.18.1/src/nautilus-navigation-window.c
+===================================================================
+--- nautilus-2.18.1.orig/src/nautilus-navigation-window.c 2007-04-10 14:05:31.000000000 +0200
++++ nautilus-2.18.1/src/nautilus-navigation-window.c 2007-04-26 00:31:10.438081500 +0200
+@@ -921,20 +921,25 @@
static gboolean
real_set_title (NautilusWindow *window, const char *title)
{
@@ -84,11 +84,11 @@
}
return changed;
-Index: nautilus-2.14.3/src/nautilus-spatial-window.c
-===================================================================
---- nautilus-2.14.3.orig/src/nautilus-spatial-window.c 2006-04-14 13:57:23.000000000 +0200
-+++ nautilus-2.14.3/src/nautilus-spatial-window.c 2007-04-21 20:52:36.000000000 +0200
-@@ -406,10 +406,14 @@
+Index: nautilus-2.18.1/src/nautilus-spatial-window.c
+===================================================================
+--- nautilus-2.18.1.orig/src/nautilus-spatial-window.c 2007-04-10 14:05:31.000000000 +0200
++++ nautilus-2.18.1/src/nautilus-spatial-window.c 2007-04-26 00:31:10.442081750 +0200
+@@ -414,10 +414,14 @@
gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
} else if (changed) {
char *window_title;
@@ -104,11 +104,19 @@
}
return changed;
-Index: nautilus-2.14.3/src/nautilus-window.c
-===================================================================
---- nautilus-2.14.3.orig/src/nautilus-window.c 2006-03-20 19:40:38.000000000 +0100
-+++ nautilus-2.14.3/src/nautilus-window.c 2007-04-21 21:17:49.000000000 +0200
-@@ -1638,3 +1638,90 @@
+Index: nautilus-2.18.1/src/nautilus-window.c
+===================================================================
+--- nautilus-2.18.1.orig/src/nautilus-window.c 2007-04-10 14:05:31.000000000 +0200
++++ nautilus-2.18.1/src/nautilus-window.c 2007-04-26 00:31:47.692409750 +0200
+@@ -57,6 +57,7 @@
+ #include <X11/XF86keysym.h>
+ #endif
+ #include <libgnomevfs/gnome-vfs-uri.h>
++#include <libgnomevfs/gnome-vfs-utils.h>
+ #include <libnautilus-private/nautilus-file-utilities.h>
+ #include <libnautilus-private/nautilus-file-attributes.h>
+ #include <libnautilus-private/nautilus-global-preferences.h>
+@@ -1705,3 +1706,90 @@
{
return (nautilus_window_get_window_type (window) != NAUTILUS_WINDOW_DESKTOP);
}
@@ -199,10 +207,10 @@
+
+ return (location_title);
+}
-Index: nautilus-2.14.3/src/nautilus-window.h
-===================================================================
---- nautilus-2.14.3.orig/src/nautilus-window.h 2006-03-20 19:40:38.000000000 +0100
-+++ nautilus-2.14.3/src/nautilus-window.h 2007-04-21 20:42:53.000000000 +0200
+Index: nautilus-2.18.1/src/nautilus-window.h
+===================================================================
+--- nautilus-2.18.1.orig/src/nautilus-window.h 2007-04-10 14:05:31.000000000 +0200
++++ nautilus-2.18.1/src/nautilus-window.h 2007-04-26 00:31:10.442081750 +0200
@@ -151,5 +151,7 @@
void nautilus_window_add_extra_location_widget (NautilusWindow *window,
GtkWidget *widget);
Modified: desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch (original)
+++ desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch Wed Apr 25 22:32:56 2007
@@ -1,7 +1,8 @@
-diff -Nur nautilus-2.13.92/libnautilus-private/nautilus-desktop-link-monitor.c nautilus-2.13.92.new/libnautilus-private/nautilus-desktop-link-monitor.c
---- nautilus-2.13.92/libnautilus-private/nautilus-desktop-link-monitor.c 2006-03-03 13:54:06.000000000 +0100
-+++ nautilus-2.13.92.new/libnautilus-private/nautilus-desktop-link-monitor.c 2006-03-03 13:58:06.000000000 +0100
-@@ -108,6 +108,8 @@
+Index: nautilus-2.18.1/libnautilus-private/nautilus-desktop-link-monitor.c
+===================================================================
+--- nautilus-2.18.1.orig/libnautilus-private/nautilus-desktop-link-monitor.c 2007-04-10 14:06:07.000000000 +0200
++++ nautilus-2.18.1/libnautilus-private/nautilus-desktop-link-monitor.c 2007-04-26 00:31:52.720724000 +0200
+@@ -107,6 +107,8 @@
GnomeVFSVolume *volume;
char *dialog_str;
char *display_name;
@@ -10,7 +11,7 @@
volume = nautilus_desktop_link_get_volume (link);
-@@ -117,7 +119,13 @@
+@@ -116,7 +118,13 @@
display_name);
g_free (display_name);
@@ -25,10 +26,11 @@
eel_run_simple_dialog
(parent_view,
FALSE,
-diff -Nur nautilus-2.13.92/src/file-manager/fm-directory-view.c nautilus-2.13.92.new/src/file-manager/fm-directory-view.c
---- nautilus-2.13.92/src/file-manager/fm-directory-view.c 2006-03-03 13:54:06.000000000 +0100
-+++ nautilus-2.13.92.new/src/file-manager/fm-directory-view.c 2006-03-03 14:00:03.000000000 +0100
-@@ -7017,10 +7017,14 @@
+Index: nautilus-2.18.1/src/file-manager/fm-directory-view.c
+===================================================================
+--- nautilus-2.18.1.orig/src/file-manager/fm-directory-view.c 2007-04-26 00:31:03.625655750 +0200
++++ nautilus-2.18.1/src/file-manager/fm-directory-view.c 2007-04-26 00:31:52.728724500 +0200
+@@ -7266,10 +7266,14 @@
*show_unmount = TRUE;
volume = nautilus_file_get_volume (file);
@@ -45,10 +47,11 @@
if (gnome_vfs_drive_is_mounted (drive)) {
*show_unmount = TRUE;
} else {
-diff -Nur nautilus-2.13.92/src/file-manager/fm-tree-view.c nautilus-2.13.92.new/src/file-manager/fm-tree-view.c
---- nautilus-2.13.92/src/file-manager/fm-tree-view.c 2006-02-21 11:38:01.000000000 +0100
-+++ nautilus-2.13.92.new/src/file-manager/fm-tree-view.c 2006-03-03 14:05:46.000000000 +0100
-@@ -741,8 +741,12 @@
+Index: nautilus-2.18.1/src/file-manager/fm-tree-view.c
+===================================================================
+--- nautilus-2.18.1.orig/src/file-manager/fm-tree-view.c 2007-04-10 14:05:29.000000000 +0200
++++ nautilus-2.18.1/src/file-manager/fm-tree-view.c 2007-04-26 00:31:52.728724500 +0200
+@@ -804,8 +804,12 @@
volume = fm_tree_model_get_volume_for_root_node_file (view->details->child_model, view->details->popup_file);
if (volume) {
@@ -62,7 +65,7 @@
}
gtk_label_set_text (GTK_LABEL (GTK_BIN (GTK_MENU_ITEM (view->details->popup_unmount))->child),
-@@ -1081,7 +1085,15 @@
+@@ -1230,7 +1234,15 @@
volume = fm_tree_model_get_volume_for_root_node_file (view->details->child_model, file);
if (volume != NULL) {
@@ -78,4 +81,4 @@
+ if (eject) {
gnome_vfs_volume_eject (volume, volume_or_drive_unmounted_callback, GINT_TO_POINTER (TRUE));
} else {
- gnome_vfs_volume_unmount (volume, volume_or_drive_unmounted_callback, GINT_TO_POINTER (FALSE));
+ nautilus_file_operations_unmount_volume (GTK_WIDGET (view), volume,
Modified: desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch?rev=10453&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch (original)
+++ desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch Wed Apr 25 22:32:56 2007
@@ -1,11 +1,8 @@
Index: libnautilus-private/nautilus-dnd.c
===================================================================
-RCS file: /cvs/gnome/nautilus/libnautilus-private/nautilus-dnd.c,v
-retrieving revision 1.24
-diff -u -p -r1.24 nautilus-dnd.c
---- libnautilus-private/nautilus-dnd.c 18 Mar 2006 07:13:49 -0000 1.24
-+++ libnautilus-private/nautilus-dnd.c 20 Apr 2006 11:19:18 -0000
-@@ -302,6 +302,26 @@ nautilus_drag_default_drop_action_for_ur
+--- libnautilus-private/nautilus-dnd.c.orig 2007-04-10 14:06:07.000000000 +0200
++++ libnautilus-private/nautilus-dnd.c 2007-04-26 00:31:56.596966250 +0200
+@@ -303,6 +303,26 @@
return context->suggested_action;
}
@@ -32,7 +29,7 @@
void
nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
-@@ -385,11 +405,12 @@ nautilus_drag_default_drop_action_for_ic
+@@ -386,11 +406,12 @@
if (dropped_uri != NULL) {
gnome_vfs_check_same_fs_uris (dropped_uri, target_uri, &same_fs);
target_is_source_parent = gnome_vfs_uri_is_parent (target_uri, dropped_uri, FALSE);
@@ -49,7 +46,7 @@
if (actions & GDK_ACTION_MOVE) {
*action = GDK_ACTION_MOVE;
} else {
-@@ -402,6 +423,15 @@ nautilus_drag_default_drop_action_for_ic
+@@ -403,6 +424,15 @@
*action = context->suggested_action;
}
}
More information about the pkg-gnome-commits
mailing list