Hello community,
here is the log from the commit of package nautilus
checked in at Mon May 15 12:53:53 CEST 2006.
--------
--- GNOME/nautilus/nautilus.changes 2006-05-08 20:50:42.000000000 +0200
+++ STABLE/nautilus/nautilus.changes 2006-05-12 02:38:03.000000000 +0200
@@ -1,0 +2,22 @@
+Fri May 12 02:37:44 CEST 2006 - federico@novell.com
+
+- Updated nautilus-155010-desktop-volume-policy.diff; this fixes
+ https://bugzilla.novell.com/show_bug.cgi?id=175076. This fixes a
+ crash when dragging a volume to the trash.
+
+-------------------------------------------------------------------
+Wed May 10 23:18:39 CEST 2006 - joeshaw@suse.de
+
+- Update search patch to remove annoying "queuing <whatever>"
+ debug spew.
+
+-------------------------------------------------------------------
+Wed May 10 03:23:11 CEST 2006 - federico@novell.com
+
+- Added nautilus-142860-vfs-drive-for-extensions.diff to fix the
+ Nautilus part of bug
+ https://bugzilla.novell.com/show_bug.cgi?id=142860. This lets
+ Nautilus extensions see the drives that may correspond to desktop
+ icons.
+
+-------------------------------------------------------------------
Old:
----
nautilus-search-20060414.patch
New:
----
nautilus-142860-vfs-drive-for-extensions.diff
nautilus-search-20060510.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nautilus.spec ++++++
--- /var/tmp/diff_new_pack.txjpDe/_old 2006-05-15 12:52:32.000000000 +0200
+++ /var/tmp/diff_new_pack.txjpDe/_new 2006-05-15 12:52:32.000000000 +0200
@@ -18,7 +18,7 @@
Group: Productivity/File utilities
Autoreqprov: on
Version: 2.12.2
-Release: 63
+Release: 65
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
@@ -28,7 +28,7 @@
Patch12: nautilus-hide-desktop-files.patch
Patch13: nautilus-name-length.patch
Patch20: nautilus-onlyshowin.patch
-Patch23: nautilus-search-20060414.patch
+Patch23: nautilus-search-20060510.patch
Patch24: nautilus-search-desktop.patch
Patch25: nautilus-submount.patch
Patch27: nautilus-icon.patch
@@ -49,6 +49,7 @@
Patch43: nautilus-158158-ignore-foreign-desktop-files.diff
Patch44: nautilus-trash-icon.patch
Patch45: nautilus-66073-update-progress-dialog.diff
+Patch46: nautilus-142860-vfs-drive-for-extensions.diff
PreReq: filesystem gconf2
Requires: gnome2-user-docs
Provides: nautilus2
@@ -103,6 +104,7 @@
%patch43 -p1
%patch44
%patch45 -p1
+%patch46 -p1
# FIXME: this code updates translation for upstreamed patches.
cd po
intltool-update --pot
@@ -187,6 +189,19 @@
%{prefix}/%_lib/pkgconfig/*.pc
%changelog -n nautilus
+* Fri May 12 2006 - federico@novell.com
+- Updated nautilus-155010-desktop-volume-policy.diff; this fixes
+ https://bugzilla.novell.com/show_bug.cgi?id=175076. This fixes a
+ crash when dragging a volume to the trash.
+* Wed May 10 2006 - joeshaw@suse.de
+- Update search patch to remove annoying "queuing <whatever>"
+ debug spew.
+* Wed May 10 2006 - federico@novell.com
+- Added nautilus-142860-vfs-drive-for-extensions.diff to fix the
+ Nautilus part of bug
+ https://bugzilla.novell.com/show_bug.cgi?id=142860. This lets
+ Nautilus extensions see the drives that may correspond to desktop
+ icons.
* Mon May 08 2006 - federico@novell.com
- Added nautilus-66073-update-progress-dialog.diff to fix bug
https://bugzilla.novell.com/show_bug.cgi?id=66073. The progress
++++++ nautilus-142860-vfs-drive-for-extensions.diff ++++++
https://bugzilla.novell.com/show_bug.cgi?id=142860
2006-05-09 Federico Mena Quintero
Let an extension query for the GnomeVFSDrive that may correspond
to a NautilusFileInfo:
* libnautilus-extension/nautilus-file-info.h: Added prototype for
nautilus_file_info_get_drive().
(struct _NautilusFileInfoIface): Added a "get_drive" method.
* libnautilus-extension/nautilus-file-info.c
(nautilus_file_info_get_drive): New public function; gets the
GnomeVFSDrive that may correspond to a NautilusFileInfo.
Implementation of NautilusFileInfo::get_drive() for
NautilusDesktopIconFile:
* libnautilus-private/nautilus-desktop-icon-file.c: Use
G_DEFINE_TYPE_WITH_CODE() instead of EEL_CLASS_BOILERPLATE() so
that we can implement an interface.
(file_info_iface_init): New function, initializes the
NautilusFileInfoIface for the desktop icon file class.
(nautilus_desktop_icon_file_get_drive): Implement the
::get_drive() method from NautilusFileInfoIface.
Index: nautilus/libnautilus-extension/nautilus-file-info.c
===================================================================
RCS file: /cvsroot/novell/nautilus/libnautilus-extension/nautilus-file-info.c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 nautilus-file-info.c
--- nautilus/libnautilus-extension/nautilus-file-info.c 7 Apr 2006 20:12:27 -0000 1.1.1.1
+++ nautilus/libnautilus-extension/nautilus-file-info.c 9 May 2006 22:19:00 -0000
@@ -156,6 +156,21 @@ nautilus_file_info_is_directory (Nautilu
return NAUTILUS_FILE_INFO_GET_IFACE (file)->is_directory (file);
}
+GnomeVFSDrive *
+nautilus_file_info_get_drive (NautilusFileInfo *file)
+{
+ NautilusFileInfoIface *iface;
+
+ g_return_val_if_fail (NAUTILUS_IS_FILE_INFO (file), NULL);
+
+ iface = NAUTILUS_FILE_INFO_GET_IFACE (file);
+
+ if (iface->get_drive)
+ return NAUTILUS_FILE_INFO_GET_IFACE (file)->get_drive (file);
+ else
+ return NULL;
+}
+
GnomeVFSFileInfo *
nautilus_file_info_get_vfs_file_info (NautilusFileInfo *file)
{
Index: nautilus/libnautilus-extension/nautilus-file-info.h
===================================================================
RCS file: /cvsroot/novell/nautilus/libnautilus-extension/nautilus-file-info.h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 nautilus-file-info.h
--- nautilus/libnautilus-extension/nautilus-file-info.h 7 Apr 2006 20:12:27 -0000 1.1.1.1
+++ nautilus/libnautilus-extension/nautilus-file-info.h 9 May 2006 23:04:59 -0000
@@ -27,6 +27,7 @@
#define NAUTILUS_FILE_INFO_H
#include
+#include
#include
G_BEGIN_DECLS
@@ -74,6 +75,7 @@ struct _NautilusFileInfoIface
const char *attribute_name,
const char *value);
void (*invalidate_extension_info) (NautilusFileInfo *file);
+ GnomeVFSDrive * (*get_drive) (NautilusFileInfo *file);
};
GList *nautilus_file_info_list_copy (GList *files);
@@ -95,6 +97,9 @@ gboolean nautilus_file_info_is_
const char *mime_type);
gboolean nautilus_file_info_is_directory (NautilusFileInfo *file);
+/* Drive */
+GnomeVFSDrive *nautilus_file_info_get_drive (NautilusFileInfo *file);
+
/* Other File Info */
Index: nautilus/libnautilus-private/nautilus-desktop-icon-file.c
===================================================================
RCS file: /cvsroot/novell/nautilus/libnautilus-private/nautilus-desktop-icon-file.c,v
retrieving revision 1.2
diff -u -p -r1.2 nautilus-desktop-icon-file.c
--- nautilus/libnautilus-private/nautilus-desktop-icon-file.c 11 Apr 2006 16:46:34 -0000 1.2
+++ nautilus/libnautilus-private/nautilus-desktop-icon-file.c 10 May 2006 00:24:37 -0000
@@ -43,13 +43,16 @@ struct NautilusDesktopIconFileDetails {
NautilusDesktopLink *link;
};
-static void nautilus_desktop_icon_file_init (gpointer object,
- gpointer klass);
-static void nautilus_desktop_icon_file_class_init (gpointer klass);
-
-EEL_CLASS_BOILERPLATE (NautilusDesktopIconFile,
- nautilus_desktop_icon_file,
- NAUTILUS_TYPE_FILE)
+static void nautilus_desktop_icon_file_init (NautilusDesktopIconFile *icon_file);
+static void nautilus_desktop_icon_file_class_init (NautilusDesktopIconFileClass *klass);
+
+static void file_info_iface_init (NautilusFileInfoIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (NautilusDesktopIconFile,
+ nautilus_desktop_icon_file,
+ NAUTILUS_TYPE_FILE,
+ G_IMPLEMENT_INTERFACE (NAUTILUS_TYPE_FILE_INFO,
+ file_info_iface_init));
static void
desktop_icon_file_monitor_add (NautilusFile *file,
@@ -164,13 +167,9 @@ desktop_icon_file_get_where_string (Naut
}
static void
-nautilus_desktop_icon_file_init (gpointer object, gpointer klass)
+nautilus_desktop_icon_file_init (NautilusDesktopIconFile *icon_file)
{
- NautilusDesktopIconFile *desktop_file;
-
- desktop_file = NAUTILUS_DESKTOP_ICON_FILE (object);
-
- desktop_file->details = g_new0 (NautilusDesktopIconFileDetails, 1);
+ icon_file->details = g_new0 (NautilusDesktopIconFileDetails, 1);
}
static void
@@ -342,11 +341,13 @@ desktop_icon_file_finalize (GObject *obj
g_free (desktop_file->details);
- EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
+ if (G_OBJECT_CLASS (nautilus_desktop_icon_file_parent_class)->finalize) {
+ G_OBJECT_CLASS (nautilus_desktop_icon_file_parent_class)->finalize (object);
+ }
}
static void
-nautilus_desktop_icon_file_class_init (gpointer klass)
+nautilus_desktop_icon_file_class_init (NautilusDesktopIconFileClass *klass)
{
GObjectClass *object_class;
NautilusFileClass *file_class;
@@ -367,3 +368,36 @@ nautilus_desktop_icon_file_class_init (g
file_class->get_date = desktop_icon_file_get_date;
file_class->get_where_string = desktop_icon_file_get_where_string;
}
+
+static GnomeVFSDrive *
+nautilus_desktop_icon_file_get_drive (NautilusFileInfo *file)
+{
+ NautilusDesktopIconFile *icon_file;
+ NautilusDesktopLink *link;
+ GObject *drive_or_volume;
+
+ icon_file = NAUTILUS_DESKTOP_ICON_FILE (file);
+ link = icon_file->details->link;
+
+ if (nautilus_desktop_link_get_link_type (link) != NAUTILUS_DESKTOP_LINK_VOLUME) {
+ return NULL;
+ }
+
+ drive_or_volume = nautilus_desktop_link_get_drive_or_volume (link);
+ if (GNOME_IS_VFS_DRIVE (drive_or_volume)) {
+ return GNOME_VFS_DRIVE (drive_or_volume); /* comes with a new reference count */
+ } else {
+ GnomeVFSDrive *drive;
+
+ drive = gnome_vfs_volume_get_drive (GNOME_VFS_VOLUME (drive_or_volume)); /* comes with a new reference count */
+ gnome_vfs_volume_unref (GNOME_VFS_VOLUME (drive_or_volume));
+
+ return drive;
+ }
+}
+
+static void
+file_info_iface_init (NautilusFileInfoIface *iface)
+{
+ iface->get_drive = nautilus_desktop_icon_file_get_drive;
+}
++++++ nautilus-155010-desktop-volume-policy.diff ++++++
--- /var/tmp/diff_new_pack.txjpDe/_old 2006-05-15 12:52:32.000000000 +0200
+++ /var/tmp/diff_new_pack.txjpDe/_new 2006-05-15 12:52:32.000000000 +0200
@@ -1,3 +1,10 @@
+2006-05-11 Federico Mena Quintero
+
+ * libnautilus-private/nautilus-desktop-link-monitor.c
+ (volume_delete_dialog): Oops, don't free detail_str; it's a static
+ string from gettext(). Fixes
+ https://bugzilla.novell.com/show_bug.cgi?id=175076
+
2006-04-25 Federico Mena Quintero
Fix https://bugzilla.novell.com/show_bug.cgi?id=168280:
@@ -136,7 +143,7 @@
static void
destroy_desktop_link_monitor (void)
{
-@@ -104,41 +107,49 @@ static void
+@@ -104,41 +107,48 @@ static void
volume_delete_dialog (GtkWidget *parent_view,
NautilusDesktopLink *link)
{
@@ -206,11 +213,10 @@
+
+ g_free (display_name);
+ g_free (dialog_str);
-+ g_free (detail_str);
}
void
-@@ -197,6 +208,21 @@ nautilus_desktop_link_monitor_make_filen
+@@ -197,6 +207,21 @@ nautilus_desktop_link_monitor_make_filen
}
static void
@@ -232,7 +238,7 @@
create_volume_link (NautilusDesktopLinkMonitor *monitor,
GnomeVFSVolume *volume)
{
-@@ -209,19 +235,29 @@ create_volume_link (NautilusDesktopLinkM
+@@ -209,19 +234,29 @@ create_volume_link (NautilusDesktopLinkM
}
if (eel_preferences_get_boolean (NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE)) {
@@ -264,7 +270,7 @@
}
-@@ -230,25 +266,34 @@ volume_unmounted_callback (GnomeVFSVolum
+@@ -230,25 +265,34 @@ volume_unmounted_callback (GnomeVFSVolum
GnomeVFSVolume *volume,
NautilusDesktopLinkMonitor *monitor)
{
@@ -304,7 +310,7 @@
}
static void
-@@ -322,32 +367,60 @@ desktop_network_visible_changed (gpointe
+@@ -322,32 +366,60 @@ desktop_network_visible_changed (gpointe
}
static void
@@ -380,7 +386,7 @@
create_link_and_add_preference (NautilusDesktopLink **link_ref,
NautilusDesktopLinkType link_type,
const char *preference_key,
-@@ -365,8 +438,6 @@ static void
+@@ -365,8 +437,6 @@ static void
nautilus_desktop_link_monitor_init (gpointer object, gpointer klass)
{
NautilusDesktopLinkMonitor *monitor;
@@ -389,7 +395,7 @@
GnomeVFSVolumeMonitor *volume_monitor;
monitor = NAUTILUS_DESKTOP_LINK_MONITOR (object);
-@@ -404,22 +475,22 @@ nautilus_desktop_link_monitor_init (gpoi
+@@ -404,22 +474,22 @@ nautilus_desktop_link_monitor_init (gpoi
desktop_network_visible_changed,
monitor);
++++++ nautilus-search-20060414.patch -> nautilus-search-20060510.patch ++++++
--- GNOME/nautilus/nautilus-search-20060414.patch 2006-04-14 23:06:56.000000000 +0200
+++ STABLE/nautilus/nautilus-search-20060510.patch 2006-05-12 02:35:09.000000000 +0200
@@ -844,25 +844,6 @@
return CORBA_Object_duplicate (BONOBO_OBJREF (metafile), ev);
}
-diff -ruNp nautilus-2.12.2/libnautilus-private/nautilus-monitor.c nautilus-2.12.2.joe/libnautilus-private/nautilus-monitor.c
---- nautilus-2.12.2/libnautilus-private/nautilus-monitor.c 2003-11-05 17:19:54.000000000 +0100
-+++ nautilus-2.12.2.joe/libnautilus-private/nautilus-monitor.c 2006-04-14 23:02:12.321525345 +0200
-@@ -103,12 +103,15 @@ monitor_notify_cb (GnomeVFSMonitorHandle
- {
- switch (event_type) {
- case GNOME_VFS_MONITOR_EVENT_CHANGED:
-+ printf ("queuing change: %s\n", info_uri);
- nautilus_file_changes_queue_file_changed (info_uri);
- break;
- case GNOME_VFS_MONITOR_EVENT_DELETED:
-+ printf ("queuing delete: %s\n", info_uri);
- nautilus_file_changes_queue_file_removed (info_uri);
- break;
- case GNOME_VFS_MONITOR_EVENT_CREATED:
-+ printf ("queuing create: %s\n", info_uri);
- nautilus_file_changes_queue_file_added (info_uri);
- break;
-
diff -ruNp nautilus-2.12.2/libnautilus-private/nautilus-query.c nautilus-2.12.2.joe/libnautilus-private/nautilus-query.c
--- nautilus-2.12.2/libnautilus-private/nautilus-query.c 1970-01-01 01:00:00.000000000 +0100
+++ nautilus-2.12.2.joe/libnautilus-private/nautilus-query.c 2006-04-14 23:02:12.327524302 +0200
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...