mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-10-02 14:03:39 +00:00
Removed public call to nautilus_volume_monitor_find_volumes and replaced
2000-08-18 Gene Z. Ragan <gzr@eazel.com> * libnautilus-extensions/nautilus-volume-monitor.c: * libnautilus-extensions/nautilus-volume-monitor.h: (nautilus_volume_monitor_initialize), (find_volumes): Removed public call to nautilus_volume_monitor_find_volumes and replaced with find_volumes which is called internally when class is initialized. * src/file-manager/fm-desktop-icon-view.c: (startup_create_mount_links), (fm_desktop_icon_view_initialize), (volume_mounted_callback): Create a callback that is called for each mounted volume to create mounted volume icons when desktop is created. * icons/trash-empty.png: * icons/trash-full.png: Added new Trash icons to try and make text appear centered.
This commit is contained in:
Gene Z. Ragan
Gene Ragan
parent
2011201933
commit
8ddbe9e76e
19
ChangeLog
19
ChangeLog
|
|
@ -1,3 +1,22 @@
|
|||
2000-08-18 Gene Z. Ragan <gzr@eazel.com>
|
||||
|
||||
* libnautilus-extensions/nautilus-volume-monitor.c:
|
||||
* libnautilus-extensions/nautilus-volume-monitor.h:
|
||||
(nautilus_volume_monitor_initialize), (find_volumes):
|
||||
Removed public call to nautilus_volume_monitor_find_volumes
|
||||
and replaced with find_volumes which is called internally
|
||||
when class is initialized.
|
||||
|
||||
* src/file-manager/fm-desktop-icon-view.c:
|
||||
(startup_create_mount_links), (fm_desktop_icon_view_initialize),
|
||||
(volume_mounted_callback):
|
||||
Create a callback that is called for each mounted volume
|
||||
to create mounted volume icons when desktop is created.
|
||||
|
||||
* icons/trash-empty.png:
|
||||
* icons/trash-full.png:
|
||||
Added new Trash icons to try and make text appear centered.
|
||||
|
||||
Fri Aug 18 21:22:17 2000 George Lebl <jirka@5z.com>
|
||||
|
||||
* components/hardware/nautilus-hardware-view.c
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 5.3 KiB |
|
|
@ -95,6 +95,7 @@ static void mount_volume_activate_floppy (Nautilus
|
|||
static gboolean mntent_is_removable_fs (struct mntent *ent);
|
||||
static void free_volume_info (NautilusVolume *volume,
|
||||
NautilusVolumeMonitor *monitor);
|
||||
static void find_volumes (NautilusVolumeMonitor *monitor);
|
||||
|
||||
NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusVolumeMonitor,
|
||||
nautilus_volume_monitor,
|
||||
|
|
@ -107,6 +108,8 @@ nautilus_volume_monitor_initialize (NautilusVolumeMonitor *monitor)
|
|||
monitor->details = g_new0 (NautilusVolumeMonitorDetails, 1);
|
||||
monitor->details->volumes_by_fsname = g_hash_table_new (g_str_hash, g_str_equal);
|
||||
monitor->details->volumes = NULL;
|
||||
|
||||
find_volumes (monitor);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -791,8 +794,8 @@ mntent_has_option(const char *optlist, const char *option)
|
|||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
nautilus_volume_monitor_find_volumes (NautilusVolumeMonitor *monitor)
|
||||
static void
|
||||
find_volumes (NautilusVolumeMonitor *monitor)
|
||||
{
|
||||
FILE *mef;
|
||||
struct mntent *ent;
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@ typedef gboolean (* NautilusEachVolumeFunction) (const NautilusVolume *, gpointe
|
|||
GtkType nautilus_volume_monitor_get_type (void);
|
||||
NautilusVolumeMonitor *nautilus_volume_monitor_get (void);
|
||||
gboolean nautilus_volume_monitor_volume_is_mounted (const char *mount_point);
|
||||
void nautilus_volume_monitor_find_volumes (NautilusVolumeMonitor *monitor);
|
||||
gboolean nautilus_volume_monitor_mount_unmount_removable (NautilusVolumeMonitor *monitor,
|
||||
const char *mount_point);
|
||||
gboolean nautilus_volume_monitor_is_volume_link (const char *path);
|
||||
|
|
|
|||
|
|
@ -95,6 +95,7 @@ static void mount_volume_activate_floppy (Nautilus
|
|||
static gboolean mntent_is_removable_fs (struct mntent *ent);
|
||||
static void free_volume_info (NautilusVolume *volume,
|
||||
NautilusVolumeMonitor *monitor);
|
||||
static void find_volumes (NautilusVolumeMonitor *monitor);
|
||||
|
||||
NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusVolumeMonitor,
|
||||
nautilus_volume_monitor,
|
||||
|
|
@ -107,6 +108,8 @@ nautilus_volume_monitor_initialize (NautilusVolumeMonitor *monitor)
|
|||
monitor->details = g_new0 (NautilusVolumeMonitorDetails, 1);
|
||||
monitor->details->volumes_by_fsname = g_hash_table_new (g_str_hash, g_str_equal);
|
||||
monitor->details->volumes = NULL;
|
||||
|
||||
find_volumes (monitor);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -791,8 +794,8 @@ mntent_has_option(const char *optlist, const char *option)
|
|||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
nautilus_volume_monitor_find_volumes (NautilusVolumeMonitor *monitor)
|
||||
static void
|
||||
find_volumes (NautilusVolumeMonitor *monitor)
|
||||
{
|
||||
FILE *mef;
|
||||
struct mntent *ent;
|
||||
|
|
|
|||
|
|
@ -95,7 +95,6 @@ typedef gboolean (* NautilusEachVolumeFunction) (const NautilusVolume *, gpointe
|
|||
GtkType nautilus_volume_monitor_get_type (void);
|
||||
NautilusVolumeMonitor *nautilus_volume_monitor_get (void);
|
||||
gboolean nautilus_volume_monitor_volume_is_mounted (const char *mount_point);
|
||||
void nautilus_volume_monitor_find_volumes (NautilusVolumeMonitor *monitor);
|
||||
gboolean nautilus_volume_monitor_mount_unmount_removable (NautilusVolumeMonitor *monitor,
|
||||
const char *mount_point);
|
||||
gboolean nautilus_volume_monitor_is_volume_link (const char *path);
|
||||
|
|
|
|||
|
|
@ -183,6 +183,43 @@ fm_desktop_icon_view_handle_middle_click (NautilusIconContainer *icon_container,
|
|||
ButtonPressMask, (XEvent *) &x_event);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
startup_create_mount_links (const NautilusVolume *volume, gpointer data)
|
||||
{
|
||||
gboolean result;
|
||||
char *desktop_path, *target_uri, *icon_name;
|
||||
|
||||
/* Get icon type */
|
||||
if (strcmp (volume->mount_type, "cdrom") == 0) {
|
||||
icon_name = g_strdup("i-cdrom.png");
|
||||
} else if (strcmp (volume->mount_type, "floppy") == 0) {
|
||||
icon_name = g_strdup("i-floppy.png");
|
||||
} else {
|
||||
icon_name = g_strdup("i-blockdev.png");
|
||||
}
|
||||
|
||||
desktop_path = nautilus_get_desktop_directory ();
|
||||
target_uri = nautilus_get_uri_from_local_path (volume->mount_path);
|
||||
|
||||
/* Create link */
|
||||
result = nautilus_link_create (desktop_path, volume->volume_name, icon_name, target_uri);
|
||||
if (result) {
|
||||
char *link_uri;
|
||||
|
||||
link_uri = nautilus_make_path (desktop_path, volume->volume_name);
|
||||
|
||||
/* Identify this as a mount link */
|
||||
nautilus_link_set_type (link_uri, NAUTILUS_LINK_MOUNT);
|
||||
g_free (link_uri);
|
||||
}
|
||||
|
||||
g_free (desktop_path);
|
||||
g_free (target_uri);
|
||||
g_free (icon_name);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
fm_desktop_icon_view_initialize (FMDesktopIconView *desktop_icon_view)
|
||||
{
|
||||
|
|
@ -219,7 +256,11 @@ fm_desktop_icon_view_initialize (FMDesktopIconView *desktop_icon_view)
|
|||
|
||||
/* Setup home directory link */
|
||||
place_home_directory (desktop_icon_view);
|
||||
|
||||
|
||||
/* Create initial mount links */
|
||||
nautilus_volume_monitor_each_mounted_volume (desktop_icon_view->details->volume_monitor,
|
||||
startup_create_mount_links, desktop_icon_view);
|
||||
|
||||
gtk_signal_connect (GTK_OBJECT (icon_container),
|
||||
"middle_click",
|
||||
GTK_SIGNAL_FUNC (fm_desktop_icon_view_handle_middle_click),
|
||||
|
|
@ -243,9 +284,6 @@ fm_desktop_icon_view_initialize (FMDesktopIconView *desktop_icon_view)
|
|||
"volume_unmounted",
|
||||
volume_unmounted_callback,
|
||||
desktop_icon_view);
|
||||
|
||||
/* Check for mountable devices */
|
||||
nautilus_volume_monitor_find_volumes (desktop_icon_view->details->volume_monitor);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -395,7 +433,7 @@ volume_mounted_callback (NautilusVolumeMonitor *monitor, NautilusVolume *volume,
|
|||
{
|
||||
gboolean result;
|
||||
char *desktop_path, *target_uri, *icon_name;
|
||||
|
||||
|
||||
/* Get icon type */
|
||||
if (strcmp (volume->mount_type, "cdrom") == 0) {
|
||||
icon_name = g_strdup("i-cdrom.png");
|
||||
|
|
|
|||
Loading…
Reference in a new issue