[gnome-disk-utility: 66/66] Merge branch 'master' into new-ui

[David Zeuthen <davidz src gnome org>]

commit 4212bfffd91951c79d550b5229253f4555f51585
Merge: fec7268... 784065e...
Author: David Zeuthen <davidz redhat com>
Date:   Wed Dec 2 14:47:25 2009 -0500

    Merge branch 'master' into new-ui

 po/ChangeLog         |    5 +
 po/LINGUAS           |    1 +
 po/en shaw po        | 3419 ++++++++++++++++++++++++++++++++++++++++++++++++++
 po/fi.po             |  253 ++--
 po/lt.po             |  285 +++---
 po/ro.po             | 1049 +++++-----------
 po/sl.po             |  243 ++--
 po/ta.po             |  808 ++++++++-----
 src/gdu/gdu-device.c |    4 +-
 src/gdu/gdu-pool.c   |    7 +-
 src/gdu/gdu-volume.c |    3 +-
 11 files changed, 4658 insertions(+), 1419 deletions(-)
---
diff --cc src/gdu/gdu-volume.c
index bf8f9d2,9ae869e..d363ccf
--- a/src/gdu/gdu-volume.c
+++ b/src/gdu/gdu-volume.c
@@@ -227,10 -226,11 +227,11 @@@ get_names_and_desc (GduPresentable  *pr
          drive_media = NULL;
          strsize = NULL;
  
 -        drive_presentable = gdu_presentable_get_toplevel (presentable);
 +        drive_presentable = gdu_presentable_get_enclosing_presentable (presentable);
          if (drive_presentable != NULL) {
                  drive_device = gdu_presentable_get_device (drive_presentable);
-                 drive_media = gdu_device_drive_get_media (drive_device);
+                 if (drive_device != NULL)
+                   drive_media = gdu_device_drive_get_media (drive_device);
          }
  
          label = gdu_device_id_get_label (volume->priv->device);