rpms/gdm/devel gdm-null-fs.patch,NONE,1.1 gdm.spec,1.393,1.394

[William Jon McCann (mccann)]

Author: mccann

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22927

Modified Files:
	gdm.spec 
Added Files:
	gdm-null-fs.patch 
Log Message:
Check for a null filesystem type



gdm-null-fs.patch:

--- NEW FILE gdm-null-fs.patch ---
Index: gdm/gui/simple-greeter/gdm-user.c
===================================================================
--- gdm/gui/simple-greeter/gdm-user.c	(revision 6253)
+++ gdm/gui/simple-greeter/gdm-user.c	(working copy)
@@ -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);
         }


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -r1.393 -r1.394
--- gdm.spec	25 Jun 2008 15:46:01 -0000	1.393
+++ gdm.spec	3 Jul 2008 19:56:56 -0000	1.394
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.22.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -85,6 +85,8 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=446672
 Patch4: gdm-2.22.0-enable-tcp.patch
 
+Patch9: gdm-null-fs.patch
+
 # Fedora-specific
 Patch99: gdm-2.21.8-fedora-logo.patch
 
@@ -109,6 +111,7 @@
 %patch2 -p1 -b .keyboard-chooser
 %patch3 -p1 -b .show-users
 %patch4 -p1 -b .enable-tcp
+%patch9 -p1 -b .null-fs
 %patch99 -p1 -b .fedora-logo
 
 autoreconf
@@ -308,6 +311,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Thu Jul  3 2008 Jon McCann <jmccann at redhat.com> - 1:2.22.0-9
+- Check for a null filesystem type
+
 * Wed Jun 25 2008 Ray Strode <rstrode at redhat.com> - 1:2.22.0-8
 - After discussion with X team, turn tcp connections off by default,
   but add back option to toggle on (bug 446672)