Hello community,
here is the log from the commit of package nautilus
checked in at Thu Nov 2 20:23:22 CET 2006.
--------
--- GNOME/nautilus/nautilus.changes 2006-10-31 20:22:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/nautilus/nautilus.changes 2006-11-01 20:23:24.000000000 +0100
@@ -1,0 +2,31 @@
+Wed Nov 1 19:58:44 CET 2006 - federico@novell.com
+
+- Removed nautilus-hide-desktop-files.patch. This was used for the
+ old "applications://" VFS scheme, which is deprecated now.
+- Removed nautilus-submount.patch, since we no longer use submount (subfs).
+- Removed nautilus-142860-vfs-drive-for-extensions.diff, since that
+ feature appeared upstream since Nautilus 2.14. This is what lets
+ Nautilus extensions look at the GnomeVFSDrive for a file, so that
+ they can install menu items specific to drives (e.g. like
+ nautilus-cd-burner).
+- Removed nautilus-172870-support-drives-and-volumes.diff and
+ nautilus-155010-desktop-volume-policy.diff, since they need to be
+ reworked for the code in Nautilus-2.16.
+- Added nautilus-6014-network-servers-in-places-sidebar.diff, to fix
+ the part of https://bugzilla.novell.com/show_bug.cgi?id=6014 that is
+ not yet in Nautilus 2.16. This adds a "Network Servers" item in the
+ Places sidebar.
+- Added nautilus-206369-desktop-icon-overlap.diff as an updated
+ and consolidated version of
+ nautilus-155337-icon-positioning-on-reload.diff and
+ nautilus-174766-fix-lazy-positioning.diff. This is to fix the bug
+ where desktop icons get overlapped or rearranged when a new volume
+ icon appears, or when the desktop is reloaded.
+- Added nautilus-drives-and-volumes-on-desktop.diff as a partly
+ updated version of nautilus-172870-support-drives-and-volumes.diff.
+- Added nautilus-debug-log.diff. This provides logging functionality
+ to aid debugging.
+- Updated descriptions inside the rest of the patches.
+- Renumbered patches.
+
+-------------------------------------------------------------------
Old:
----
nautilus-142860-vfs-drive-for-extensions.diff
nautilus-155010-desktop-volume-policy.diff
nautilus-155337-icon-positioning-on-reload.diff
nautilus-172870-support-drives-and-volumes.diff
nautilus-174766-fix-lazy-positioning.diff
nautilus-hide-desktop-files.patch
nautilus-submount.patch
New:
----
nautilus-206369-desktop-icon-overlap.diff
nautilus-6014-network-servers-in-places-sidebar.diff
nautilus-debug-log.diff
nautilus-drives-and-volumes-on-desktop.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus.spec ++++++
--- /var/tmp/diff_new_pack.2EcUMY/_old 2006-11-02 20:23:05.000000000 +0100
+++ /var/tmp/diff_new_pack.2EcUMY/_new 2006-11-02 20:23:05.000000000 +0100
@@ -18,30 +18,27 @@
Group: Productivity/File utilities
Autoreqprov: on
Version: 2.16.1
-Release: 14
+Release: 17
Summary: The GNOME 2.x Desktop File Manager
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.11/%{name}-%{version}.tar.bz2
URL: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch4: nautilus-config-defaults.patch
-Patch12: nautilus-hide-desktop-files.patch
-Patch13: nautilus-name-length.patch
-Patch20: nautilus-onlyshowin.patch
-Patch24: nautilus-search-desktop.patch
-Patch25: nautilus-submount.patch
-Patch27: nautilus-icon.patch
-Patch29: nautilus-docpath.patch
-Patch32: nautilus-disable-zoom-control-and-view-as-option-menu.patch
-Patch33: nautilus-default-thumbnail-size.diff
-Patch35: nautilus-146947-rename-bad-parameters-message.diff
-Patch39: nautilus-155337-icon-positioning-on-reload.diff
-Patch41: nautilus-mime.patch
-Patch42: nautilus-155010-desktop-volume-policy.diff
-Patch43: nautilus-158158-ignore-foreign-desktop-files.diff
-Patch46: nautilus-142860-vfs-drive-for-extensions.diff
-Patch49: nautilus-172870-support-drives-and-volumes.diff
-Patch50: nautilus-174766-fix-lazy-positioning.diff
-Patch51: nautilus-212649-search-bar-visibility.patch
+Patch1: nautilus-config-defaults.patch
+Patch2: nautilus-name-length.patch
+Patch3: nautilus-onlyshowin.patch
+Patch4: nautilus-search-desktop.patch
+Patch5: nautilus-icon.patch
+Patch6: nautilus-docpath.patch
+Patch7: nautilus-disable-zoom-control-and-view-as-option-menu.patch
+Patch8: nautilus-default-thumbnail-size.diff
+Patch9: nautilus-146947-rename-bad-parameters-message.diff
+Patch10: nautilus-mime.patch
+Patch11: nautilus-158158-ignore-foreign-desktop-files.diff
+Patch12: nautilus-212649-search-bar-visibility.patch
+Patch13: nautilus-6014-network-servers-in-places-sidebar.diff
+Patch14: nautilus-206369-desktop-icon-overlap.diff
+Patch15: nautilus-drives-and-volumes-on-desktop.diff
+Patch16: nautilus-debug-log.diff
PreReq: filesystem gconf2 shared-mime-info
Requires: gnome2-user-docs
Provides: nautilus2
@@ -70,27 +67,24 @@
%prep
%setup -q
gnome-patch-translation-prepare
-%patch4 -p1
-%patch12 -p0
-%patch13 -p0
-%patch20 -p1
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
%if ! %sles_version
-%patch24
+%patch4
%endif
-%patch25 -p1
-%patch27 -p1
-%patch29 -p0
-%patch32
-%patch33 -p1
-%patch35 -p0
-%patch39 -p1
-%patch41
-%patch42 -p0
-%patch43 -p1
-%patch46 -p1
-#%patch49 -p1
-%patch50 -p1
-%patch51
+%patch5 -p1
+%patch6 -p0
+%patch7
+%patch8 -p1
+%patch9 -p0
+%patch10
+%patch11 -p1
+%patch12
+%patch13 -p1
+%patch14 -p1
+%patch15 -p0
+%patch16 -p0
# FIXME: this code updates translation for upstreamed patches.
cd po
intltool-update --pot
@@ -175,6 +169,34 @@
%{prefix}/%_lib/pkgconfig/*.pc
%changelog -n nautilus
+* Wed Nov 01 2006 - federico@novell.com
+- Removed nautilus-hide-desktop-files.patch. This was used for the
+ old "applications://" VFS scheme, which is deprecated now.
+- Removed nautilus-submount.patch, since we no longer use submount (subfs).
+- Removed nautilus-142860-vfs-drive-for-extensions.diff, since that
+ feature appeared upstream since Nautilus 2.14. This is what lets
+ Nautilus extensions look at the GnomeVFSDrive for a file, so that
+ they can install menu items specific to drives (e.g. like
+ nautilus-cd-burner).
+- Removed nautilus-172870-support-drives-and-volumes.diff and
+ nautilus-155010-desktop-volume-policy.diff, since they need to be
+ reworked for the code in Nautilus-2.16.
+- Added nautilus-6014-network-servers-in-places-sidebar.diff, to fix
+ the part of https://bugzilla.novell.com/show_bug.cgi?id=6014 that is
+ not yet in Nautilus 2.16. This adds a "Network Servers" item in the
+ Places sidebar.
+- Added nautilus-206369-desktop-icon-overlap.diff as an updated
+ and consolidated version of
+ nautilus-155337-icon-positioning-on-reload.diff and
+ nautilus-174766-fix-lazy-positioning.diff. This is to fix the bug
+ where desktop icons get overlapped or rearranged when a new volume
+ icon appears, or when the desktop is reloaded.
+- Added nautilus-drives-and-volumes-on-desktop.diff as a partly
+ updated version of nautilus-172870-support-drives-and-volumes.diff.
+- Added nautilus-debug-log.diff. This provides logging functionality
+ to aid debugging.
+- Updated descriptions inside the rest of the patches.
+- Renumbered patches.
* Tue Oct 31 2006 - joeshaw@suse.de
- Add a patch to ensure that the search entry bar is displayed
when navigating to the x-nautilus-search:/// URI. (bnc #212649)
++++++ nautilus-146947-rename-bad-parameters-message.diff ++++++
--- /var/tmp/diff_new_pack.2EcUMY/_old 2006-11-02 20:23:06.000000000 +0100
+++ /var/tmp/diff_new_pack.2EcUMY/_new 2006-11-02 20:23:06.000000000 +0100
@@ -1,3 +1,11 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=350976
+
+https://bugzilla.novell.com/show_bug.cgi?id=146947
+
+libsmbclient returns EINVAL if one sends it filenames with illegal
+characters, like '\'. Display a more useful error message than
+"generic error" in that case.
+
--- src/file-manager/fm-error-reporting.c.orig 2006-01-16 13:20:30.000000000 -0600
+++ src/file-manager/fm-error-reporting.c 2006-01-31 13:00:05.000000000 -0600
@@ -133,6 +133,11 @@
++++++ nautilus-158158-ignore-foreign-desktop-files.diff ++++++
--- /var/tmp/diff_new_pack.2EcUMY/_old 2006-11-02 20:23:06.000000000 +0100
+++ /var/tmp/diff_new_pack.2EcUMY/_new 2006-11-02 20:23:06.000000000 +0100
@@ -1,3 +1,14 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=338933
+
+Don't show .desktop files which are specific to other desktop
+environments ("OnlyShowIn=foo" where foo != GNOME).
+
+This patch ignores those files at a very low level
+(NautilusDirectoryAsync), and for all directories. It should probably
+only do it for ~/Desktop: the original bug is about not wanting to
+show the .desktop files which KDE drops in your ~/Desktop (those files
+do have OnlyShowIn=KDE).
+
2006-05-22 Federico Mena Quintero
* libnautilus-private/nautilus-directory-async.c
++++++ nautilus-206369-desktop-icon-overlap.diff ++++++
2006-10-31 Federico Mena Quintero
http://bugzilla.gnome.org/show_bug.cgi?id=330298
Fix the use of lazy positioning, and the saving of metadata for
lazily-positioned icons. Fixes
https://bugzilla.novell.com/show_bug.cgi?id=155337 and
https://bugzilla.novell.com/show_bug.cgi?id=174766.
* src/file-manager/fm-icon-view.c (file_has_lazy_position): Only
desktop icon files (not "real" files) have lazy positions. Don't
consider whether the directory is loading; this is not the right
place to check that.
(fm_icon_view_begin_loading): Tell the icon container that we
just started reloading.
(fm_icon_view_end_loading): Tell the icon container that we
finished loading.
* libnautilus-private/nautilus-icon-private.h
(NautilusIconContainerDetails): New flag "is_reloading".
* libnautilus-private/nautilus-icon-container.h: New prototype for
nautilus_icon_container_set_is_reloading().
* libnautilus-private/nautilus-icon-container.c
(nautilus_icon_container_set_is_reloading): New function; sets an
is_reloading flag in the icon container.
(icon_set_position): Clear icon->has_lazy_position, since the icon
will be well-positioned once this function exits.
(finish_adding_new_icons): Do not ignore already-placed lazy
position icons when filling the placement grid! Save the value of
icon->has_lazy_position before calling assign_icon_position().
Since that function may call icon_set_position() (which will clear
the flag), we need to keep the original value of the flag.
(finish_adding_new_icons): Don't clear icon->has_lazy_position
here; let icon_set_position() do it.
(finish_adding_new_icons): Emit the icon_position_changed signal
so that the parent knows that we moved an icon under it. This has
the effect of updating/preserving the position metadata for
has_lazy_position icons.
--- nautilus/src/file-manager/fm-icon-view.c~ 2006-08-29 03:04:42.000000000 -0500
+++ nautilus/src/file-manager/fm-icon-view.c 2006-10-31 17:46:27.000000000 -0600
@@ -512,22 +512,12 @@ static gboolean
file_has_lazy_position (FMDirectoryView *view,
NautilusFile *file)
{
- gboolean lazy_position;
-
/* For volumes (i.e. cdrom icon) we use lazy positioning so that when
* an old cdrom gets re-mounted in a place that now has another
- * icon we don't overlap that one. We don't do this in general though,
- * as it can cause icons moving around.
+ * icon we don't overlap that one.
*/
- lazy_position = nautilus_file_has_volume (file);
- if (lazy_position && fm_directory_view_get_loading (view)) {
- /* if volumes are loaded during directory load, don't mark them
- * as lazy. This is wrong for files that were mounted during user
- * log-off, but it is right for files that were mounted during login. */
- lazy_position = FALSE;
- }
- return lazy_position;
+ return NAUTILUS_IS_DESKTOP_ICON_FILE (file);
}
static void
@@ -1073,6 +1063,8 @@ fm_icon_view_begin_loading (FMDirectoryV
file = fm_directory_view_get_directory_as_file (view);
icon_container = GTK_WIDGET (get_icon_container (icon_view));
+ nautilus_icon_container_set_is_reloading (NAUTILUS_ICON_CONTAINER (icon_container), TRUE);
+
nautilus_icon_container_set_allow_moves (NAUTILUS_ICON_CONTAINER (icon_container),
fm_directory_view_get_allow_moves (view));
@@ -1147,6 +1139,7 @@ fm_icon_view_end_loading (FMDirectoryVie
FMIconView *icon_view;
icon_view = FM_ICON_VIEW (view);
+ nautilus_icon_container_set_is_reloading (get_icon_container (icon_view), FALSE);
}
static NautilusZoomLevel
--- nautilus-2.15.4/libnautilus-private/nautilus-icon-container.h
+++ nautilus-2.15.4/libnautilus-private/nautilus-icon-container.h
@@ -228,6 +228,8 @@
NautilusIconData *data);
/* control the layout */
+void nautilus_icon_container_set_is_reloading (NautilusIconContainer *container,
+ gboolean is_reloading);
gboolean nautilus_icon_container_is_auto_layout (NautilusIconContainer *container);
void nautilus_icon_container_set_auto_layout (NautilusIconContainer *container,
gboolean auto_layout);
--- nautilus/libnautilus-private/nautilus-icon-container.c.orig 2006-10-31 17:58:43.000000000 -0600
+++ nautilus/libnautilus-private/nautilus-icon-container.c 2006-10-31 18:00:47.000000000 -0600
@@ -288,6 +288,8 @@ icon_set_position (NautilusIcon *icon,
int x1, y1, x2, y2;
int container_x, container_y, container_width, container_height;
+ icon->has_lazy_position = FALSE;
+
if (icon->x == x && icon->y == y) {
return;
}
@@ -348,7 +350,7 @@ icon_set_position (NautilusIcon *icon,
if (icon->y == ICON_UNPOSITIONED_VALUE) {
icon->y = 0;
}
-
+
eel_canvas_item_move (EEL_CANVAS_ITEM (icon->item),
x - icon->x,
y - icon->y);
@@ -5708,9 +5710,13 @@ finish_adding_new_icons (NautilusIconCon
new_icons = g_list_reverse (new_icons);
no_position_icons = semi_position_icons = NULL;
for (p = new_icons; p != NULL; p = p->next) {
+ gboolean has_lazy_position;
+
icon = p->data;
+ has_lazy_position = icon->has_lazy_position;
+
if (assign_icon_position (container, icon)) {
- if (!container->details->auto_layout && icon->has_lazy_position) {
+ if (!container->details->is_reloading && !container->details->auto_layout && has_lazy_position) {
semi_position_icons = g_list_prepend (semi_position_icons, icon);
}
} else {
@@ -5743,6 +5749,7 @@ finish_adding_new_icons (NautilusIconCon
for (p = semi_position_icons; p != NULL; p = p->next) {
NautilusIcon *icon;
int x, y;
+ NautilusIconPosition position;
icon = p->data;
x = icon->x;
@@ -5755,9 +5762,10 @@ finish_adding_new_icons (NautilusIconCon
placement_grid_mark_icon (grid, icon);
- /* ensure that next time we run this code, the formerly semi-positioned
- * icons are treated as being positioned. */
- icon->has_lazy_position = FALSE;
+ position.x = icon->x;
+ position.y = icon->y;
+ g_signal_emit (container, signals[ICON_POSITION_CHANGED], 0,
+ icon->data, &position);
}
placement_grid_free (grid);
@@ -6657,6 +6665,15 @@ nautilus_icon_container_sort (NautilusIc
}
}
+void
+nautilus_icon_container_set_is_reloading (NautilusIconContainer *container,
+ gboolean is_reloading)
+{
+ g_return_if_fail (NAUTILUS_IS_ICON_CONTAINER (container));
+
+ container->details->is_reloading = is_reloading;
+}
+
gboolean
nautilus_icon_container_is_auto_layout (NautilusIconContainer *container)
{
--- nautilus-2.15.4/libnautilus-private/nautilus-icon-private.h
+++ nautilus-2.15.4/libnautilus-private/nautilus-icon-private.h
@@ -253,6 +253,8 @@
guint a11y_item_action_idle_handler;
GQueue* a11y_item_action_queue;
+ eel_boolean_bit is_reloading : 1;
+
/* interactive search */
gboolean disable_popdown;
gboolean imcontext_changed;
++++++ nautilus-6014-network-servers-in-places-sidebar.diff ++++++
http://bugzilla.gnome.org/show_bug.cgi?id=350974
https://bugzilla.novell.com/show_bug.cgi?id=6014
Add "Network Servers" to the Places sidebar.
--- nautilus/src/nautilus-places-sidebar.c.orig 2006-10-25 11:35:15.000000000 -0500
+++ nautilus/src/nautilus-places-sidebar.c 2006-10-25 11:38:12.000000000 -0500
@@ -263,6 +263,14 @@ update_places (NautilusPlacesSidebar *si
gtk_tree_selection_select_iter (selection, &last_iter);
}
+ mount_uri = "network:///"; /* No need to strdup */
+ last_iter = add_place (sidebar, PLACES_BUILT_IN,
+ _("Network Servers"), "gnome-fs-network",
+ mount_uri, NULL, NULL, 0);
+ if (strcmp (location, mount_uri) == 0) {
+ gtk_tree_selection_select_iter (selection, &last_iter);
+ }
+
/* for all drives add all its volumes */
volume_monitor = gnome_vfs_get_volume_monitor ();
++++++ nautilus-debug-log.diff ++++++
++++ 1592 lines (skipped)
++++++ nautilus-default-thumbnail-size.diff ++++++
--- /var/tmp/diff_new_pack.2EcUMY/_old 2006-11-02 20:23:06.000000000 +0100
+++ /var/tmp/diff_new_pack.2EcUMY/_new 2006-11-02 20:23:06.000000000 +0100
@@ -1,3 +1,9 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=350972
+
+Make the default thumbnail size be 64 pixels, so that it matches the
+default size for other icons. This makes the icon views look more
+aligned.
+
--- nautilus-2.12.1.orig/libnautilus-private/nautilus-icon-factory.h 2005-05-23 08:21:47.000000000 -0500
+++ nautilus-2.12.1/libnautilus-private/nautilus-icon-factory.h 2005-11-16 18:11:57.000000000 -0600
@@ -72,7 +72,7 @@ typedef enum {
++++++ nautilus-drives-and-volumes-on-desktop.diff ++++++
++++ 917 lines (skipped)
++++++ nautilus-icon.patch ++++++
--- /var/tmp/diff_new_pack.2EcUMY/_old 2006-11-02 20:23:06.000000000 +0100
+++ /var/tmp/diff_new_pack.2EcUMY/_new 2006-11-02 20:23:06.000000000 +0100
@@ -1,3 +1,10 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=350962
+
+https://bugzilla.novell.com/show_bug.cgi?id=117333
+
+Use "gnome-fs-directory" instead of "file-manager" as an icon. A
+folder is more recognizable than a filing cabinet.
+
--- nautilus-2.15.4/nautilus-file-management-properties.desktop.in
+++ nautilus-2.15.4/nautilus-file-management-properties.desktop.in
@@ -3,7 +3,7 @@
++++++ nautilus-name-length.patch ++++++
--- /var/tmp/diff_new_pack.2EcUMY/_old 2006-11-02 20:23:06.000000000 +0100
+++ /var/tmp/diff_new_pack.2EcUMY/_new 2006-11-02 20:23:07.000000000 +0100
@@ -1,3 +1,9 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=364843
+
+Keep the generated names for "reallylongfilename (copy).txt" from
+overflowing the maximum allowed length for path names. Patch by
+Dave Camp .
+
Index: libnautilus-private/nautilus-file-operations.c
================================================================================
--- libnautilus-private/nautilus-file-operations.c
++++++ nautilus-onlyshowin.patch ++++++
--- /var/tmp/diff_new_pack.2EcUMY/_old 2006-11-02 20:23:07.000000000 +0100
+++ /var/tmp/diff_new_pack.2EcUMY/_new 2006-11-02 20:23:07.000000000 +0100
@@ -1,3 +1,8 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=350947
+
+Make the .desktop files for Computer and arbitrary folders only show
+up in GNOME.
+
--- nautilus-2.15.4/nautilus-computer.desktop.in
+++ nautilus-2.15.4/nautilus-computer.desktop.in
@@ -9,6 +9,7 @@
++++++ nautilus-search-desktop.patch ++++++
--- /var/tmp/diff_new_pack.2EcUMY/_old 2006-11-02 20:23:07.000000000 +0100
+++ /var/tmp/diff_new_pack.2EcUMY/_new 2006-11-02 20:23:07.000000000 +0100
@@ -1,3 +1,7 @@
+http://bugzilla.gnome.org/show_bug.cgi?id=350950
+
+Install a nautilus-search.desktop for "Search for Files".
+
? depcomp
? jpr@macintyre.suse.de
? nautilus-folder-handler.desktop
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org