luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 23:13:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add symbolic icon support to drive, volume, and mount

Browse Source 
We need symbolic icon support for display in Nautilus.

https://bugzilla.gnome.org/show_bug.cgi?id=682101
This commit is contained in:
William Jon McCann
2012-08-28 15:37:43 -04:00
parent 88d181ef18
commit a2dca48bf7
13 changed files with 217 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gio/gunixvolume.c
View File

@@ -58,6 +58,7 @@ struct _GUnixVolume {
char *name;
GIcon *icon;
GIcon *symbolic_icon;
};
static void g_unix_volume_volume_iface_init (GVolumeIface *iface);
@@ -81,6 +82,7 @@ g_unix_volume_finalize (GObject *object)
_g_unix_mount_unset_volume (volume->mount, volume);
g_object_unref (volume->icon);
g_object_unref (volume->symbolic_icon);
g_free (volume->name);
g_free (volume->mount_path);
g_free (volume->device_path);
@@ -122,6 +124,7 @@ _g_unix_volume_new (GVolumeMonitor *volume_monitor,
volume->name = g_unix_mount_point_guess_name (mountpoint);
volume->icon = g_unix_mount_point_guess_icon (mountpoint);
volume->symbolic_icon = g_unix_mount_point_guess_symbolic_icon (mountpoint);
if (strcmp (g_unix_mount_point_get_fs_type (mountpoint), "nfs") == 0)
@@ -197,6 +200,13 @@ g_unix_volume_get_icon (GVolume *volume)
return g_object_ref (unix_volume->icon);
}
static GIcon *
g_unix_volume_get_symbolic_icon (GVolume *volume)
{
GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
return g_object_ref (unix_volume->symbolic_icon);
}
static char *
g_unix_volume_get_name (GVolume *volume)
{
@@ -517,6 +527,7 @@ g_unix_volume_volume_iface_init (GVolumeIface *iface)
{
iface->get_name = g_unix_volume_get_name;
iface->get_icon = g_unix_volume_get_icon;
iface->get_symbolic_icon = g_unix_volume_get_symbolic_icon;
iface->get_uuid = g_unix_volume_get_uuid;
iface->get_drive = g_unix_volume_get_drive;
iface->get_mount = g_unix_volume_get_mount;