Hello community, here is the log from the commit of package nautilus checked in at Fri Jun 2 02:06:37 CEST 2006. -------- --- GNOME/nautilus/nautilus.changes 2006-05-23 00:17:42.000000000 +0200 +++ nautilus/nautilus.changes 2006-06-01 21:07:26.000000000 +0200 @@ -1,0 +2,12 @@ +Thu Jun 1 21:07:09 CEST 2006 - federico@novell.com + +- Added nautilus-172870-support-drives-and-volumes.diff. This fixes + https://bugzilla.novell.com/show_bug.cgi?id=172870 by adding proper + support for displaying unmounted drives as well as mounted volumes. + This also makes floppies work from the desktop. +- Added nautilus-174766-fix-lazy-positioning.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=174766. This makes + volume icons not overlap with other icons in the desktop when + volumes get mounted. + +------------------------------------------------------------------- New: ---- nautilus-172870-support-drives-and-volumes.diff nautilus-174766-fix-lazy-positioning.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nautilus.spec ++++++ --- /var/tmp/diff_new_pack.zZYHmm/_old 2006-06-02 02:06:27.000000000 +0200 +++ /var/tmp/diff_new_pack.zZYHmm/_new 2006-06-02 02:06:27.000000000 +0200 @@ -18,7 +18,7 @@ Group: Productivity/File utilities Autoreqprov: on Version: 2.12.2 -Release: 70 +Release: 73 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 @@ -52,6 +52,8 @@ Patch46: nautilus-142860-vfs-drive-for-extensions.diff Patch47: nautilus-158279-add-location-toggle-button.diff Patch48: nautilus-i18n.patch +Patch49: nautilus-172870-support-drives-and-volumes.diff +Patch50: nautilus-174766-fix-lazy-positioning.diff PreReq: filesystem gconf2 Requires: gnome2-user-docs Provides: nautilus2 @@ -111,6 +113,8 @@ %patch46 -p1 %patch47 -p1 %patch48 +%patch49 -p1 +%patch50 -p1 # FIXME: this code updates translation for upstreamed patches. cd po intltool-update --pot @@ -195,6 +199,15 @@ %{prefix}/%_lib/pkgconfig/*.pc %changelog -n nautilus +* Thu Jun 01 2006 - federico@novell.com +- Added nautilus-172870-support-drives-and-volumes.diff. This fixes + https://bugzilla.novell.com/show_bug.cgi?id=172870 by adding proper + support for displaying unmounted drives as well as mounted volumes. + This also makes floppies work from the desktop. +- Added nautilus-174766-fix-lazy-positioning.diff to fix + https://bugzilla.novell.com/show_bug.cgi?id=174766. This makes + volume icons not overlap with other icons in the desktop when + volumes get mounted. * Tue May 23 2006 - federico@novell.com - Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=177777. All .desktop ++++++ nautilus-172870-support-drives-and-volumes.diff ++++++ ++++ 634 lines (skipped) ++++++ nautilus-174766-fix-lazy-positioning.diff ++++++ 2006-05-31 Federico Mena Quintero <federico@novell.com> Fix the use of lazy positioning, and the saving of metadata for lazily-positioned icons. Fixes http://bugzilla.novell.com/show_bug.cgi?id=174766. * libnautilus-private/nautilus-icon-container.c (icon_set_position): Clear icon->has_lazy_position, since the icon will be 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/libnautilus-private/nautilus-icon-container.c 2006-04-07 15:12:27.000000000 -0500 +++ nautilus/libnautilus-private/nautilus-icon-container.c 2006-05-31 15:30:50.000000000 -0500 @@ -277,6 +277,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; } @@ -1304,6 +1306,7 @@ placement_grid_mark_icon (PlacementGrid canvas_position_to_grid_position (grid, icon_pos, &grid_pos); + placement_grid_mark (grid, grid_pos); } @@ -5166,9 +5169,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->is_reloading && !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 { @@ -5201,6 +5208,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; @@ -5213,9 +5221,12 @@ 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; + position.scale_x = icon->scale_x; + position.scale_y = icon->scale_y; + g_signal_emit (container, signals[ICON_POSITION_CHANGED], 0, + icon->data, &position); } placement_grid_free (grid); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org