Merge lp:~laney/ubuntu-system-settings/measure-size-critical-fix into lp:ubuntu-system-settings

[Iain Lane]

Check the passed mount point when measuring directory size, to avoid a GLib critical message

I noticed a critical when running the new measure code

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:377
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/410/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/410/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/410/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:377
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/423/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/423

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-system-settings-ci/423/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

right

review: Approve

=== modified file 'plugins/about/storageabout.cpp'
--- plugins/about/storageabout.cpp	2013-09-27 11:09:42 +0000
+++ plugins/about/storageabout.cpp	2013-09-27 11:09:42 +0000
@@ -277,20 +277,23 @@
 }
 
 QString StorageAbout::getDevicePath(const QString mount_point)
-{
-    GUnixMountEntry * g_mount_point =
-            g_unix_mount_at(mount_point.toLocal8Bit(), NULL);
-
+{    
     QString s_mount_point;
 
+    GUnixMountEntry * g_mount_point = NULL;
+
+    if (!mount_point.isNull() && !mount_point.isEmpty()) {
+         g_mount_point = g_unix_mount_at(mount_point.toLocal8Bit(), NULL);
+    }
+
     if (g_mount_point) {
         const gchar * device_path =
                 g_unix_mount_get_device_path(g_mount_point);
         s_mount_point = QString::fromLocal8Bit(device_path);
+
+        g_unix_mount_free (g_mount_point);
     }
 
-    g_unix_mount_free (g_mount_point);
-
     return s_mount_point;
 }