[gnome-disk-utility] Handle when seat is "all"
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-disk-utility] Handle when seat is "all"
- Date: Thu, 26 Apr 2012 19:40:03 +0000 (UTC)
commit da23f2ae282f5cb5483053460e547aa5768f738f
Author: David Zeuthen <davidz redhat com>
Date: Sun Apr 22 12:13:17 2012 -0400
Handle when seat is "all"
Signed-off-by: David Zeuthen <davidz redhat com>
src/palimpsest/gduwindow.c | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
---
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index b593c41..c5e8f7e 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -1632,8 +1632,12 @@ update_device_page_for_drive (GduWindow *window,
{
const gchar *drive_seat = NULL;
gboolean consider;
- /* Assume seat0 if a) device is not tagged; or b) udisks does not
- * have seat-support.
+ /* If the device is not tagged, assume that udisks does not have
+ * working seat-support... so just assume it's available at our
+ * seat.
+ *
+ * If the seat is "all" it means the device is available at all
+ * seats so don't show anything there.
*
* Note that seat support was added in udisks 1.95.0 (and so was the
* UDISKS_CHECK_VERSION macro) - for now, be compatible with older
@@ -1644,25 +1648,25 @@ update_device_page_for_drive (GduWindow *window,
drive_seat = udisks_drive_get_seat (drive);
# endif
#endif
- if (drive_seat == NULL || strlen (drive_seat) == 0)
- drive_seat = "seat0";
-
- /* If device is attached to seat0, only consider it to be another seat if
- * it's removable...
- */
- consider = TRUE;
- if (g_strcmp0 (drive_seat, "seat0") == 0)
- {
- consider = FALSE;
- if (udisks_drive_get_removable (drive))
- consider = TRUE;
- }
- if (consider && g_strcmp0 (our_seat, drive_seat) != 0)
+ if (drive_seat != NULL && g_strcmp0 (drive_seat, "all") != 0)
{
- /* Translators: Shown in "Location" when drive is connected to another seat than where
- * our application is running.
+ /* If device is attached to seat0, only consider it to be another seat if
+ * it's removable...
*/
- s = g_strdup (_("Connected to another seat"));
+ consider = TRUE;
+ if (g_strcmp0 (drive_seat, "seat0") == 0)
+ {
+ consider = FALSE;
+ if (udisks_drive_get_removable (drive))
+ consider = TRUE;
+ }
+ if (consider && g_strcmp0 (our_seat, drive_seat) != 0)
+ {
+ /* Translators: Shown in "Location" when drive is connected to another seat than where
+ * our application is running.
+ */
+ s = g_strdup (_("Connected to another seat"));
+ }
}
}
if (s != NULL)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]