r10343 - in /desktop/unstable/nautilus/debian: ./ patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Apr 24 22:57:28 UTC 2007
Author: slomo
Date: Tue Apr 24 22:57:27 2007
New Revision: 10343
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10343
Log:
* Upload to unstable, drop check-dist include.
* New upstream release:
+ Update build dependency on libgnome2-dev to >= 2.14.0 and add
x11proto-core-dev for the multimedia keys support.
+ Bump shlibs to 2.17.90.
+ Fix URL in the watch file.
+ Dropped 02_umask.patch,
09_connect_server_iter.patch, merged upstream.
+ Dropped 11_umount-progress-bar.patch, this is obsolete now that
gnome-volume-manager and gnome-vfs use gnome-mount, which displays
a notification bubble. See Gnome #313639.
+ Add icons to nautilus-data.install.
* 11_gnomevfs_query_eject.patch: Patch taken from Ubuntu. Use gnomevfs'
gnome_vfs_drive_needs_eject() function instead of just looking at the
drive type. This keeps umount/eject consistent and keeps it configurable
with the HAL policies.
* 20_upstream_nautilus-dnd-user-owned.patch: Patch taken from Ubuntu.
Use copy instead of move when using DND and the destination is owned by
someone else. See Gnome #339154.
* 10_location_titlebar.patch: Updated with the latest patch from
Gnome #142087.
Added:
desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch
desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch
Removed:
desktop/unstable/nautilus/debian/patches/02_umask.patch
desktop/unstable/nautilus/debian/patches/09_connect_server_iter.patch
desktop/unstable/nautilus/debian/patches/11_umount-progress-bar.patch
desktop/unstable/nautilus/debian/patches/33_directory-null-vfs-uri.patch
Modified:
desktop/unstable/nautilus/debian/changelog
desktop/unstable/nautilus/debian/control
desktop/unstable/nautilus/debian/control.in
desktop/unstable/nautilus/debian/nautilus-data.install
desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch
desktop/unstable/nautilus/debian/patches/series
desktop/unstable/nautilus/debian/rules
desktop/unstable/nautilus/debian/watch
Modified: desktop/unstable/nautilus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/changelog?rev=10343&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/changelog (original)
+++ desktop/unstable/nautilus/debian/changelog Tue Apr 24 22:57:27 2007
@@ -1,4 +1,4 @@
-nautilus (2.16.3-6) UNRELEASED; urgency=low
+nautilus (2.18.1-1) unstable; urgency=low
[ Josselin Mouette ]
* 10_location_titlebar.patch: patch from Adrien Delle Cave to display
@@ -8,11 +8,29 @@
destination are strictly the same (closes: #419525).
[ Sebastian Dröge ]
- * Merge 2.14.3-11:
- [ Loic Minier ]
- + New patch, 33_directory-null-vfs-uri, prevents crash when vfs_uri is NULL; GNOME #320020.
-
- -- Sebastian Dröge <slomo at debian.org> Tue, 24 Apr 2007 22:36:01 +0200
+ * Upload to unstable, drop check-dist include.
+ * New upstream release:
+ + Update build dependency on libgnome2-dev to >= 2.14.0 and add
+ x11proto-core-dev for the multimedia keys support.
+ + Bump shlibs to 2.17.90.
+ + Fix URL in the watch file.
+ + Dropped 02_umask.patch,
+ 09_connect_server_iter.patch, merged upstream.
+ + Dropped 11_umount-progress-bar.patch, this is obsolete now that
+ gnome-volume-manager and gnome-vfs use gnome-mount, which displays
+ a notification bubble. See Gnome #313639.
+ + Add icons to nautilus-data.install.
+ * 11_gnomevfs_query_eject.patch: Patch taken from Ubuntu. Use gnomevfs'
+ gnome_vfs_drive_needs_eject() function instead of just looking at the
+ drive type. This keeps umount/eject consistent and keeps it configurable
+ with the HAL policies.
+ * 20_upstream_nautilus-dnd-user-owned.patch: Patch taken from Ubuntu.
+ Use copy instead of move when using DND and the destination is owned by
+ someone else. See Gnome #339154.
+ * 10_location_titlebar.patch: Updated with the latest patch from
+ Gnome #142087.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 24 Apr 2007 22:38:54 +0200
nautilus (2.16.3-5) experimental; urgency=low
Modified: desktop/unstable/nautilus/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control?rev=10343&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control (original)
+++ desktop/unstable/nautilus/debian/control Tue Apr 24 22:57:27 2007
@@ -2,8 +2,8 @@
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Kilian Krause <kilian at debian.org>, Loic Minier <lool at dooz.org>, Marc 'HE' Brockschmidt <he at debian.org>, Marco Cabizza <marco87 at gmail.com>, Oystein Gisnas <oystein at gisnas.net>, Ondřej Surý <ondrej at debian.org>, Ross Burton <ross at debian.org>, Sebastien Bacher <seb128 at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.35), quilt, gettext, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libbonobo2-dev (>= 2.15), libgnomevfs2-dev (>= 1:2.16.0-1), libeel2-dev (>= 2.16.0), librsvg2-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libgconf2-dev (>= 2.6.1-2), librsvg2-common (>= 2.16.0-2), desktop-base (>= 0.2), libxml-parser-perl, gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libart-2.0-dev (>= 2.3.10), liborbit2-dev (>= 2.4.0), libxml2-dev (>= 2.4.7), libstartup-notification0-dev (>= 0.8), docbook-utils, libselinux1-dev, libglib2.0-dev (>= 2.6.0), libgnome2-dev (>= 2.1.1), libpango1.0-dev (>= 1.1.2)
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.35), quilt, gettext, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libbonobo2-dev (>= 2.15), libgnomevfs2-dev (>= 1:2.16.0-1), libeel2-dev (>= 2.16.0), librsvg2-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libgconf2-dev (>= 2.6.1-2), librsvg2-common (>= 2.16.0-2), desktop-base (>= 0.2), libxml-parser-perl, gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libart-2.0-dev (>= 2.3.10), liborbit2-dev (>= 2.4.0), libxml2-dev (>= 2.4.7), libstartup-notification0-dev (>= 0.8), docbook-utils, libselinux1-dev, libglib2.0-dev (>= 2.6.0), libgnome2-dev (>= 2.14.0), libpango1.0-dev (>= 1.1.2), x11proto-core-dev
Standards-Version: 3.7.2
Package: nautilus
Modified: desktop/unstable/nautilus/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/control.in?rev=10343&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/control.in (original)
+++ desktop/unstable/nautilus/debian/control.in Tue Apr 24 22:57:27 2007
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 5), cdbs (>= 0.4.35), quilt, gettext, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libbonobo2-dev (>= 2.15), libgnomevfs2-dev (>= 1:2.16.0-1), libeel2-dev (>= 2.16.0), librsvg2-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libgconf2-dev (>= 2.6.1-2), librsvg2-common (>= 2.16.0-2), desktop-base (>= 0.2), libxml-parser-perl, gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libart-2.0-dev (>= 2.3.10), liborbit2-dev (>= 2.4.0), libxml2-dev (>= 2.4.7), libstartup-notification0-dev (>= 0.8), docbook-utils, libselinux1-dev, libglib2.0-dev (>= 2.6.0), libgnome2-dev (>= 2.1.1), libpango1.0-dev (>= 1.1.2)
+Build-Depends: debhelper (>= 5), cdbs (>= 0.4.35), quilt, gettext, libgtk2.0-dev (>= 2.10.0), libgnomeui-dev (>= 2.16.0-2), libbonobo2-dev (>= 2.15), libgnomevfs2-dev (>= 1:2.16.0-1), libeel2-dev (>= 2.16.0), librsvg2-dev (>= 2.16.0-2), libgnome-desktop-dev (>= 2.9.91), libesd0-dev (>= 0.2.27), libgconf2-dev (>= 2.6.1-2), librsvg2-common (>= 2.16.0-2), desktop-base (>= 0.2), libxml-parser-perl, gnome-pkg-tools (>= 0.10), dpkg-dev (>= 1.13.19), libxt-dev, libexif-dev (>= 0.6.12), libart-2.0-dev (>= 2.3.10), liborbit2-dev (>= 2.4.0), libxml2-dev (>= 2.4.7), libstartup-notification0-dev (>= 0.8), docbook-utils, libselinux1-dev, libglib2.0-dev (>= 2.6.0), libgnome2-dev (>= 2.14.0), libpango1.0-dev (>= 1.1.2), x11proto-core-dev
Standards-Version: 3.7.2
Package: nautilus
Modified: desktop/unstable/nautilus/debian/nautilus-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/nautilus-data.install?rev=10343&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/nautilus-data.install (original)
+++ desktop/unstable/nautilus/debian/nautilus-data.install Tue Apr 24 22:57:27 2007
@@ -1,5 +1,6 @@
debian/tmp/etc
debian/tmp/usr/lib/bonobo
+debian/tmp/usr/share/icons/hicolor
debian/tmp/usr/share/nautilus
debian/tmp/usr/share/locale
debian/tmp/usr/share/mime/packages/nautilus.xml
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=10343&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch (original)
+++ desktop/unstable/nautilus/debian/patches/10_location_titlebar.patch Tue Apr 24 22:57:27 2007
@@ -1,11 +1,11 @@
-Index: nautilus-2.16.3/libnautilus-private/apps_nautilus_preferences.schemas.in
-===================================================================
---- nautilus-2.16.3.orig/libnautilus-private/apps_nautilus_preferences.schemas.in 2006-06-15 11:38:40.000000000 +0200
-+++ nautilus-2.16.3/libnautilus-private/apps_nautilus_preferences.schemas.in 2007-03-03 22:39:32.000000000 +0100
-@@ -720,6 +720,21 @@
+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 @@
</locale>
</schema>
-
+
+ <schema>
+ <key>/schemas/apps/nautilus/preferences/location_in_title_bar</key>
+ <applyto>/apps/nautilus/preferences/location_in_title_bar</applyto>
@@ -15,19 +15,19 @@
+ <locale name="C">
+ <short>Show current location in title bar</short>
+ <long>
-+ If set to true, windows will have the full location displayed
-+ in their title bar. Otherwise it will only show the folder name.
++ If set to true, windows will have the full location displayed
++ in their title bar. Otherwise it will only show the folder name.
+ </long>
+ </locale>
+ </schema>
+
<schema>
- <key>/schemas/apps/nautilus/preferences/side_pane_view</key>
- <applyto>/apps/nautilus/preferences/side_pane_view</applyto>
-Index: nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.c
-===================================================================
---- nautilus-2.16.3.orig/libnautilus-private/nautilus-global-preferences.c 2006-07-21 19:18:56.000000000 +0200
-+++ nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.c 2007-03-03 22:40:31.000000000 +0100
+ <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
@@ -376,6 +376,10 @@
PREFERENCE_BOOLEAN,
GINT_TO_POINTER (TRUE)
@@ -39,23 +39,23 @@
{ NAUTILUS_PREFERENCES_START_WITH_SIDEBAR,
PREFERENCE_BOOLEAN,
GINT_TO_POINTER (TRUE)
-Index: nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.h
-===================================================================
---- nautilus-2.16.3.orig/libnautilus-private/nautilus-global-preferences.h 2006-07-21 19:18:56.000000000 +0200
-+++ nautilus-2.16.3/libnautilus-private/nautilus-global-preferences.h 2007-03-03 22:41:48.000000000 +0100
+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
@@ -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"
#define NAUTILUS_PREFERENCES_START_WITH_STATUS_BAR "preferences/start_with_status_bar"
-+#define NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR "preferences/location_in_title_bar"
++#define NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR "preferences/location_in_title_bar"
#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.16.3/src/nautilus-navigation-window.c
-===================================================================
---- nautilus-2.16.3.orig/src/nautilus-navigation-window.c 2006-10-02 12:53:45.000000000 +0200
-+++ nautilus-2.16.3/src/nautilus-navigation-window.c 2007-03-03 23:20:34.000000000 +0100
-@@ -895,20 +895,32 @@
+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 @@
static gboolean
real_set_title (NautilusWindow *window, const char *title)
{
@@ -67,53 +67,147 @@
(NAUTILUS_WINDOW_CLASS, set_title, (window, title));
if (changed) {
+- full_title = g_strdup_printf (_("%s - File Browser"), title);
+ char *full_title;
+ char *window_title;
-+ char *tmp_title = NULL;
-+ char *uri = NULL;
-+ char *location;
-+
-+ if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) &&
-+ (uri = nautilus_window_get_location (NAUTILUS_WINDOW (window))) != NULL &&
-+ (location = gnome_vfs_format_uri_for_display(uri)) != NULL) {
-+ title = tmp_title = g_strdup_printf("%s (%s)",title,location);
-+ g_free (location);
-+ }
- full_title = g_strdup_printf (_("%s - File Browser"), title);
++ char *location_titlebar;
++
++ location_titlebar = nautilus_window_set_location_in_titlebar (window, title);
++
++ full_title = g_strdup_printf (_("%s - File Browser"), location_titlebar);
window_title = eel_str_middle_truncate (full_title, MAX_TITLE_LENGTH);
gtk_window_set_title (GTK_WINDOW (window), window_title);
g_free (window_title);
g_free (full_title);
-+ g_free (tmp_title);
-+ g_free (uri);
++ g_free (location_titlebar);
}
return changed;
-Index: nautilus-2.16.3/src/nautilus-spatial-window.c
-===================================================================
---- nautilus-2.16.3.orig/src/nautilus-spatial-window.c 2006-08-07 12:34:31.000000000 +0200
-+++ nautilus-2.16.3/src/nautilus-spatial-window.c 2007-03-03 23:20:19.000000000 +0100
-@@ -424,10 +424,22 @@
+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 @@
gtk_window_set_title (GTK_WINDOW (window), _("Nautilus"));
} else if (changed) {
char *window_title;
-+ char *tmp_title = NULL;
-+ char *uri = NULL;
-+ char *location;
-+
-+ if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) &&
-+ (uri = nautilus_window_get_location (NAUTILUS_WINDOW (window))) != NULL &&
-+ (location = gnome_vfs_format_uri_for_display(uri)) != NULL) {
-+ title = tmp_title = g_strdup_printf("%s (%s)",title,location);
-+ g_free (location);
-+ }
-
- window_title = eel_str_middle_truncate (title, MAX_TITLE_LENGTH);
++ char *location_titlebar;
+
+- window_title = eel_str_middle_truncate (title, MAX_TITLE_LENGTH);
++ location_titlebar = nautilus_window_set_location_in_titlebar (window, title);
++
++ window_title = eel_str_middle_truncate (location_titlebar, MAX_TITLE_LENGTH);
gtk_window_set_title (GTK_WINDOW (window), window_title);
g_free (window_title);
-+ g_free (tmp_title);
-+ g_free (uri);
++ g_free (location_titlebar);
}
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 @@
+ {
+ return (nautilus_window_get_window_type (window) != NAUTILUS_WINDOW_DESKTOP);
+ }
++
++char *
++nautilus_window_set_location_in_titlebar (NautilusWindow *window, const char *title)
++{
++ char *location_title;
++ char *uri = NULL;
++ char *location = NULL;
++ GnomeVFSURI *vfs_uri = NULL;
++ const char *path;
++ const char *scheme = NULL;
++ const char *display_location;
++ const char *tmp_location;
++ const char *location_prefix;
++ int tmp_location_len;
++ int tilde = 0;
++
++ location_title = g_strdup (title);
++
++ if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_LOCATION_IN_TITLE_BAR) != TRUE
++ || (uri = nautilus_window_get_location (window)) == NULL
++ || (location = gnome_vfs_format_uri_for_display (uri)) == NULL
++ || location[0] == 0
++ || location[1] == 0)
++ goto done;
++
++ if (location[0] != GNOME_VFS_URI_PATH_CHR) {
++ if ((vfs_uri = gnome_vfs_uri_new (location)) == NULL
++ || (path = gnome_vfs_uri_get_path (vfs_uri)) == NULL
++ || (scheme = gnome_vfs_uri_get_scheme (vfs_uri)) == NULL
++ || path[0] == 0
++ || strcmp (path, GNOME_VFS_URI_PATH_STR) == 0)
++ goto done;
++
++ g_free(uri);
++
++ uri = gnome_vfs_unescape_string_for_display (path);
++
++ display_location = uri;
++ goto construct_title;
++ }
++
++ if ((tmp_location = g_get_home_dir()) == NULL) {
++ display_location = location;
++ goto construct_title;
++ }
++
++ if (strcmp (location, tmp_location) == 0) {
++ tilde = 1;
++ display_location = "";
++ goto construct_title;
++ }
++
++ tmp_location_len = strlen (tmp_location);
++ if (eel_str_has_prefix (location, tmp_location) == FALSE
++ || location[tmp_location_len] != GNOME_VFS_URI_PATH_CHR) {
++ display_location = location;
++ goto construct_title;
++ }
++
++ tilde = 1;
++ display_location = location + tmp_location_len;
++
++ construct_title:
++
++ g_free (location_title);
++
++ if(scheme != NULL)
++ location_prefix = scheme;
++ else if(tilde == 1)
++ location_prefix = "~";
++ else
++ location_prefix = "";
++
++ location_title = g_strdup_printf ("%s (%s%s%s)", title, location_prefix, scheme != NULL ? " - " : "", display_location);
++
++ done:
++ if (uri != NULL)
++ g_free (uri);
++
++ if (location != NULL)
++ g_free (location);
++
++ if (vfs_uri != NULL)
++ gnome_vfs_uri_unref (vfs_uri);
++
++ 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
+@@ -151,5 +151,7 @@
+ void nautilus_window_add_extra_location_widget (NautilusWindow *window,
+ GtkWidget *widget);
+ gboolean nautilus_window_has_menubar_and_statusbar (NautilusWindow *window);
++char * nautilus_window_set_location_in_titlebar (NautilusWindow *window,
++ const char *title);
+
+ #endif
Added: 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=10343&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch (added)
+++ desktop/unstable/nautilus/debian/patches/11_gnomevfs_query_eject.patch Tue Apr 24 22:57:27 2007
@@ -1,0 +1,81 @@
+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 @@
+ GnomeVFSVolume *volume;
+ char *dialog_str;
+ char *display_name;
++ GnomeVFSDrive *drive;
++ gboolean eject;
+
+ volume = nautilus_desktop_link_get_volume (link);
+
+@@ -117,7 +119,13 @@
+ display_name);
+ g_free (display_name);
+
+- if (eject_for_type (gnome_vfs_volume_get_device_type (volume))) {
++ drive = gnome_vfs_volume_get_drive (volume);
++ if (drive)
++ eject = gnome_vfs_drive_needs_eject (drive);
++ else
++ eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
++
++ if (eject) {
+ 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 @@
+ *show_unmount = TRUE;
+
+ volume = nautilus_file_get_volume (file);
+- *show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
++ drive = gnome_vfs_volume_get_drive (volume);
++ if (drive)
++ *show_eject = gnome_vfs_drive_needs_eject (drive);
++ else
++ *show_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
+ } else if (nautilus_file_has_drive (file)) {
+ drive = nautilus_file_get_drive (file);
+- *show_eject = eject_for_type (gnome_vfs_drive_get_device_type (drive));
++ *show_eject = gnome_vfs_drive_needs_eject (drive);
+ 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 @@
+
+ volume = fm_tree_model_get_volume_for_root_node_file (view->details->child_model, view->details->popup_file);
+ if (volume) {
++ GnomeVFSDrive *drive = gnome_vfs_volume_get_drive (volume);
+ show_unmount = TRUE;
+- unmount_is_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
++ if (drive)
++ unmount_is_eject = gnome_vfs_drive_needs_eject (drive);
++ else
++ unmount_is_eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
+ }
+
+ gtk_label_set_text (GTK_LABEL (GTK_BIN (GTK_MENU_ITEM (view->details->popup_unmount))->child),
+@@ -1081,7 +1085,15 @@
+ volume = fm_tree_model_get_volume_for_root_node_file (view->details->child_model, file);
+
+ if (volume != NULL) {
+- if (eject_for_type (gnome_vfs_volume_get_device_type (volume))) {
++ GnomeVFSDrive *drive = gnome_vfs_volume_get_drive (volume);
++ gboolean eject;
++
++ if (drive)
++ eject = gnome_vfs_drive_needs_eject (drive);
++ else
++ eject = eject_for_type (gnome_vfs_volume_get_device_type (volume));
++
++ 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));
Added: 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=10343&op=file
==============================================================================
--- desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch (added)
+++ desktop/unstable/nautilus/debian/patches/20_upstream_nautilus-dnd-user-owned.patch Tue Apr 24 22:57:27 2007
@@ -1,0 +1,67 @@
+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
+ return context->suggested_action;
+ }
+
++static gboolean
++uri_is_user_owned (GnomeVFSURI *uri)
++{
++ gboolean user_owned;
++
++ user_owned = FALSE;
++
++ if (uri != NULL && !strcmp (gnome_vfs_uri_get_scheme (uri), "file")) {
++ GnomeVFSFileInfo *info;
++
++ info = gnome_vfs_file_info_new ();
++ if (gnome_vfs_get_file_info_uri (uri, info, GNOME_VFS_FILE_INFO_GET_ACCESS_RIGHTS) == GNOME_VFS_OK) {
++ user_owned = (info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_IDS) &&
++ geteuid () == info->uid;
++ }
++ gnome_vfs_file_info_unref (info);
++ }
++
++ return user_owned;
++}
+
+ void
+ nautilus_drag_default_drop_action_for_icons (GdkDragContext *context,
+@@ -385,11 +405,12 @@ nautilus_drag_default_drop_action_for_ic
+ 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);
+- gnome_vfs_uri_unref (dropped_uri);
+ }
+- gnome_vfs_uri_unref (target_uri);
+-
+- if (same_fs || target_is_source_parent) {
++
++ if ((same_fs || target_is_source_parent) &&
++ /* use copy by default when dragging from user-owned location
++ * to location owned by somebody else */
++ !(uri_is_user_owned (dropped_uri) && !uri_is_user_owned (target_uri))) {
+ if (actions & GDK_ACTION_MOVE) {
+ *action = GDK_ACTION_MOVE;
+ } else {
+@@ -402,6 +423,15 @@ nautilus_drag_default_drop_action_for_ic
+ *action = context->suggested_action;
+ }
+ }
++
++ if (dropped_uri != NULL) {
++ gnome_vfs_uri_unref (dropped_uri);
++ }
++
++ if (target_uri != NULL) {
++ gnome_vfs_uri_unref (target_uri);
++ }
++
+ }
+
+ /* Encode a "x-special/gnome-icon-list" selection.
Modified: desktop/unstable/nautilus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/patches/series?rev=10343&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/patches/series (original)
+++ desktop/unstable/nautilus/debian/patches/series Tue Apr 24 22:57:27 2007
@@ -1,11 +1,10 @@
01_prompt_same_file.patch
-02_umask.patch
03_sftp_connect.patch
04_show_backup_files.patch
05_places-sidebar_single-click.patch
06_dont_create_Desktop.patch -p0
07_desktop_file_activation.patch
08_folder_handler.patch
-09_connect_server_iter.patch
10_location_titlebar.patch
-11_umount-progress-bar.patch
+11_gnomevfs_query_eject.patch
+20_upstream_nautilus-dnd-user-owned.patch -p0
Modified: desktop/unstable/nautilus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/rules?rev=10343&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/rules (original)
+++ desktop/unstable/nautilus/debian/rules Tue Apr 24 22:57:27 2007
@@ -7,7 +7,6 @@
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
# debug lib
@@ -15,4 +14,4 @@
DEB_CONFIGURE_EXTRA_FLAGS += --libexecdir=/usr/lib/nautilus
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed"
-DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.15.90)'
+DEB_DH_MAKESHLIBS_ARGS_libnautilus-extension1 += -V 'libnautilus-extension1 (>= 2.17.90)'
Modified: desktop/unstable/nautilus/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/nautilus/debian/watch?rev=10343&op=diff
==============================================================================
--- desktop/unstable/nautilus/debian/watch (original)
+++ desktop/unstable/nautilus/debian/watch Tue Apr 24 22:57:27 2007
@@ -1,2 +1,4 @@
version=2
-http://ftp.gnome.org/pub/gnome/sources/bug-buddy/([\d\.]+)[02468]/bug-buddy-([\d\.]+)\.tar\.gz
+ftp://ftp.gnome.org/pub/GNOME/sources/nautilus/([\d\.]+)[02468]/ \
+ nautilus-(.*)\.tar\.gz \
+ debian uupdate
More information about the pkg-gnome-commits
mailing list