diff options
| author | David Zeuthen <davidz@redhat.com> | 2008-05-13 17:06:40 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2008-05-13 17:06:40 -0400 |
| commit | 09d89dfbf12abfe52fdcd2934868106a38e4888d (patch) | |
| tree | e0d86b221925ea96f334ee4f389ce39fcdb7c4c5 /src | |
| parent | 79f00c48cd9e37ba09b76fbf95e113297da0a94c (diff) | |
rip out the get_info() method, it's no longer used
Diffstat (limited to 'src')
| -rw-r--r-- | src/gdu-activatable-drive.c | 106 | ||||
| -rw-r--r-- | src/gdu-drive.c | 106 | ||||
| -rw-r--r-- | src/gdu-presentable.c | 12 | ||||
| -rw-r--r-- | src/gdu-presentable.h | 2 | ||||
| -rw-r--r-- | src/gdu-volume-hole.c | 15 | ||||
| -rw-r--r-- | src/gdu-volume.c | 69 |
6 files changed, 0 insertions, 310 deletions
diff --git a/src/gdu-activatable-drive.c b/src/gdu-activatable-drive.c index 79bb6ee..7477b0a 100644 --- a/src/gdu-activatable-drive.c +++ b/src/gdu-activatable-drive.c @@ -398,111 +398,6 @@ out: return ret; } -static GList * -gdu_activatable_drive_get_info (GduPresentable *presentable) -{ - GduActivatableDrive *activatable_drive = GDU_ACTIVATABLE_DRIVE (presentable); - GduDevice *device = activatable_drive->priv->device; - GList *kv_pairs = NULL; - char **activatable_drive_media_compat; - GString *s; - int n; - - activatable_drive_media_compat = gdu_device_drive_get_media_compatibility (activatable_drive->priv->device); - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Vendor"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_drive_get_vendor (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Model"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_drive_get_model (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Revision"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_drive_get_revision (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Serial Number"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_drive_get_serial (device))); - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Device File"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_get_device_file (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Connection"))); - kv_pairs = g_list_prepend (kv_pairs, gdu_util_get_connection_for_display ( - gdu_device_drive_get_connection_interface (device), - gdu_device_drive_get_connection_speed (device))); - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Removable Media"))); - if (gdu_device_is_removable (device)) { - if (gdu_device_is_media_available (device)) { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Yes"))); - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Yes (No media inserted)"))); - } - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("No"))); - } - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Media Compatibility"))); - s = g_string_new (NULL); - if (activatable_drive_media_compat != NULL) { - for (n = 0; activatable_drive_media_compat[n] != NULL; n++) { - const char *media = (const char *) activatable_drive_media_compat[n]; - - if (s->len > 0) { - /* Translator: the separator for media types */ - g_string_append (s, _(", ")); - } - - if (strcmp (media, "flash_cf") == 0) { - g_string_append (s, _("Compact Flash")); - } else if (strcmp (media, "flash_ms") == 0) { - g_string_append (s, _("Memory Stick")); - } else if (strcmp (media, "flash_sm") == 0) { - g_string_append (s, _("Smart Media")); - } else if (strcmp (media, "flash_sd") == 0) { - g_string_append (s, _("SD Card")); - } else if (strcmp (media, "flash_sdhc") == 0) { - g_string_append (s, _("SDHC Card")); - } else if (strcmp (media, "flash_mmc") == 0) { - g_string_append (s, _("MMC")); - } else if (g_str_has_prefix (media, "flash")) { - g_string_append (s, _("Flash")); - } else if (g_str_has_prefix (media, "optical")) { - /* TODO: handle rest of optical-* */ - g_string_append (s, _("CD-ROM")); - } - } - } - if (s->len == 0) - g_string_append (s, _("Disk")); - kv_pairs = g_list_prepend (kv_pairs, g_string_free (s, FALSE)); - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Capacity"))); - if (gdu_device_is_media_available (device)) { - kv_pairs = g_list_prepend (kv_pairs, - gdu_util_get_size_for_display (gdu_device_get_size (device), TRUE)); - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("-"))); - } - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Partitioning"))); - if (gdu_device_is_partition_table (device)) { - const char *scheme; - char *name; - scheme = gdu_device_partition_table_get_scheme (device); - if (strcmp (scheme, "apm") == 0) { - name = g_strdup (_("Apple Partition Map")); - } else if (strcmp (scheme, "mbr") == 0) { - name = g_strdup (_("Master Boot Record")); - } else if (strcmp (scheme, "gpt") == 0) { - name = g_strdup (_("GUID Partition Table")); - } else { - name = g_strdup_printf (_("Unknown (%s)"), scheme); - } - kv_pairs = g_list_prepend (kv_pairs, name); - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("-"))); - } - - kv_pairs = g_list_reverse (kv_pairs); - return kv_pairs; -} - static GduPool * gdu_activatable_drive_get_pool (GduPresentable *presentable) { @@ -643,7 +538,6 @@ gdu_activatable_drive_presentable_iface_init (GduPresentableIface *iface) iface->get_icon_name = gdu_activatable_drive_get_icon_name; iface->get_offset = gdu_activatable_drive_get_offset; iface->get_size = gdu_activatable_drive_get_size; - iface->get_info = gdu_activatable_drive_get_info; iface->get_pool = gdu_activatable_drive_get_pool; iface->is_allocated = gdu_activatable_drive_is_allocated; iface->is_recognized = gdu_activatable_drive_is_recognized; diff --git a/src/gdu-drive.c b/src/gdu-drive.c index b2c4314..d02d7ae 100644 --- a/src/gdu-drive.c +++ b/src/gdu-drive.c @@ -255,111 +255,6 @@ gdu_drive_get_size (GduPresentable *presentable) return gdu_device_get_size (drive->priv->device); } -static GList * -gdu_drive_get_info (GduPresentable *presentable) -{ - GduDrive *drive = GDU_DRIVE (presentable); - GduDevice *device = drive->priv->device; - GList *kv_pairs = NULL; - char **drive_media_compat; - GString *s; - int n; - - drive_media_compat = gdu_device_drive_get_media_compatibility (drive->priv->device); - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Vendor"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_drive_get_vendor (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Model"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_drive_get_model (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Revision"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_drive_get_revision (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Serial Number"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_drive_get_serial (device))); - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Device File"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_get_device_file (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Connection"))); - kv_pairs = g_list_prepend (kv_pairs, gdu_util_get_connection_for_display ( - gdu_device_drive_get_connection_interface (device), - gdu_device_drive_get_connection_speed (device))); - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Removable Media"))); - if (gdu_device_is_removable (device)) { - if (gdu_device_is_media_available (device)) { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Yes"))); - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Yes (No media inserted)"))); - } - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("No"))); - } - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Media Compatibility"))); - s = g_string_new (NULL); - if (drive_media_compat != NULL) { - for (n = 0; drive_media_compat[n] != NULL; n++) { - const char *media = (const char *) drive_media_compat[n]; - - if (s->len > 0) { - /* Translator: the separator for media types */ - g_string_append (s, _(", ")); - } - - if (strcmp (media, "flash_cf") == 0) { - g_string_append (s, _("Compact Flash")); - } else if (strcmp (media, "flash_ms") == 0) { - g_string_append (s, _("Memory Stick")); - } else if (strcmp (media, "flash_sm") == 0) { - g_string_append (s, _("Smart Media")); - } else if (strcmp (media, "flash_sd") == 0) { - g_string_append (s, _("SD Card")); - } else if (strcmp (media, "flash_sdhc") == 0) { - g_string_append (s, _("SDHC Card")); - } else if (strcmp (media, "flash_mmc") == 0) { - g_string_append (s, _("MMC")); - } else if (g_str_has_prefix (media, "flash")) { - g_string_append (s, _("Flash")); - } else if (g_str_has_prefix (media, "optical")) { - /* TODO: handle rest of optical-* */ - g_string_append (s, _("CD-ROM")); - } - } - } - if (s->len == 0) - g_string_append (s, _("Disk")); - kv_pairs = g_list_prepend (kv_pairs, g_string_free (s, FALSE)); - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Capacity"))); - if (gdu_device_is_media_available (device)) { - kv_pairs = g_list_prepend (kv_pairs, - gdu_util_get_size_for_display (gdu_device_get_size (device), TRUE)); - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("-"))); - } - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Partitioning"))); - if (gdu_device_is_partition_table (device)) { - const char *scheme; - char *name; - scheme = gdu_device_partition_table_get_scheme (device); - if (strcmp (scheme, "apm") == 0) { - name = g_strdup (_("Apple Partition Map")); - } else if (strcmp (scheme, "mbr") == 0) { - name = g_strdup (_("Master Boot Record")); - } else if (strcmp (scheme, "gpt") == 0) { - name = g_strdup (_("GUID Partition Table")); - } else { - name = g_strdup_printf (_("Unknown (%s)"), scheme); - } - kv_pairs = g_list_prepend (kv_pairs, name); - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("-"))); - } - - kv_pairs = g_list_reverse (kv_pairs); - return kv_pairs; -} - static GduPool * gdu_drive_get_pool (GduPresentable *presentable) { @@ -389,7 +284,6 @@ gdu_drive_presentable_iface_init (GduPresentableIface *iface) iface->get_icon_name = gdu_drive_get_icon_name; iface->get_offset = gdu_drive_get_offset; iface->get_size = gdu_drive_get_size; - iface->get_info = gdu_drive_get_info; iface->get_pool = gdu_drive_get_pool; iface->is_allocated = gdu_drive_is_allocated; iface->is_recognized = gdu_drive_is_recognized; diff --git a/src/gdu-presentable.c b/src/gdu-presentable.c index b2a0180..7c05dae 100644 --- a/src/gdu-presentable.c +++ b/src/gdu-presentable.c @@ -173,18 +173,6 @@ gdu_presentable_get_size (GduPresentable *presentable) return (* iface->get_size) (presentable); } -GList * -gdu_presentable_get_info (GduPresentable *presentable) -{ - GduPresentableIface *iface; - - g_return_val_if_fail (GDU_IS_PRESENTABLE (presentable), NULL); - - iface = GDU_PRESENTABLE_GET_IFACE (presentable); - - return (* iface->get_info) (presentable); -} - GduPool * gdu_presentable_get_pool (GduPresentable *presentable) { diff --git a/src/gdu-presentable.h b/src/gdu-presentable.h index 50d289d..fb92146 100644 --- a/src/gdu-presentable.h +++ b/src/gdu-presentable.h @@ -49,7 +49,6 @@ struct _GduPresentableIface char * (*get_icon_name) (GduPresentable *presentable); guint64 (*get_offset) (GduPresentable *presentable); guint64 (*get_size) (GduPresentable *presentable); - GList * (*get_info) (GduPresentable *presentable); GduPool * (*get_pool) (GduPresentable *presentable); gboolean (*is_allocated) (GduPresentable *presentable); gboolean (*is_recognized) (GduPresentable *presentable); @@ -62,7 +61,6 @@ char *gdu_presentable_get_name (GduPresentable *prese char *gdu_presentable_get_icon_name (GduPresentable *presentable); guint64 gdu_presentable_get_offset (GduPresentable *presentable); guint64 gdu_presentable_get_size (GduPresentable *presentable); -GList *gdu_presentable_get_info (GduPresentable *presentable); GduPool *gdu_presentable_get_pool (GduPresentable *presentable); gboolean gdu_presentable_is_allocated (GduPresentable *presentable); gboolean gdu_presentable_is_recognized (GduPresentable *presentable); diff --git a/src/gdu-volume-hole.c b/src/gdu-volume-hole.c index a5e4f20..193df7a 100644 --- a/src/gdu-volume-hole.c +++ b/src/gdu-volume-hole.c @@ -211,20 +211,6 @@ gdu_volume_hole_get_size (GduPresentable *presentable) return volume_hole->priv->size; } -static GList * -gdu_volume_hole_get_info (GduPresentable *presentable) -{ - GduVolumeHole *volume_hole = GDU_VOLUME_HOLE (presentable); - GList *kv_pairs = NULL; - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Free Space"))); - kv_pairs = g_list_prepend (kv_pairs, - gdu_util_get_size_for_display (volume_hole->priv->size, TRUE)); - - kv_pairs = g_list_reverse (kv_pairs); - return kv_pairs; -} - static GduPool * gdu_volume_hole_get_pool (GduPresentable *presentable) { @@ -253,7 +239,6 @@ gdu_volume_hole_presentable_iface_init (GduPresentableIface *iface) iface->get_icon_name = gdu_volume_hole_get_icon_name; iface->get_offset = gdu_volume_hole_get_offset; iface->get_size = gdu_volume_hole_get_size; - iface->get_info = gdu_volume_hole_get_info; iface->get_pool = gdu_volume_hole_get_pool; iface->is_allocated = gdu_volume_hole_is_allocated; iface->is_recognized = gdu_volume_hole_is_recognized; diff --git a/src/gdu-volume.c b/src/gdu-volume.c index 4d41f0c..a72d239 100644 --- a/src/gdu-volume.c +++ b/src/gdu-volume.c @@ -329,74 +329,6 @@ gdu_volume_get_size (GduPresentable *presentable) return gdu_device_get_size (volume->priv->device); } -static GList * -gdu_volume_get_info (GduPresentable *presentable) -{ - GduVolume *volume = GDU_VOLUME (presentable); - GduDevice *device = volume->priv->device; - GList *kv_pairs = NULL; - - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Mount Point"))); - if (gdu_device_is_mounted (device)) - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_get_mount_path (device))); - else - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("-"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Label"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_id_get_label (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Device File"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_get_device_file (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("UUID"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (gdu_device_id_get_uuid (device))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Partition Number"))); - if (gdu_device_is_partition (device)) { - kv_pairs = g_list_prepend (kv_pairs, g_strdup_printf ( - "%d", - gdu_device_partition_get_number (device))); - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("-"))); - } - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Partition Type"))); - if (gdu_device_is_partition (device)) { - kv_pairs = g_list_prepend (kv_pairs, - gdu_util_get_desc_for_part_type (gdu_device_partition_get_scheme (device), - gdu_device_partition_get_type (device))); - } else { - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("-"))); - } - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Usage"))); - { - const char *usage; - char *name; - usage = gdu_device_id_get_usage (device); - if (strcmp (usage, "filesystem") == 0) { - name = g_strdup (_("File system")); - } else if (strcmp (usage, "crypto") == 0) { - name = g_strdup (_("Encrypted Block Device")); - } else if (strcmp (usage, "raid") == 0) { - name = g_strdup (_("RAID/LVM Component")); - } else { - if (strlen (usage) > 0) - name = g_strdup_printf (_("Unknown (%s)"), usage); - else - name = g_strdup (_("-")); - } - kv_pairs = g_list_prepend (kv_pairs, name); - } - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Capacity"))); - kv_pairs = g_list_prepend (kv_pairs, - gdu_util_get_size_for_display (gdu_device_get_size (device), TRUE)); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Type"))); - kv_pairs = g_list_prepend (kv_pairs, - gdu_util_get_fstype_for_display (gdu_device_id_get_type (device), - gdu_device_id_get_version (device), - TRUE)); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("Available"))); - kv_pairs = g_list_prepend (kv_pairs, g_strdup (_("-"))); /* TODO */ - - kv_pairs = g_list_reverse (kv_pairs); - return kv_pairs; -} - static GduPool * gdu_volume_get_pool (GduPresentable *presentable) { @@ -441,7 +373,6 @@ gdu_volume_presentable_iface_init (GduPresentableIface *iface) iface->get_icon_name = gdu_volume_get_icon_name; iface->get_offset = gdu_volume_get_offset; iface->get_size = gdu_volume_get_size; - iface->get_info = gdu_volume_get_info; iface->get_pool = gdu_volume_get_pool; iface->is_allocated = gdu_volume_is_allocated; iface->is_recognized = gdu_volume_is_recognized; |
