[gdm-list] Some GDM fixes for Solaris




I just built GDM from SVN head and had a few compile and runtime issues
that are fixed in the attached patch.

1) The libnotification code would not compile because it couldn't find
   the gtk header files.  Adding $(SIMPLE_GREETER_CFLAGS) made this
   build okay.

2) The libnotification code and some test programs in the simple-greeter
   directory wouldn't link because on Solaris you need to include the
   $(SIMPLE_GREETER_LIBS) to get the glib/gtk symbols.

3) In simple-greeter/gdm-user-manager.c, the code now fails with
   g_critical if it can't create the /etc/shells or /etc/passwd
   monitors.  On Solaris, we don't have file monitoring support, so
   this causes the greeter to just exit.  I think these should just
   be warnings.  On systems that do not support file monitoring it
   is annoying that GDM won't pick up these changes dynamically to
   automatically update the face browser with new/removed users, but
   it seems better to not just exit and leave the display with no
   manager.

Brian
Index: simple-greeter/libnotificationarea/Makefile.am
===================================================================
--- simple-greeter/libnotificationarea/Makefile.am	(revision 5412)
+++ simple-greeter/libnotificationarea/Makefile.am	(working copy)
@@ -10,6 +10,7 @@
 	-DLOGDIR=\"$(logdir)\"				\
 	-DPIXMAPDIR=\"$(pixmapdir)\"			\
 	-DSBINDIR=\"$(sbindir)\"			\
+	$(SIMPLE_GREETER_CFLAGS)			\
 	$(GREETER_CFLAGS)				\
 	$(NULL)
 
@@ -63,4 +64,5 @@
 testtray_LDADD = 		\
 	libnotificationarea.la	\
 	$(GREETER_LIBS)		\
+	$(SIMPLE_GREETER_LIBS)	\
 	$(NULL)
Index: simple-greeter/Makefile.am
===================================================================
--- simple-greeter/Makefile.am	(revision 5412)
+++ simple-greeter/Makefile.am	(working copy)
@@ -68,6 +68,7 @@
 
 test_greeter_panel_LDADD =	\
 	$(GREETER_LIBS)		\
+	$(SIMPLE_GREETER_LIBS)	\
 	$(top_builddir)/gui/simple-greeter/libnotificationarea/libnotificationarea.la	\
 	$(NULL)
 
@@ -81,6 +82,7 @@
 	$(NULL)
 
 test_language_chooser_LDADD =	\
+	$(SIMPLE_GREETER_LIBS)	\
 	$(GREETER_LIBS)		\
 	$(NULL)
 
@@ -93,6 +95,7 @@
 	$(NULL)
 
 test_session_chooser_LDADD =		\
+	$(SIMPLE_GREETER_LIBS)		\
 	$(GREETER_LIBS)			\
 	$(NULL)
 
Index: simple-greeter/gdm-user-manager.c
===================================================================
--- simple-greeter/gdm-user-manager.c	(revision 5412)
+++ simple-greeter/gdm-user-manager.c	(working copy)
@@ -403,7 +403,7 @@
         error = NULL;
         uri = g_filename_to_uri ("/etc/shells", NULL, &error);
         if (uri == NULL) {
-                g_critical ("Could not create URI for shells file `/etc/shells': %s",
+                g_warning ("Could not create URI for shells file `/etc/shells': %s",
                             error->message);
                 g_error_free (error);
         } else {
@@ -415,7 +415,7 @@
                 g_free (uri);
 
                 if (result != GNOME_VFS_OK)
-                        g_critical ("Could not install monitor for shells file `/etc/shells': %s",
+                        g_warning ("Could not install monitor for shells file `/etc/shells': %s",
                                     gnome_vfs_result_to_string (result));
         }
 
@@ -427,7 +427,7 @@
         error = NULL;
         uri = g_filename_to_uri ("/etc/passwd", NULL, &error);
         if (uri == NULL) {
-                g_critical ("Could not create URI for password file `/etc/passwd': %s",
+                g_warning ("Could not create URI for password file `/etc/passwd': %s",
                             error->message);
                 g_error_free (error);
         } else {
@@ -439,7 +439,7 @@
                 g_free (uri);
 
                 if (result != GNOME_VFS_OK)
-                        g_critical ("Could not install monitor for password file `/etc/passwd: %s",
+                        g_warning ("Could not install monitor for password file `/etc/passwd: %s",
                                     gnome_vfs_result_to_string (result));
         }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]