summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2008-07-03 20:00:20 +0000
committerWilliam Jon McCann <mccann@src.gnome.org>2008-07-03 20:00:20 +0000
commit60b23772fcfdd6f281b925ff6f4611155dc2b89d (patch)
tree411ab2972d699fd53e1ddb4068fea662667e46d8
parenta0b3571bce3f91b0aaa97d2894f288edb676e2c6 (diff)
downloadgdm-60b23772fcfdd6f281b925ff6f4611155dc2b89d.tar.gz
Check for null filesystem type. Odd that this should show up now.
2008-07-03 William Jon McCann <jmccann@redhat.com> * gui/simple-greeter/gdm-user.c (render_icon_from_home): Check for null filesystem type. Odd that this should show up now. svn path=/branches/gnome-2-22/; revision=6285
-rw-r--r--ChangeLog6
-rw-r--r--gui/simple-greeter/gdm-user.c12
2 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 85f6a5b7..d23a2aa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-03 William Jon McCann <jmccann@redhat.com>
+
+ * gui/simple-greeter/gdm-user.c (render_icon_from_home):
+ Check for null filesystem type. Odd that this should show
+ up now.
+
2008-05-07 William Jon McCann <jmccann@redhat.com>
* gui/simple-greeter/gdm-greeter-panel.c:
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
index b5f4db5d..59e422e8 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
@@ -750,11 +750,13 @@ render_icon_from_home (GdmUser *user,
}
filesystem_type = g_file_info_get_attribute_string (file_info,
G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
- is_local = ((strcmp (filesystem_type, "nfs") != 0) &&
- (strcmp (filesystem_type, "afs") != 0) &&
- (strcmp (filesystem_type, "autofs") != 0) &&
- (strcmp (filesystem_type, "unknown") != 0) &&
- (strcmp (filesystem_type, "ncpfs") != 0));
+ if (filesystem_type != NULL) {
+ is_local = ((strcmp (filesystem_type, "nfs") != 0) &&
+ (strcmp (filesystem_type, "afs") != 0) &&
+ (strcmp (filesystem_type, "autofs") != 0) &&
+ (strcmp (filesystem_type, "unknown") != 0) &&
+ (strcmp (filesystem_type, "ncpfs") != 0));
+ }
g_object_unref (file_info);
g_object_unref (file);
}