pool/nautilus
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nautilus?expand=0&rev=18

Browse Source
This commit is contained in:
OBS User unknown
2008-01-21 00:06:35 +00:00
committed by Git OBS Bridge
parent a645036f86
commit bb7e657562
3 changed files with 564 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

423
nautilus-drives-and-volumes-on-desktop.diff
View File

@@ -1,3 +1,57 @@
2007-10-24 Federico Mena Quintero <federico@novell.com>
Finish fixing https://bugzilla.novell.com/show_bug.cgi?id=335411 -
Nautilus crashes when it gets a "volume-mounted" signal for a
volume that is already mounted.
* libnautilus-private/nautilus-desktop-link-monitor.c
(link_corresponds_to_drive): Oops, check that the link_drive is
not NULL before comparing it. We may get a NULL link_drive if the
link corresponds to a volume without a drive (e.g. a network volume).
2007-10-23 Federico Mena Quintero <federico@novell.com>
* libnautilus-private/nautilus-desktop-link-monitor.c
(link_corresponds_to_drive): Use gnome_vfs_drive_compare(), not
pointer equality, to see if drives are the same. Apparently
gnome-vfs can feed us with different GnomeVFSDrive* objects that
really refer to the same drive.
(find_link_for_volume): Likewise, for volumes.
* libnautilus-private/nautilus-desktop-link.c
(nautilus_desktop_link_update_from_volume): Likewise.
2007-10-22 Federico Mena Quintero <federico@novell.com>
* libnautilus-private/nautilus-debug-log.h
(NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES): Add a "drives-volumes" log domain.
* libnautilus-private/nautilus-desktop-link-monitor.c
(refresh_volume_links): Log the drives/volumes we find (milestone
or not milestone depending on whether we are initializing
Nautilus).
(create_drive_link): Log when we create a desktop link for a
drive.
(create_volume_link): Likewise, for a volume.
(drive_connected_callback): Log when a drive gets connected (not
milestone).
(drive_disconnected_callback): Likewise, when a drive gets disconnected.
(volume_mounted_callback): Likewise, when a volume gets mounted.
(volume_unmounted_callback): Likewise, when a volume gets unmounted.
2007-10-22 Federico Mena Quintero <federico@novell.com>
* libnautilus-private/nautilus-debug-log.h
(NAUTILUS_DEBUG_LOG_DESKTOP_LINKS): Add a "desktop-links" log
domain.
* libnautilus-private/nautilus-desktop-link-monitor.c
(nautilus_desktop_link_monitor_init): Log initialization of the
desktop link monitor (milestone).
(create_link_and_add_preference): Log initialization of each link
type (milestone).
(update_link_visibility): Log changes in link visibility (non-milestone).
2007-05-24 Hans Petter Jansson <hpj@novell.com>
Fix https://bugzilla.novell.com/show_bug.cgi?id=276193, unable
@@ -181,6 +235,19 @@
transformation of a link from a drive to volume when an unmounted
drive gets first mounted, and vice-versa.
diff --git a/libnautilus-private/nautilus-debug-log.h b/libnautilus-private/nautilus-debug-log.h
index 801610d..85a0253 100644
--- a/libnautilus-private/nautilus-debug-log.h
+++ b/libnautilus-private/nautilus-debug-log.h
@@ -29,6 +29,8 @@
#define NAUTILUS_DEBUG_LOG_DOMAIN_USER "USER" /* always enabled */
#define NAUTILUS_DEBUG_LOG_DOMAIN_ASYNC "async" /* when asynchronous notifications come in */
+#define NAUTILUS_DEBUG_LOG_DESKTOP_LINKS "desktop-links" /* Desktop links in general */
+#define NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES "drives-volumes" /* desktop link monitoring of drives/volumes */
#define NAUTILUS_DEBUG_LOG_DOMAIN_GLOG "GLog" /* used for GLog messages; don't use it yourself */
void nautilus_debug_log (gboolean is_milestone, const char *domain, const char *format, ...);
diff --git a/libnautilus-private/nautilus-desktop-icon-file.c b/libnautilus-private/nautilus-desktop-icon-file.c
index 733be41..9e00f5a 100644
--- a/libnautilus-private/nautilus-desktop-icon-file.c
@@ -224,10 +291,18 @@ index 733be41..9e00f5a 100644
file->details->file_info_is_up_to_date = TRUE;
diff --git a/libnautilus-private/nautilus-desktop-link-monitor.c b/libnautilus-private/nautilus-desktop-link-monitor.c
index 6469c6a..c8e85d9 100644
index 6469c6a..b636983 100644
--- a/libnautilus-private/nautilus-desktop-link-monitor.c
+++ b/libnautilus-private/nautilus-desktop-link-monitor.c
@@ -52,13 +52,14 @@ struct NautilusDesktopLinkMonitorDetails {
@@ -27,6 +27,7 @@
#include "nautilus-desktop-link.h"
#include "nautilus-desktop-icon-file.h"
#include "nautilus-directory.h"
+#include "nautilus-debug-log.h"
#include "nautilus-desktop-directory.h"
#include "nautilus-global-preferences.h"
@@ -52,13 +53,14 @@ struct NautilusDesktopLinkMonitorDetails {
NautilusDesktopLink *trash_link;
NautilusDesktopLink *network_link;
@@ -243,16 +318,16 @@ index 6469c6a..c8e85d9 100644
static void nautilus_desktop_link_monitor_init (gpointer object,
gpointer klass);
static void nautilus_desktop_link_monitor_class_init (gpointer klass);
@@ -69,6 +70,8 @@ EEL_CLASS_BOILERPLATE (NautilusDesktopLinkMonitor,
@@ -69,6 +71,8 @@ EEL_CLASS_BOILERPLATE (NautilusDesktopLinkMonitor,
static NautilusDesktopLinkMonitor *the_link_monitor = NULL;
+static void refresh_volume_links (NautilusDesktopLinkMonitor *monitor);
+static void refresh_volume_links (NautilusDesktopLinkMonitor *monitor, gboolean is_initialization);
+
static void
destroy_desktop_link_monitor (void)
{
@@ -104,41 +107,48 @@ static void
@@ -104,41 +108,48 @@ static void
volume_delete_dialog (GtkWidget *parent_view,
NautilusDesktopLink *link)
{
@@ -308,7 +383,7 @@ index 6469c6a..c8e85d9 100644
- gnome_vfs_volume_unref (volume);
- g_free (dialog_str);
+ detail_str = NULL;
+ }
}
+
+ eel_run_simple_dialog (parent_view, FALSE, GTK_MESSAGE_ERROR,
+ dialog_str,
@@ -319,14 +394,14 @@ index 6469c6a..c8e85d9 100644
+ gnome_vfs_volume_unref (GNOME_VFS_VOLUME (drive_or_volume));
+ } else {
+ gnome_vfs_drive_unref (GNOME_VFS_DRIVE (drive_or_volume));
}
+ }
+
+ g_free (display_name);
+ g_free (dialog_str);
}
void
@@ -161,6 +171,7 @@ nautilus_desktop_link_monitor_delete_link (NautilusDesktopLinkMonitor *monitor,
@@ -161,6 +172,7 @@ nautilus_desktop_link_monitor_delete_link (NautilusDesktopLinkMonitor *monitor,
static gboolean
volume_file_name_used (NautilusDesktopLinkMonitor *monitor,
@@ -334,7 +409,7 @@ index 6469c6a..c8e85d9 100644
const char *name)
{
GList *l;
@@ -168,6 +179,9 @@ volume_file_name_used (NautilusDesktopLinkMonitor *monitor,
@@ -168,6 +180,9 @@ volume_file_name_used (NautilusDesktopLinkMonitor *monitor,
gboolean same;
for (l = monitor->details->volume_links; l != NULL; l = l->next) {
@@ -344,7 +419,7 @@ index 6469c6a..c8e85d9 100644
other_name = nautilus_desktop_link_get_file_name (l->data);
same = strcmp (name, other_name) == 0;
g_free (other_name);
@@ -182,6 +196,7 @@ volume_file_name_used (NautilusDesktopLinkMonitor *monitor,
@@ -182,6 +197,7 @@ volume_file_name_used (NautilusDesktopLinkMonitor *monitor,
char *
nautilus_desktop_link_monitor_make_filename_unique (NautilusDesktopLinkMonitor *monitor,
@@ -352,7 +427,7 @@ index 6469c6a..c8e85d9 100644
const char *filename)
{
char *unique_name;
@@ -189,13 +204,74 @@ nautilus_desktop_link_monitor_make_filename_unique (NautilusDesktopLinkMonitor *
@@ -189,39 +205,398 @@ nautilus_desktop_link_monitor_make_filename_unique (NautilusDesktopLinkMonitor *
i = 2;
unique_name = g_strdup (filename);
@@ -412,28 +487,98 @@ index 6469c6a..c8e85d9 100644
+ && eel_preferences_get_boolean (NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE));
+}
+
+static char *
+get_human_readable_drive_id (GnomeVFSDrive *drive)
+{
+ char *id;
+
+ id = gnome_vfs_drive_get_hal_udi (drive);
+ if (!id) {
+ id = gnome_vfs_drive_get_device_path (drive);
+
+ if (!id) {
+ id = gnome_vfs_drive_get_activation_uri (drive);
+
+ if (!id) {
+ id = "\"unknown\""; /* goddamnit */
+ }
+ }
+ }
+
+ return id;
+}
+
+static void
+create_drive_link (NautilusDesktopLinkMonitor *monitor,
+ GnomeVFSDrive *drive)
+ GnomeVFSDrive *drive,
+ gboolean is_initialization)
+{
+ NautilusDesktopLink *link;
+ char *id;
+
+ if (!should_show_drive (drive, NULL)) {
+ id = get_human_readable_drive_id (drive);
+ nautilus_debug_log (is_initialization, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ " * Not creating desktop link for drive %s (%p)",
+ id,
+ drive);
+ g_free (id);
+
+ if (!should_show_drive (drive, NULL))
+ return;
+ }
+
+ link = nautilus_desktop_link_new_from_drive_or_volume (G_OBJECT (drive));
+ monitor->details->volume_links = g_list_prepend (monitor->details->volume_links, link);
+
+ id = get_human_readable_drive_id (drive);
+ nautilus_debug_log (is_initialization, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ " * Creating desktop link for drive %s (%p)",
+ id,
+ drive);
+ g_free (id);
+}
+
+static char *
+get_human_readable_volume_id (GnomeVFSVolume *volume)
+{
+ char *id;
+
+ id = gnome_vfs_volume_get_hal_udi (volume);
+ if (!id) {
+ id = gnome_vfs_volume_get_device_path (volume);
+
+ if (!id) {
+ id = gnome_vfs_volume_get_activation_uri (volume);
+
+ if (!id) {
+ id = "\"unknown\""; /* goddamnit */
+ }
+ }
+ }
+
+ return id;
+}
+
static void
create_volume_link (NautilusDesktopLinkMonitor *monitor,
GnomeVFSVolume *volume)
@@ -204,24 +280,198 @@ create_volume_link (NautilusDesktopLinkMonitor *monitor,
- GnomeVFSVolume *volume)
+ GnomeVFSVolume *volume,
+ gboolean is_initialization)
{
NautilusDesktopLink *link;
+ char *id;
+ char *link_name;
link = NULL;
- if (!gnome_vfs_volume_is_user_visible (volume)) {
+ if (!should_show_volume (volume)) {
+ id = get_human_readable_volume_id (volume);
+ nautilus_debug_log (is_initialization, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ " * Not creating desktop link for volume %s (%p)",
+ id,
+ volume);
+ g_free (id);
return;
}
@@ -442,6 +587,16 @@ index 6469c6a..c8e85d9 100644
- monitor->details->volume_links = g_list_prepend (monitor->details->volume_links, link);
+ link = nautilus_desktop_link_new_from_drive_or_volume (G_OBJECT (volume));
+ monitor->details->volume_links = g_list_prepend (monitor->details->volume_links, link);
+
+ id = get_human_readable_volume_id (volume);
+ link_name = nautilus_desktop_link_get_display_name (link);
+ nautilus_debug_log (is_initialization, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ " * Creating desktop link \"%s\" for volume %s (%p)",
+ link_name,
+ id,
+ volume);
+ g_free (id);
+ g_free (link_name);
+}
+
+static gboolean
@@ -459,7 +614,7 @@ index 6469c6a..c8e85d9 100644
+
+ link_drive = GNOME_VFS_DRIVE (drive_or_volume);
+
+ if (link_drive == drive) {
+ if (gnome_vfs_drive_compare (link_drive, drive) == 0) {
+ same = TRUE;
+ }
+
@@ -471,7 +626,7 @@ index 6469c6a..c8e85d9 100644
+ link_volume = GNOME_VFS_VOLUME (drive_or_volume);
+ link_drive = gnome_vfs_volume_get_drive (link_volume);
+
+ if (link_drive == drive) {
+ if (link_drive && gnome_vfs_drive_compare (link_drive, drive) == 0) {
+ same = TRUE;
+ }
+
@@ -480,11 +635,11 @@ index 6469c6a..c8e85d9 100644
+ }
+
+ gnome_vfs_volume_unref (link_volume);
}
+ }
+
+ return same;
}
+}
+
+static NautilusDesktopLink *
+find_unique_link_for_drive (NautilusDesktopLinkMonitor *monitor,
+ GnomeVFSDrive *drive)
@@ -493,7 +648,7 @@ index 6469c6a..c8e85d9 100644
+ NautilusDesktopLink *first_volume_link_for_drive;
+
+ first_volume_link_for_drive = NULL;
+
+ for (l = monitor->details->volume_links; l; l = l->next) {
+ NautilusDesktopLink *link;
+
@@ -521,30 +676,49 @@ index 6469c6a..c8e85d9 100644
+ NautilusDesktopLinkMonitor *monitor)
+{
+ NautilusDesktopLink *link;
+ char *id;
+
+ /* fprintf (stderr, "drive connected!\n"); */
+ id = get_human_readable_drive_id (drive);
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "Drive %s (%p) got connected",
+ id,
+ drive);
+ g_free (id);
+
+ link = find_unique_link_for_drive (monitor, drive);
+
+ if (link)
+ if (link) {
+ id = get_human_readable_drive_id (drive);
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "Not creating a desktop link for drive %s (%p) since there is already a link for it",
+ id,
+ drive);
+ g_free (id);
+
+ return; /* huh, we already have a link for that drive... */
}
+
+ create_drive_link (monitor, drive);
+}
+
+ create_drive_link (monitor, drive, FALSE);
}
+static void
+drive_disconnected_callback (GnomeVFSVolumeMonitor *volume_monitor,
+ GnomeVFSDrive *drive,
+ NautilusDesktopLinkMonitor *monitor)
+{
+ GList *l;
+ char *id;
+
+ /* fprintf (stderr, "drive disconnected!\n"); */
+ id = get_human_readable_drive_id (drive);
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "Drive %s (%p) got disconnected",
+ id,
+ drive);
+
+ /* Remove all the links that correspond to that drive, even if they have
+ * mounted volumes.
+ */
+
+ l = monitor->details->volume_links;
+
+ while (l) {
@@ -555,13 +729,26 @@ index 6469c6a..c8e85d9 100644
+ link = NAUTILUS_DESKTOP_LINK (l->data);
+
+ if (link_corresponds_to_drive (link, drive)) {
+ char *link_name;
+
+ link_name = nautilus_desktop_link_get_display_name (link);
+
+ g_object_unref (link);
+ monitor->details->volume_links = g_list_remove_link (monitor->details->volume_links, l);
+ g_list_free_1 (l);
+
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "Removing desktop link \"%s\" corresponding to drive %s (%p)",
+ link_name,
+ id,
+ drive);
+ g_free (link_name);
+ }
+
+ l = next;
+ }
+
+ g_free (id);
+}
static void
@@ -571,8 +758,13 @@ index 6469c6a..c8e85d9 100644
{
- create_volume_link (monitor, volume);
+ GnomeVFSDrive *drive;
+ char *id;
+
+ /* fprintf (stderr, "volume mounted!\n"); */
+ id = get_human_readable_volume_id (volume);
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "Volume %s (%p) got mounted",
+ id,
+ volume);
+
+ drive = gnome_vfs_volume_get_drive (volume);
+
@@ -589,16 +781,25 @@ index 6469c6a..c8e85d9 100644
+ gnome_vfs_drive_unref (drive);
+
+ if (link) {
+ /* fprintf (stderr, "updating desktop link from mounted volume\n"); */
+ char *link_name;
+
+ link_name = nautilus_desktop_link_get_display_name (link);
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ " * Updating existing desktop link \"%s\" for mounted volume %s (%p)",
+ link_name,
+ id,
+ volume);
+ g_free (link_name);
+
+ nautilus_desktop_link_update_from_volume (link, volume);
+ } else {
+ /* fprintf (stderr, "creating desktop link\n"); */
+ create_volume_link (monitor, volume);
+ create_volume_link (monitor, volume, FALSE);
+ }
+ } else {
+ /* fprintf (stderr, "creating desktop link\n"); */
+ create_volume_link (monitor, volume);
+ create_volume_link (monitor, volume, FALSE);
+ }
+
+ g_free (id);
+}
+
+static NautilusDesktopLink *
@@ -618,7 +819,7 @@ index 6469c6a..c8e85d9 100644
+ same = FALSE;
+
+ if (GNOME_IS_VFS_VOLUME (drive_or_volume)) {
+ same = (GNOME_VFS_VOLUME (drive_or_volume) == volume);
+ same = (gnome_vfs_volume_compare (GNOME_VFS_VOLUME (drive_or_volume), volume) == 0);
+ gnome_vfs_volume_unref (GNOME_VFS_VOLUME (drive_or_volume));
+ } else {
+ gnome_vfs_drive_unref (GNOME_VFS_DRIVE (drive_or_volume));
@@ -632,7 +833,7 @@ index 6469c6a..c8e85d9 100644
}
@@ -230,22 +480,31 @@ volume_unmounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
@@ -230,25 +605,63 @@ volume_unmounted_callback (GnomeVFSVolumeMonitor *volume_monitor,
GnomeVFSVolume *volume,
NautilusDesktopLinkMonitor *monitor)
{
@@ -641,6 +842,23 @@ index 6469c6a..c8e85d9 100644
- GnomeVFSVolume *other_volume;
+ GnomeVFSDrive *drive;
+ gboolean remove_link;
+ char *id;
+ char *link_name = NULL;
+
+ id = get_human_readable_volume_id (volume);
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "Volume %s (%p) got unmounted",
+ id,
+ volume);
+
+ link = find_link_for_volume (monitor, volume);
+ if (!link) {
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ " * No desktop link for volume %s (%p); not doing anything",
+ id,
+ volume);
+ goto out;
+ }
- link = NULL;
- for (l = monitor->details->volume_links; l != NULL; l = l->next) {
@@ -649,18 +867,19 @@ index 6469c6a..c8e85d9 100644
- gnome_vfs_volume_unref (other_volume);
- link = l->data;
- break;
+ /* fprintf (stderr, "volume unmounted!\n"); */
+
+ link = find_link_for_volume (monitor, volume);
+ if (!link) {
+ return;
+ }
+ link_name = nautilus_desktop_link_get_display_name (link);
+
+ remove_link = FALSE;
+
+ drive = gnome_vfs_volume_get_drive (volume);
+ if (drive) {
+ if (should_show_drive (drive, volume)) {
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "Updating desktop link \"%s\" from unmounted volume %s (%p)",
+ link_name,
+ id,
+ volume);
+
+ nautilus_desktop_link_update_from_volume (link, volume);
+ } else {
+ remove_link = TRUE;
@@ -672,15 +891,54 @@ index 6469c6a..c8e85d9 100644
- if (link) {
+ if (remove_link) {
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "Removing desktop link \"%s\" corresponding to unmounted volume %s (%p)",
+ link_name,
+ id,
+ volume);
+
monitor->details->volume_links = g_list_remove (monitor->details->volume_links, link);
g_object_unref (link);
}
@@ -322,32 +581,60 @@ desktop_network_visible_changed (gpointer callback_data)
+
+ g_free (link_name);
+
+out:
+ g_free (id);
}
static void
@@ -257,7 +670,11 @@ update_link_visibility (NautilusDesktopLinkMonitor *monitor,
NautilusDesktopLinkType link_type,
const char *preference_key)
{
- if (eel_preferences_get_boolean (preference_key)) {
+ gboolean enabled;
+
+ enabled = eel_preferences_get_boolean (preference_key);
+
+ if (enabled) {
if (*link_ref == NULL) {
*link_ref = nautilus_desktop_link_new (link_type);
}
@@ -267,6 +684,11 @@ update_link_visibility (NautilusDesktopLinkMonitor *monitor,
*link_ref = NULL;
}
}
+
+ nautilus_debug_log (FALSE, NAUTILUS_DEBUG_LOG_DESKTOP_LINKS,
+ "Desktop link %s got %s",
+ preference_key,
+ enabled ? "enabled" : "disabled");
}
static void
@@ -322,53 +744,98 @@ desktop_network_visible_changed (gpointer callback_data)
}
static void
-desktop_volumes_visible_changed (gpointer callback_data)
+refresh_volume_links (NautilusDesktopLinkMonitor *monitor)
+refresh_volume_links (NautilusDesktopLinkMonitor *monitor, gboolean is_initialization)
{
GnomeVFSVolumeMonitor *volume_monitor;
- NautilusDesktopLinkMonitor *monitor;
@@ -689,6 +947,9 @@ index 6469c6a..c8e85d9 100644
volume_monitor = gnome_vfs_get_volume_monitor ();
- monitor = NAUTILUS_DESKTOP_LINK_MONITOR (callback_data);
+
+ nautilus_debug_log (is_initialization, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "Refreshing drive and volume links");
+
+ /* Free existing links */
+
+ g_list_foreach (monitor->details->volume_links, (GFunc)g_object_unref, NULL);
@@ -715,13 +976,9 @@ index 6469c6a..c8e85d9 100644
+ GnomeVFSDrive *drive;
+
+ drive = GNOME_VFS_DRIVE (l->data);
+ create_drive_link (monitor, drive);
+ create_drive_link (monitor, drive, is_initialization);
+ gnome_vfs_drive_unref (drive);
}
- } else {
- g_list_foreach (monitor->details->volume_links, (GFunc)g_object_unref, NULL);
- g_list_free (monitor->details->volume_links);
- monitor->details->volume_links = NULL;
+ }
+ g_list_free (drives);
+
+ /* Volumes */
@@ -731,10 +988,17 @@ index 6469c6a..c8e85d9 100644
+ GnomeVFSVolume *volume;
+
+ volume = GNOME_VFS_VOLUME (l->data);
+ create_volume_link (monitor, volume);
+ create_volume_link (monitor, volume, is_initialization);
+ gnome_vfs_volume_unref (volume);
+ }
}
+ g_list_free (volumes);
} else {
- g_list_foreach (monitor->details->volume_links, (GFunc)g_object_unref, NULL);
- g_list_free (monitor->details->volume_links);
- monitor->details->volume_links = NULL;
+ nautilus_debug_log (is_initialization, NAUTILUS_DEBUG_LOG_DRIVES_VOLUMES,
+ "%s is disabled; not creating desktop links for drives/volumes",
+ NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE);
}
}
@@ -744,14 +1008,34 @@ index 6469c6a..c8e85d9 100644
+ NautilusDesktopLinkMonitor *monitor;
+
+ monitor = NAUTILUS_DESKTOP_LINK_MONITOR (callback_data);
+ refresh_volume_links (monitor);
+ refresh_volume_links (monitor, FALSE);
+}
+
+static void
create_link_and_add_preference (NautilusDesktopLink **link_ref,
NautilusDesktopLinkType link_type,
const char *preference_key,
@@ -365,8 +652,6 @@ static void
EelPreferencesCallback callback,
gpointer callback_data)
{
- if (eel_preferences_get_boolean (preference_key)) {
+ gboolean enabled;
+
+ enabled = eel_preferences_get_boolean (preference_key);
+
+ if (enabled) {
*link_ref = nautilus_desktop_link_new (link_type);
}
eel_preferences_add_callback (preference_key, callback, callback_data);
+
+ nautilus_debug_log (TRUE, NAUTILUS_DEBUG_LOG_DESKTOP_LINKS,
+ "Desktop link %s is %s",
+ preference_key,
+ enabled ? "enabled" : "disabled");
}
static void
nautilus_desktop_link_monitor_init (gpointer object, gpointer klass)
{
NautilusDesktopLinkMonitor *monitor;
@@ -759,8 +1043,13 @@ index 6469c6a..c8e85d9 100644
- GnomeVFSVolume *volume;
GnomeVFSVolumeMonitor *volume_monitor;
+ nautilus_debug_log (TRUE, NAUTILUS_DEBUG_LOG_DESKTOP_LINKS,
+ "Initializing desktop link monitor");
+
monitor = NAUTILUS_DESKTOP_LINK_MONITOR (object);
@@ -404,22 +689,22 @@ nautilus_desktop_link_monitor_init (gpointer object, gpointer klass)
the_link_monitor = monitor;
@@ -404,22 +871,22 @@ nautilus_desktop_link_monitor_init (gpointer object, gpointer klass)
desktop_network_visible_changed,
monitor);
@@ -776,7 +1065,7 @@ index 6469c6a..c8e85d9 100644
- gnome_vfs_volume_unref (volume);
- }
- g_list_free (volumes);
+ refresh_volume_links (monitor);
+ refresh_volume_links (monitor, TRUE);
eel_preferences_add_callback (NAUTILUS_PREFERENCES_DESKTOP_VOLUMES_VISIBLE,
desktop_volumes_visible_changed,
@@ -806,7 +1095,7 @@ index 2c3c23d..1622ced 100644
#endif /* NAUTILUS_DESKTOP_LINK_MONITOR_H */
diff --git a/libnautilus-private/nautilus-desktop-link.c b/libnautilus-private/nautilus-desktop-link.c
index e27bac4..621245a 100644
index e27bac4..9ce77c6 100644
--- a/libnautilus-private/nautilus-desktop-link.c
+++ b/libnautilus-private/nautilus-desktop-link.c
@@ -54,8 +54,8 @@ struct NautilusDesktopLinkDetails {
@@ -981,7 +1270,7 @@ index e27bac4..621245a 100644
+
+ drive = gnome_vfs_volume_get_drive (volume);
+
+ g_assert (G_OBJECT (drive) == G_OBJECT (link->details->drive_or_volume));
+ g_assert (gnome_vfs_drive_compare (drive, GNOME_VFS_DRIVE (link->details->drive_or_volume)) == 0);
+ gnome_vfs_drive_unref (drive);
+
+ /* The link is for a drive. If the new volume is mounted,
@@ -1000,7 +1289,7 @@ index e27bac4..621245a 100644
+ /* The link will get updated below */
+ } else {
+ g_assert (GNOME_IS_VFS_VOLUME (link->details->drive_or_volume));
+ g_assert (GNOME_VFS_VOLUME (link->details->drive_or_volume) == volume);
+ g_assert (gnome_vfs_volume_compare (volume, GNOME_VFS_VOLUME (link->details->drive_or_volume)) == 0);
+
+ /* If the volume got unmounted, restore the link's object to the
+ * corresponding drive. Otherwise, we shouldn't need to be
@@ -1059,7 +1348,7 @@ index 578e592..e127500 100644
#endif /* NAUTILUS_DESKTOP_LINK_H */
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index aa3b266..0a31995 100644
index 1300d1d..5279c37 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -301,11 +301,19 @@ typedef struct {
@@ -1083,7 +1372,7 @@ index aa3b266..0a31995 100644
NautilusFile *file;
NautilusDirectory *directory;
} FileAndDirectory;
@@ -8272,7 +8280,7 @@ cancel_activate (gpointer callback_data)
@@ -8277,7 +8285,7 @@ cancel_activate (gpointer callback_data)
parameters->cancelled = TRUE;
@@ -1092,7 +1381,7 @@ index aa3b266..0a31995 100644
nautilus_file_list_cancel_call_when_ready (parameters->files_handle);
nautilus_file_list_free (parameters->files);
g_free (parameters);
@@ -8644,16 +8652,81 @@ activate_callback (GList *files, gpointer callback_data)
@@ -8649,16 +8657,81 @@ activate_callback (GList *files, gpointer callback_data)
}
static void
@@ -1176,7 +1465,7 @@ index aa3b266..0a31995 100644
if (!succeeded && !parameters->cancelled) {
if (*error == 0 &&
@@ -8666,29 +8739,25 @@ activation_drive_mounted_callback (gboolean succeeded,
@@ -8671,29 +8744,25 @@ activation_drive_mounted_callback (gboolean succeeded,
}
}
@@ -1222,7 +1511,7 @@ index aa3b266..0a31995 100644
}
static void
@@ -8696,7 +8765,6 @@ activate_activation_uris_ready_callback (GList *files_ignore,
@@ -8701,7 +8770,6 @@ activate_activation_uris_ready_callback (GList *files_ignore,
gpointer callback_data)
{
ActivateParameters *parameters;
@@ -1230,7 +1519,7 @@ index aa3b266..0a31995 100644
GList *l, *next;
NautilusFile *file;
NautilusFile *actual_file;
@@ -8705,7 +8773,6 @@ activate_activation_uris_ready_callback (GList *files_ignore,
@@ -8710,7 +8778,6 @@ activate_activation_uris_ready_callback (GList *files_ignore,
char *uri;
parameters = callback_data;
@@ -1238,7 +1527,7 @@ index aa3b266..0a31995 100644
for (l = parameters->files; l != NULL; l = next) {
file = NAUTILUS_FILE (l->data);
@@ -8728,24 +8795,46 @@ activate_activation_uris_ready_callback (GList *files_ignore,
@@ -8733,24 +8800,46 @@ activate_activation_uris_ready_callback (GList *files_ignore,
drive = nautilus_file_get_drive (file);
if (drive != NULL &&
!gnome_vfs_drive_is_mounted (drive)) {
@@ -1292,7 +1581,7 @@ index aa3b266..0a31995 100644
/* activation_drive_mounted_callback will reveal whether all mounts were successful */
parameters->mount_success = TRUE;
@@ -8869,7 +8958,7 @@ fm_directory_view_activate_files (FMDirectoryView *view,
@@ -8874,7 +8963,7 @@ fm_directory_view_activate_files (FMDirectoryView *view,
parameters->mode = mode;
parameters->flags = flags;
parameters->mount_success = FALSE;

9
nautilus.changes
View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Jan 18 20:31:09 CET 2008 - jpr@suse.de
- Updated nautilus-drives-and-volumes-on-desktop.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=335411 - Nautilus
crashes when it gets a "volume-mounted" signal for a volume that is
already mounted. This also adds two new logging domains to Nautilus:
"drives-volumes" and "desktop-links".
-------------------------------------------------------------------
Thu Oct 11 16:39:38 CEST 2007 - sbrabec@suse.cz

391
nautilus.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package nautilus (Version 2.20.0)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -15,7 +15,7 @@ BuildRequires: cdparanoia eel-devel fdupes gnome-common gnome-icon-theme gnome-
License: GPL v2 or later
Group: Productivity/File utilities
Version: 2.20.0
Release: 11
Release: 51
Summary: The GNOME 2.x Desktop File Manager
Source: ftp://ftp.gnome.org/pub/gnome/sources/nautilus/2.20/%{name}-%{version}.tar.bz2
Url: http://www.gnome.org
@@ -164,19 +164,26 @@ fi
%{_libdir}/*.*a
%{_includedir}/*
%{_libdir}/pkgconfig/*.pc
%changelog
* Thu Oct 11 2007 - sbrabec@suse.cz
* Fri Jan 18 2008 jpr@suse.de
- Updated nautilus-drives-and-volumes-on-desktop.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=335411 - Nautilus
crashes when it gets a "volume-mounted" signal for a volume that is
already mounted. This also adds two new logging domains to Nautilus:
"drives-volumes" and "desktop-links".
* Thu Oct 11 2007 sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
* Tue Sep 18 2007 - sbrabec@suse.cz
* Tue Sep 18 2007 sbrabec@suse.cz
- Updated to version 2.20.0:
* Load thumbnails asynchronously
* Support direct save DnD (XDS)
* Fix up octal permission display
* Store window keep-above and stickines state across sessions
* Wed Sep 05 2007 - maw@suse.de
* Wed Sep 05 2007 maw@suse.de
- Don't require gnome2-user-docs, which now supplements
nautilus (#297833).
* Wed Aug 29 2007 - maw@suse.de
* Wed Aug 29 2007 maw@suse.de
- Update to version 2.19.91:
* Be more robust against broken extensions
* Set current working directory right on desktop when running scripts
@@ -187,22 +194,22 @@ fi
* UI terminology consistency fix
* Build fix
- Refresh nautilus-search-desktop.patch.
* Thu Aug 16 2007 - federico@novell.com
* Thu Aug 16 2007 federico@novell.com
- Updated nautilus-drives-and-volumes-on-desktop.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=298802 - after burning a
CD and re-mounting the CD, Nautilus uses 100%% CPU. This simply
includes the last patch from
https://bugzilla.novell.com/show_bug.cgi?id=276193#c42
* Fri Aug 10 2007 - federico@novell.com
* Fri Aug 10 2007 federico@novell.com
- Added nautilus-330298-297983-fix-overlapping-desktop-icons.diff to
fix https://bugzilla.novell.com/show_bug.cgi?id=297983 - desktop
icons would overlap when inserting removable media, if the
previously-saved location for the corresponding icon now has a
different icon nearby.
* Mon Aug 06 2007 - maw@suse.de
* Mon Aug 06 2007 maw@suse.de
- Split out -lang subpackage
- Use %%fdupes.
* Wed Aug 01 2007 - maw@suse.de
* Wed Aug 01 2007 maw@suse.de
- Update to version 2.19.6
- Memory leaks plugged
- Crashes fixed
@@ -215,7 +222,7 @@ fi
- Add more tooltips and use new gtk+ tootips API
- Better handling of unreadable directories during search
- Updated translations.
* Tue Jul 10 2007 - maw@suse.de
* Tue Jul 10 2007 maw@suse.de
- Update to version 2.19.4
- Fix crashes and leaks
- Fix hang with recursive symlinks
@@ -225,18 +232,18 @@ fi
- Better handling of unicode search terms
- Allow activating the zoom context menu by keyboard
- Allow renaming network servers' icons
* Thu Jun 07 2007 - sbrabec@suse.cz
* Thu Jun 07 2007 sbrabec@suse.cz
- Do not overwrite auto-generated files.
- Removed invalid desktop Category "Application" (#254654).
* Mon Mar 26 2007 - sbrabec@suse.cz
* Mon Mar 26 2007 sbrabec@suse.cz
- Fixed BuildRequires.
* Thu Mar 22 2007 - maw@suse.de
* Thu Mar 22 2007 maw@suse.de
- Update to version 2.18.0.1
- intltool is now a build requirement
- Several code cleanups
- Bug fixes, including p.g.o 408155, 333151, 358172, 408155,
409276, 407150, 407618, and 368661.
* Tue Mar 13 2007 - maw@suse.de
* Tue Mar 13 2007 maw@suse.de
- Update to version 2.17.91
- Bug fixes, including bugzilla.gnome.org #364466, #403255,
[#138058], #340495, #357955, #403565, #357955, #362034,
@@ -244,23 +251,23 @@ fi
[#374623], #382207, #376952, #384078, #383840, #45953, #350579,
[#318373], #132326, #372550, #338353, #372471, #330298, #155337,
[#174766], #122688, #321175, #349840, #356124, #351713, #348161.
* Tue Feb 27 2007 - dmueller@suse.de
* Tue Feb 27 2007 dmueller@suse.de
- adjust BuildRequires: libexif->libexif-devel
* Mon Feb 05 2007 - sbrabec@suse.cz
* Mon Feb 05 2007 sbrabec@suse.cz
- Fixed Categories (#242053).
* Fri Jan 12 2007 - mtgordon@suse.de
* Fri Jan 12 2007 mtgordon@suse.de
- Added nautilus-181941-i18n.patch to mark for translation a
previously unmarked string (marked in other locations in the app,
sparing the need for further l10n). Fixes
https://bugzilla.novell.com/show_bug.cgi?id=181941 and sent upstream
at http://bugzilla.gnome.org/show_bug.cgi?id=394328
* Mon Dec 18 2006 - sbrabec@suse.cz
* Mon Dec 18 2006 sbrabec@suse.cz
- Prefix changed to /usr.
- Spec file cleanup.
* Tue Nov 21 2006 - sbrabec@suse.cz
* Tue Nov 21 2006 sbrabec@suse.cz
- Do not explicitly require mDNSResponder-lib blocking avahi compat
package.
* Wed Nov 08 2006 - federico@novell.com
* Wed Nov 08 2006 federico@novell.com
- Updated nautilus-drives-and-volumes-on-desktop.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=215351. Floppy icons
disappeared from the desktop after unmounting the floppy. This also
@@ -268,7 +275,7 @@ fi
there was a race condition when mounting drives. This caused the
activation URIs of the corresponding NautilusFiles not to be updated
correctly.
* Wed Nov 01 2006 - federico@novell.com
* 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).
@@ -296,29 +303,29 @@ fi
to aid debugging.
- Updated descriptions inside the rest of the patches.
- Renumbered patches.
* Tue Oct 31 2006 - joeshaw@suse.de
* 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)
* Sat Oct 14 2006 - danw@suse.de
* Sat Oct 14 2006 danw@suse.de
- Remove dead patches
* Tue Oct 03 2006 - jhargadon@suse.de
* Tue Oct 03 2006 jhargadon@suse.de
- update to version 2.16.1
- Default to search in current directory for non-indexed search
- Fix clash with symbol names in gtk+
* Wed Sep 20 2006 - sbrabec@suse.cz
* Wed Sep 20 2006 sbrabec@suse.cz
- Update MIME database in scriptlets (#201729).
* Thu Sep 14 2006 - jhargadon@suse.de
* Thu Sep 14 2006 jhargadon@suse.de
- update to version 2.16.0
- Handle enter activation when using typeahead search
- Avoid using gnome_vfs_is_local in wrong places
- Translations
* Wed Aug 30 2006 - jhargadon@suse.de
* Wed Aug 30 2006 jhargadon@suse.de
- update to version 2.15.92.1
- Fix crash on startup
- Fix crash on changing owner/group of file
- Fix double free
- Make sure all strings are displayed translated
* Fri Aug 18 2006 - jhargadon@suse.de
* Fri Aug 18 2006 jhargadon@suse.de
- update to version 2.15.91
- Use gtk recent files code
- Fix file change notification regression
@@ -333,7 +340,7 @@ fi
- New icons for trash operations
- Add a button/text toggle button to the location bar
- Fix leak
* Mon Aug 07 2006 - gekker@suse.de
* Mon Aug 07 2006 gekker@suse.de
- Update to version 2.15.4
- Remove upstreamed patches
* New permission dialog with recursion and selinx support
@@ -407,10 +414,10 @@ fi
* middle click in browser mode opens new window
* Handle cancellation of authentication better
* Add format menu item for floppy drives
* Wed Jun 07 2006 - jpr@suse.de
* Wed Jun 07 2006 jpr@suse.de
- Don't update the .desktop file if it doesn't exist
(really fix #177551)
* Thu Jun 01 2006 - federico@novell.com
* 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.
@@ -419,69 +426,69 @@ fi
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
* 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
files were being filtered erroneously if they didn't have
OnlyShowIn/NotShowIn keys.
* Mon May 22 2006 - joeshaw@suse.de
* Mon May 22 2006 joeshaw@suse.de
- Only patch in the nautilus-search.desktop file on SL, not SLE,
since the new main menu has search built-in. (bnc #177551)
* Wed May 17 2006 - sbrabec@suse.cz
* Wed May 17 2006 sbrabec@suse.cz
- nautilus-search-bar.c added to POTFILES.in.
* Wed May 17 2006 - sbrabec@suse.cz
* Wed May 17 2006 sbrabec@suse.cz
- Fixed I18N problems:
* untranslatable Search string (#173448)
* uninitialized locale (#173448#c3)
* Wed May 17 2006 - federico@novell.com
* Wed May 17 2006 federico@novell.com
- Updated nautilus-158158-ignore-foreign-desktop-files.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=176123. The
"OnlyShowIn" key in desktop files can contain multiple items. Also
pay attention to the "NotShowIn" key.
* Mon May 15 2006 - federico@novell.com
* Mon May 15 2006 federico@novell.com
- Added nautilus-158279-add-location-toggle-button.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=158279. This adds a
toggle button to the left of path bar in navigation windows.
Pressing this button will switch to using a location entry instead
of the path bar.
* Fri May 12 2006 - federico@novell.com
* 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
* Wed May 10 2006 joeshaw@suse.de
- Update search patch to remove annoying "queuing <whatever>"
debug spew.
* Wed May 10 2006 - federico@novell.com
* 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
* 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
dialog for file operations now gets updated correctly if several
small files get copied before a large file.
* Mon May 01 2006 - dobey@suse.de
* Mon May 01 2006 dobey@suse.de
- Added nautilus-trash-icon.patch to use the theme's trash icon,
rather than the delete icon, for the "Move to Trash" menu items
* Thu Apr 27 2006 - federico@novell.com
* Thu Apr 27 2006 federico@novell.com
- Updated nautilus-155010-desktop-volume-policy.diff to fix bug
https://bugzilla.novell.com/show_bug.cgi?id=168280. This makes
Nautilus not display two volume icons for no-media-check devices.
* Wed Apr 19 2006 - federico@suse.de
* Wed Apr 19 2006 federico@suse.de
- Removed dot-hidden.dif. This fixes bug #158158 completely; that
patch is obsoleted by the updated
nautilus-158158-ignore-foreign-desktop-files.diff.
* Tue Apr 18 2006 - federico@novell.com
* Tue Apr 18 2006 federico@novell.com
- Added nautilus-158158-ignore-foreign-desktop-files.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=158158. This makes
Nautilus ignore .desktop files whose OnlyShowIn property indicates
that they are specific to another desktop environment.
* Tue Apr 18 2006 - joeshaw@suse.de
* Tue Apr 18 2006 joeshaw@suse.de
- Update nautilus-search patch to correctly handle a search URI
being passed into nautilus on the command-line. (bnc #166158)
* Tue Apr 18 2006 - federico@novell.com
* Tue Apr 18 2006 federico@novell.com
- Added nautilus-155010-desktop-volume-policy.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=155010. This makes
Nautilus display the same set of drives and volumes as GTK+'s file
@@ -489,297 +496,297 @@ fi
easy access (in particular, drives that do not support notification
of inserted media, so we always need them to be accessible through
the GUI, as opposed to being automounted).
* Wed Mar 29 2006 - sbrabec@suse.cz
* Wed Mar 29 2006 sbrabec@suse.cz
- Handle inode/directory MIME type (#161824).
* Wed Mar 22 2006 - dobey@suse.de
* Wed Mar 22 2006 dobey@suse.de
- Added nautilus-unscaled-sidebar-menu-icons.patch to avoid scaling
icons in the sidebar and where those same icons are used in menus
* Mon Mar 20 2006 - federico@novell.com
* Mon Mar 20 2006 federico@novell.com
- Added nautilus-155337-icon-positioning-on-reload.diff to fix bug
[#155337]. Now icons in the desktop are not repositioned if the
desktop gets reloaded.
* Fri Mar 17 2006 - federico@novell.com
* Fri Mar 17 2006 federico@novell.com
- Added nautilus-perf-no-burn-uri-for-desktop.diff. This makes
Nautilus not do unnecessary work when initializing the desktop,
saving 1 second during login.
- Added nautilus-icon-registration.diff. This makes Nautilus do less
work when registering its stock icons, saving about 1.5 seconds
during login.
* Tue Mar 14 2006 - ro@suse.de
* Tue Mar 14 2006 ro@suse.de
- use beagle on ppc64 as well
* Thu Mar 02 2006 - sbrabec@suse.cz
* Thu Mar 02 2006 sbrabec@suse.cz
- Translations from upstream moved to gnome-patch-translation.
* Fri Feb 24 2006 - federico@novell.com
* Fri Feb 24 2006 federico@novell.com
- Added nautilus-130796-bad-icon-placement.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=130796. This makes
desktop icons with very wide labels be placed correctly, instead of
being placed flush left with the edge of the screen.
- Removed nautilus-115467-dont-overlap-volume-icons.diff as it is
integrated into the new patch.
* Wed Feb 22 2006 - joeshaw@suse.de
* Wed Feb 22 2006 joeshaw@suse.de
- Update nautilus search patch to not display UI when beagled
isn't running.
* Sun Feb 19 2006 - aj@suse.de
* Sun Feb 19 2006 aj@suse.de
- Reduce BuildRequires.
* Sat Feb 18 2006 - gekker@suse.de
* Sat Feb 18 2006 gekker@suse.de
- ficup .desktop files for UI team
* Mon Feb 13 2006 - federico@novell.com
* Mon Feb 13 2006 federico@novell.com
- Added nautilus-130796-bad-icon-placement.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=130796. This makes
desktop icons with very wide labels be placed correctly, instead of
being placed flush left with the edge of the screen.
* Thu Feb 09 2006 - federico@novell.com
* Thu Feb 09 2006 federico@novell.com
- Updated nautilus-6014-network-servers-desktop-icon.diff. Now we
hide the "Network Servers" icon in the desktop by default, but we
have new such items in the Places sidebar and the Go menu. This
fixes https://bugzilla.novell.com/show_bug.cgi?id=149685
* Wed Feb 01 2006 - sbrabec@suse.cz
* Wed Feb 01 2006 sbrabec@suse.cz
- Use translation compendium gnome-patch-translation.
* Tue Jan 31 2006 - federico@novell.com
* Tue Jan 31 2006 federico@novell.com
- Added nautilus-146947-rename-bad-parameters-message.diff to fix bug
[#146947]. If you try to use illegal characters when renaming a file
in an SMB share, Nautilus will now give you a better error message
instead of a generic "couldn't rename" one.
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Mon Jan 23 2006 - joeshaw@suse.de
* Mon Jan 23 2006 joeshaw@suse.de
- Update search patch to only search the files backend
* Wed Jan 18 2006 - gekker@suse.de
* Wed Jan 18 2006 gekker@suse.de
- Remove Requires: on control-center2 and gnome-themes (#142237)
* Tue Dec 06 2005 - sbrabec@suse.cz
* Tue Dec 06 2005 sbrabec@suse.cz
- Do not require beagle on ppc64.
- Enabled parallel build.
* Mon Dec 05 2005 - federico@novell.com
* Mon Dec 05 2005 federico@novell.com
- Removed nautilus-136167-no-default-window.diff. This is not the right fix, as external
apps rely on being to call just "nautilus" without command-line arguments, so that
Nautilus will open a window showing your Home directory. Moreover, there's no way for
Nautilus to tell if it was (re)started by the session manager upon login, or as a result
of exiting abnormally.
* Thu Dec 01 2005 - federico@novell.com
* Thu Dec 01 2005 federico@novell.com
- Updated nautilus-6014-network-servers-desktop-icon.diff. When doing "Clean up
by Name", the Network Servers icon will now be put after your Home icon.
* Thu Dec 01 2005 - federico@novell.com
* Thu Dec 01 2005 federico@novell.com
- Added nautilus-6014-network-servers-desktop-icon.diff to fix bug #6014. This
Creates a "Network Servers" icon in the desktop.
- Added nautilus-136167-no-default-window.diff to fix bug #136167.
When restarted abnormally, Nautilus will no longer open a window for
your home directory.
* Wed Nov 30 2005 - gekker@suse.de
* Wed Nov 30 2005 gekker@suse.de
- Update to version 2.12.2
* Mon Nov 28 2005 - gekker@suse.de
* Mon Nov 28 2005 gekker@suse.de
- Enable nauilus sidebar by default (#132383).
* Thu Nov 17 2005 - federico@novell.com
* Thu Nov 17 2005 federico@novell.com
- Added nautilus-default-thumbnail-size.diff. This makes the default size for
thumbnails be 64 pixels, which looks better with the default theme than the
old value of 96 pixels.
* Mon Nov 14 2005 - joeshaw@suse.de
* Mon Nov 14 2005 joeshaw@suse.de
- Update nautilus-search patch to 20051101.
- Add patch to hide the zoom and "view as" controls from the
location bar.
* Tue Nov 08 2005 - federico@novell.com
* Tue Nov 08 2005 federico@novell.com
- Added nautilus-115467-dont-overlap-volume-icons.diff to fix part of
bug #115467. With this, Nautilus will not overlap the icons when
you insert a CD or USB stick.
* Wed Nov 02 2005 - federico@novell.com
* Wed Nov 02 2005 federico@novell.com
- Updated nautilus-submount.patch to fix bug #127509. With this, the
"Unmount volume" command will appear again for network volumes.
* Thu Oct 13 2005 - gekker@suse.de
* Thu Oct 13 2005 gekker@suse.de
- Update to version 2.12.1
- Remove upstreamed patch
- Re-diff some patches so that they apply to new version
* Fri Oct 07 2005 - jpr@suse.de
* Fri Oct 07 2005 jpr@suse.de
- Update beagle search patch
* Thu Oct 06 2005 - federico@novell.com
* Thu Oct 06 2005 federico@novell.com
- Added nautilus-desktop-file-fallback-icons.diff so that .desktop
files which don't have an Icon property will fall back to some
reasonable icons depending on the type of the .desktop file.
* Thu Oct 06 2005 - gekker@suse.de
* Thu Oct 06 2005 gekker@suse.de
- Add DocPath to .desktop file
* Thu Oct 06 2005 - sbrabec@suse.de
* Thu Oct 06 2005 sbrabec@suse.de
- Require gnome-themes.
* Wed Oct 05 2005 - federico@novell.com
* Wed Oct 05 2005 federico@novell.com
- Added nautilus-consistent-home-folder-name.diff to make the name of
$HOME consistent between the path bar and side bar in Nautilus and
GtkFileChooser.
* Thu Sep 22 2005 - clahey@suse.de
* Thu Sep 22 2005 clahey@suse.de
- Turn off computer icon by default.
* Thu Sep 15 2005 - clahey@suse.de
* Thu Sep 15 2005 clahey@suse.de
- Added nautilus-icon.patch to change main icon. bug #117333
* Thu Sep 08 2005 - federico@novell.com
* Thu Sep 08 2005 federico@novell.com
- Added nautilus-114914-trash-unmount-removable-volume.diff to fix bug
[#114914]. With this, trash windows will display the correct contents
if there are mounted removable volumes.
* Thu Sep 08 2005 - adrian@suse.de
* Thu Sep 08 2005 adrian@suse.de
- do not show up in konqueror menus (#115880)
- Computer menu entry broken other desktops
* Mon Sep 05 2005 - gekker@suse.de
* Mon Sep 05 2005 gekker@suse.de
- Add submount patch (90584)
- Fix spec to apply both desktop search patches
* Mon Sep 05 2005 - mmj@suse.de
* Mon Sep 05 2005 mmj@suse.de
- Update to version 2.12.0 (GNOME 2.12)
* Sun Aug 28 2005 - jpr@suse.de
* Sun Aug 28 2005 jpr@suse.de
- Default to browser mode (113690)
- Add nautilus-search.desktop so gnome-panel has something to launch
for file searches (113691)
* Tue Aug 23 2005 - rodrigo@suse.de
* Tue Aug 23 2005 rodrigo@suse.de
- Update to version 2.11.92
* Tue Aug 16 2005 - sbrabec@suse.cz
* Tue Aug 16 2005 sbrabec@suse.cz
- Updated nautilus-search patch from Joe Shaw.
* Thu Aug 11 2005 - gekker@suse.de
* Thu Aug 11 2005 gekker@suse.de
- Update to version 2.11.91
* Tue Aug 02 2005 - gekker@suse.de
* Tue Aug 02 2005 gekker@suse.de
- Update to version 2.11.90
* Wed Jul 13 2005 - sbrabec@suse.cz
* Wed Jul 13 2005 sbrabec@suse.cz
- Updated to version 2.11.2.
- Added x-nautilus-search beagle integration patch.
- Removed static modules and .la files for libnautilus-private.
* Mon Jun 20 2005 - sbrabec@suse.cz
* Mon Jun 20 2005 sbrabec@suse.cz
- Updated to version 2.11.2.
* Wed Jun 01 2005 - sbrabec@suse.cz
* Wed Jun 01 2005 sbrabec@suse.cz
- Fixed devel requirements.
* Fri May 27 2005 - sbrabec@suse.cz
* Fri May 27 2005 sbrabec@suse.cz
- Removed obsolete PKG_CONFIG_PATH line.
* Wed May 18 2005 - sbrabec@suse.cz
* Wed May 18 2005 sbrabec@suse.cz
- Updated to version 2.10.1.
* Tue Mar 22 2005 - clahey@suse.de
* Tue Mar 22 2005 clahey@suse.de
- Fixes the bug where Places->Connect to server doesn't work
properly with SSH.
* Mon Mar 21 2005 - hhetter@suse.de
* Mon Mar 21 2005 hhetter@suse.de
- create .hidden if it does not exist on startup to hide some
kde services (#58875)
* Mon Mar 14 2005 - clahey@suse.de
* Mon Mar 14 2005 clahey@suse.de
- Remove nautilus-background-memory.patch. Fixes 72063.
* Wed Mar 09 2005 - gekker@suse.de
* Wed Mar 09 2005 gekker@suse.de
- Update to version 2.10.0 (GNOME 2.10).
* Mon Mar 07 2005 - gekker@suse.de
* Mon Mar 07 2005 gekker@suse.de
- Add nautilus-background-memory.patch
* Fri Mar 04 2005 - gekker@suse.de
* Fri Mar 04 2005 gekker@suse.de
- Update to version 2.9.92
* Fri Feb 11 2005 - gekker@suse.de
* Fri Feb 11 2005 gekker@suse.de
- Update to 2.9.91
- Remove upstreamed libexif patch
* Mon Feb 07 2005 - gekker@suse.de
* Mon Feb 07 2005 gekker@suse.de
- Update to version 2.9.90
* Mon Feb 07 2005 - ro@suse.de
* Mon Feb 07 2005 ro@suse.de
- added gnome-menus to neededforbuild
* Tue Feb 01 2005 - ro@suse.de
* Tue Feb 01 2005 ro@suse.de
- fix last change
* Mon Jan 31 2005 - ro@suse.de
* Mon Jan 31 2005 ro@suse.de
- create directory in build-root before packaging
* Fri Jan 28 2005 - sbrabec@suse.cz
* Fri Jan 28 2005 sbrabec@suse.cz
- Packaged empty directory for extensions.
* Wed Jan 19 2005 - clahey@suse.de
* Wed Jan 19 2005 clahey@suse.de
- Updated to version 2.9.2.
* Sun Jan 16 2005 - schwab@suse.de
* Sun Jan 16 2005 schwab@suse.de
- Fix requires.
* Thu Dec 16 2004 - hvogel@suse.de
* Thu Dec 16 2004 hvogel@suse.de
- fix filelist
* Thu Dec 16 2004 - hvogel@suse.de
* Thu Dec 16 2004 hvogel@suse.de
- require gnome-icon-theme for the desktop file icons
* Wed Dec 15 2004 - hvogel@suse.de
* Wed Dec 15 2004 hvogel@suse.de
- fix desktop file
* Tue Nov 23 2004 - hhetter@suse.de
* Tue Nov 23 2004 hhetter@suse.de
- require gnome2-user-docs (#48272)
* Fri Nov 19 2004 - ro@suse.de
* Fri Nov 19 2004 ro@suse.de
- removed extra aclocal include directive
* Mon Nov 01 2004 - mmj@suse.de
* Mon Nov 01 2004 mmj@suse.de
- Locale rename no to nb
* Tue Oct 19 2004 - sbrabec@suse.cz
* Tue Oct 19 2004 sbrabec@suse.cz
- Fixed support for libexif > 0.5.12.
http://bugzilla.gnome.org/show_bug.cgi?id=143743
* Tue Oct 12 2004 - sbrabec@suse.cz
* Tue Oct 12 2004 sbrabec@suse.cz
- Fixed libexecdir for bi-arch (#47050).
* Tue Oct 05 2004 - hhetter@suse.de
* Tue Oct 05 2004 hhetter@suse.de
- register more nautilus desktop files (#46811)
* Mon Oct 04 2004 - clahey@suse.de
* Mon Oct 04 2004 clahey@suse.de
- Updated string in browser-pref patch.
* Wed Sep 29 2004 - sbrabec@suse.cz
* Wed Sep 29 2004 sbrabec@suse.cz
- Implemented Open button for mime check warning (#46070),
* Wed Sep 29 2004 - hhetter@suse.de
* Wed Sep 29 2004 hhetter@suse.de
- fix Computer to drives location
* Tue Sep 21 2004 - hhetter@suse.de
* Tue Sep 21 2004 hhetter@suse.de
- show "drives:" location instead of "computer:" and recognize
/var/lib/Desktop
* Wed Sep 08 2004 - clahey@suse.de
* Wed Sep 08 2004 clahey@suse.de
- Added OnlyShowIn=GNOME;.
* Tue Aug 24 2004 - dave@suse.de
* Tue Aug 24 2004 dave@suse.de
- Added nautilus-location-crash.patch, ximian bug #63445
* Thu Aug 19 2004 - dave@suse.de
* Thu Aug 19 2004 dave@suse.de
- Added nautilus-submount.patch, fixes ximian bug #63101
* Tue Aug 17 2004 - dave@suse.de
* Tue Aug 17 2004 dave@suse.de
- Added nautilus-startup-notify.patch, fixes ximian bug #62605
* Thu Aug 12 2004 - dave@suse.de
* Thu Aug 12 2004 dave@suse.de
- Added patches:
nautilus-hide-desktop-files.patch - Update of
nautilus-hide-separators.patch, fixes ximian bug #62339
nautilus-trim-desktop-menu.patch - fixes ximian bug #59110
* Thu Jul 29 2004 - dave@suse.de
* Thu Jul 29 2004 dave@suse.de
- Added patches:
nautilus-desktop-keybindings.patch
nautilus-hide-separators.patch
nautilus-name-length.patch
nautilus-netscape-url-dnd-format.patch
* Wed Jun 23 2004 - dave@suse.de
* Wed Jun 23 2004 dave@suse.de
- Added nautilus-view-dispose.patch
* Thu Jun 17 2004 - dave@suse.de
* Thu Jun 17 2004 dave@suse.de
- Updated to nautilus-2.6.3
* Fri Jun 04 2004 - clahey@suse.de
* Fri Jun 04 2004 clahey@suse.de
- Updated to nautilus-2.6.2.
* Tue May 11 2004 - clahey@suse.de
* Tue May 11 2004 clahey@suse.de
- Added mailto patch.
* Tue May 04 2004 - sbrabec@suse.cz
* Tue May 04 2004 sbrabec@suse.cz
- Updated to version 2.6.1 (GNOME 2.6).
* Fri Apr 02 2004 - hhetter@suse.de
* Fri Apr 02 2004 hhetter@suse.de
- add drives:// to the uri schemes (Bug Id#37848)
* Thu Apr 01 2004 - hhetter@suse.de
* Thu Apr 01 2004 hhetter@suse.de
- nautilus-uri-schemes.dif: add yast-settings:// and suse-menu://
to the list of uris which desktop files are interpreted
(Bug Id#37848)
* Mon Mar 22 2004 - sbrabec@suse.cz
* Mon Mar 22 2004 sbrabec@suse.cz
- Provide and obsolete nautilus2-devel.
* Mon Mar 15 2004 - hhetter@suse.de
* Mon Mar 15 2004 hhetter@suse.de
- install MyComputer Icon on first user startup
* Wed Mar 10 2004 - sbrabec@suse.cz
* Wed Mar 10 2004 sbrabec@suse.cz
- Fixed gconf schemas installation (#33114).
* Wed Mar 03 2004 - hhetter@suse.de
* Wed Mar 03 2004 hhetter@suse.de
- remove control-center2 from #neededforbuild
* Wed Feb 25 2004 - hhetter@suse.de
* Wed Feb 25 2004 hhetter@suse.de
- apply nautilus-config-defaults.patch: start with sidebar
disabled, disable sound preview
- remove deprecated filesharing patch
* Fri Feb 20 2004 - sbrabec@suse.cz
* Fri Feb 20 2004 sbrabec@suse.cz
- Package renamed to nautilus.
* Thu Feb 12 2004 - hhetter@suse.de
* Thu Feb 12 2004 hhetter@suse.de
- gconf schema (de-)installation in %%post and %%postun
* Mon Feb 09 2004 - hhetter@suse.de
* Mon Feb 09 2004 hhetter@suse.de
- updated to version 2.4.2 [GNOME2.4.2]
- cs-typo patch has gone upstream, removed
* Sat Jan 10 2004 - adrian@suse.de
* Sat Jan 10 2004 adrian@suse.de
- let -devel package require libgnomeui-devel
* Mon Oct 27 2003 - sbrabec@suse.cz
* Mon Oct 27 2003 sbrabec@suse.cz
- Updated to version 2.4.1.
* Fri Oct 24 2003 - sbrabec@suse.cz
* Fri Oct 24 2003 sbrabec@suse.cz
- Fill start-here:// with more usable items.
* Tue Oct 21 2003 - sbrabec@suse.cz
* Tue Oct 21 2003 sbrabec@suse.cz
- Typo fix (cs.po).
* Tue Oct 07 2003 - sbrabec@suse.cz
* Tue Oct 07 2003 sbrabec@suse.cz
- Updated to version 2.4.0 (GNOME 2.4).
* Mon Sep 22 2003 - sbrabec@suse.cz
* Mon Sep 22 2003 sbrabec@suse.cz
- Obsolete medusa1.
* Wed Sep 17 2003 - kukuk@suse.de
* Wed Sep 17 2003 kukuk@suse.de
- Replace nautilus
* Sun Sep 07 2003 - adrian@suse.de
* Sun Sep 07 2003 adrian@suse.de
- add Categories
* Mon Aug 25 2003 - hhetter@suse.de
* Mon Aug 25 2003 hhetter@suse.de
- add filesharing patches
- add filesharing setup tool
* Tue Aug 19 2003 - sbrabec@suse.cz
* Tue Aug 19 2003 sbrabec@suse.cz
- Updated neededforbuild (rename of librsvg2, eel2).
* Mon Jul 14 2003 - sbrabec@suse.cz
* Mon Jul 14 2003 sbrabec@suse.cz
- Fixed aclocal command.
* Mon Jul 14 2003 - sbrabec@suse.cz
* Mon Jul 14 2003 sbrabec@suse.cz
- GNOME prefix change to /opt/gnome.
* Wed Jun 25 2003 - sbrabec@suse.cz
* Wed Jun 25 2003 sbrabec@suse.cz
- Updated to version 2.2.4.
- Updated neededforbuild.
- Turned on cdparanoia interface.
@@ -787,63 +794,63 @@ fi
- Packaged more docs.
- Require control-center2.
- Use %%find_lang.
* Wed Mar 19 2003 - hhetter@suse.de
* Wed Mar 19 2003 hhetter@suse.de
- updated to version 2.2.2
* Tue Feb 25 2003 - hhetter@suse.de
* Tue Feb 25 2003 hhetter@suse.de
- launch nautilus with --no-desktop in desktop files
to prevent it from overtaking the desktop in other environments
as GNOME (#24105)
* Thu Feb 20 2003 - hhetter@suse.de
* Thu Feb 20 2003 hhetter@suse.de
- remove the starthere - link hack which was only for
2.0.x versions of nautilus
* Thu Feb 13 2003 - sbrabec@suse.cz
* Thu Feb 13 2003 sbrabec@suse.cz
- Updated to version 2.2.1.
* Mon Feb 03 2003 - ro@suse.de
* Mon Feb 03 2003 ro@suse.de
- added startup-notification to neededforbuild
* Wed Jan 29 2003 - hhetter@suse.de
* Wed Jan 29 2003 hhetter@suse.de
- updated to version 2.2.0.2
* Mon Jan 20 2003 - ro@suse.de
* Mon Jan 20 2003 ro@suse.de
- update to 2.1.91
* Mon Dec 16 2002 - sbrabec@suse.cz
* Mon Dec 16 2002 sbrabec@suse.cz
- FHS fix.
- Updated %%files.
- Quick fix of starthere icon look.
* Thu Dec 12 2002 - sbrabec@suse.cz
* Thu Dec 12 2002 sbrabec@suse.cz
- Added /media path patch (fixes desktop icon look for removable
devices).
* Fri Nov 29 2002 - hhetter@suse.de
* Fri Nov 29 2002 hhetter@suse.de
- updated to version 2.0.8 [GNOME 2.0.3]
* Thu Oct 24 2002 - hhetter@suse.de
* Thu Oct 24 2002 hhetter@suse.de
- applied new ja-patch from mfabian (partly upstream)
- updated to version 2.0.7
* Mon Oct 21 2002 - mfabian@suse.de
* Mon Oct 21 2002 mfabian@suse.de
- fix corrupted character in ja.po
* Tue Sep 24 2002 - sbrabec@suse.cz
* Tue Sep 24 2002 sbrabec@suse.cz
- Added alsa-devel to neededforbuild, because esound-devel can require it.
* Thu Sep 19 2002 - sbrabec@suse.cz
* Thu Sep 19 2002 sbrabec@suse.cz
- Added alsa to neededforbuild, because esound can depend on it.
* Tue Sep 17 2002 - hhetter@suse.de
* Tue Sep 17 2002 hhetter@suse.de
- added better hu po-file from tvamosi
* Tue Sep 17 2002 - hhetter@suse.de
* Tue Sep 17 2002 hhetter@suse.de
- fix hungarian translation
* Tue Aug 20 2002 - hhetter@suse.de
* Tue Aug 20 2002 hhetter@suse.de
- added PreReq: filesystem
* Tue Aug 06 2002 - hhetter@suse.de
* Tue Aug 06 2002 hhetter@suse.de
- updated to version 2.0.3
* Drag and drop has been implemented in the list view.
* Performance enhancements in the icon factory.
* Various bugfixes.
* Sat Jul 27 2002 - adrian@suse.de
* Sat Jul 27 2002 adrian@suse.de
- fix neededforbuild
- use %%run_ldconfig
* Fri Jul 26 2002 - hhetter@suse.de
* Fri Jul 26 2002 hhetter@suse.de
- updated to version 2.0.2
* List view does not hang anymore
* reflect changes in eel 2.0.2 (background api)
* fix crash when invoking nautilus -q"
* Thu Jul 25 2002 - hhetter@suse.de
* Thu Jul 25 2002 hhetter@suse.de
- fix filelist
* Tue Jul 23 2002 - hhetter@suse.de
* Tue Jul 23 2002 hhetter@suse.de
- updated to version 2.0.1
* Various UI cleanups from the ui review
* Various bugfixes
@@ -862,32 +869,32 @@ fi
* Better handling of disk ejecting
* Proper handling of launching desktop files according
to the spec
* Thu Jun 20 2002 - hhetter@suse.de
* Thu Jun 20 2002 hhetter@suse.de
- don't install schemas while make install
* Fri Jun 14 2002 - hhetter@suse.de
* Fri Jun 14 2002 hhetter@suse.de
- filelist lookover
- supply schema file
* Tue Jun 11 2002 - hhetter@suse.de
* Tue Jun 11 2002 hhetter@suse.de
- updated to version 2.0.0
* Fri Jun 07 2002 - hhetter@suse.de
* Fri Jun 07 2002 hhetter@suse.de
- gnome-common in #neededforbuild
* Fri Jun 07 2002 - hhetter@suse.de
* Fri Jun 07 2002 hhetter@suse.de
- really build nautilus treeview and notes
* Thu Jun 06 2002 - ro@suse.de
* Thu Jun 06 2002 ro@suse.de
- fix libdir usage
* Wed Jun 05 2002 - hhetter@suse.de
* Wed Jun 05 2002 hhetter@suse.de
- added missing pkgtool files
* Wed Jun 05 2002 - hhetter@suse.de
* Wed Jun 05 2002 hhetter@suse.de
- updated to version 1.1.19, source frozen
- seperation from mozilla and gtkhtml modules
* Wed May 22 2002 - meissner@suse.de
* Wed May 22 2002 meissner@suse.de
- changed neededforbuild so we can run autoconf/aclocal, also added
libjpeg.
- %%_lib fixes.
* Tue May 07 2002 - ro@suse.de
* Tue May 07 2002 ro@suse.de
- up to 1.1.15
- added gail to neededforbuild (for eel2)
* Fri Feb 01 2002 - ro@suse.de
* Fri Feb 01 2002 ro@suse.de
- changed neededforbuild <libpng> to <libpng-devel-packages>
* Thu Jan 24 2002 - hhetter@suse.de
* Thu Jan 24 2002 hhetter@suse.de
- initial SuSE package for GNOME 2.0 platform