summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog20
-rw-r--r--daemon/auth.c3
-rw-r--r--daemon/choose.c3
-rw-r--r--daemon/cookie.c3
-rw-r--r--daemon/display.c3
-rw-r--r--daemon/errorgui.c3
-rw-r--r--daemon/filecheck.c3
-rw-r--r--daemon/fstype.c7
-rw-r--r--daemon/gdm.c2
-rw-r--r--daemon/gdmconfig.c2
-rw-r--r--daemon/server.c3
-rw-r--r--daemon/slave.c2
-rw-r--r--daemon/verify-crypt.c3
-rw-r--r--daemon/verify-pam.c2
-rw-r--r--daemon/verify-shadow.c3
-rw-r--r--daemon/xdmcp.c2
-rw-r--r--gui/gdmchooser.c2
-rw-r--r--gui/gdmlogin.c2
-rw-r--r--gui/gdmsession.c2
-rw-r--r--gui/gdmsetup.c3
-rw-r--r--gui/misc.c3
-rw-r--r--gui/modules/dwellmouselistener.c3
-rw-r--r--gui/modules/keymouselistener.c4
-rw-r--r--utils/gdm-dmx-reconnect-proxy.c3
24 files changed, 60 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index 8d0903af..1028aafb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
2006-01-18 Brian Cameron <brian.cameron@sun.com>
+ * daemon/auth.c, daemon/choose.c, daemon/cookie.c, daemon/display.c,
+ daemon/errorgui.c, daemon/filecheck.c, daemon/fstype.c, daemon/gdm.c,
+ daemon/gdmconfig.c, daemon/server.c, daemon/slave.c,
+ daemon/verify-crypt.c, daemon/verify-pam.c, daemon/verify-shadow.c,
+ daemon/xdmcp.c, gui/gdmchooser.c, gui/gdmlogin.c, gui/gdmsession.c,
+ gui/gdmsetup.c, gui/misc.c, gui/modules/dwellmouselistener.c,
+ gui/modules/keymouselistener.c, utils/gdm-dmx-reconnect-proxy.c,
+ vicious-extensions/glade-helper.c,
+ vicious-extensions/test-ve-config.c, vicious-extensions/ve-config.c,
+ vicious-extensions/ve-gnome.c, vicious-extensions/ve-misc.c,
+ vicious-extensions/ve-miscui.c, vicious-extensions/ve-nongnome.c,
+ vicious-extensions/ve-signal.c: Add needed glib/gstdio.h include
+ to daemon/fstype.c which fixes a wierd core dumping problem on
+ Ubuntu. Fixes bug #326819. Patch provided by Sebastien Bacher
+ <seb128@debian.org>. Also fixed all the source so that the includes
+ are more consistant with config.h in quotes instead of in "<>" and
+ glib/gtk includes are always listed after system includes.
+
+2006-01-18 Brian Cameron <brian.cameron@sun.com>
+
* daemon/gdm.c, daemon/slave.c, gui/greeter/greeter.c, gui/greeter/greeter_system.c:
Use "reboot" instead of "restart". Fixes bug #327583.
diff --git a/daemon/auth.c b/daemon/auth.c
index 01bdc39a..74f22226 100644
--- a/daemon/auth.c
+++ b/daemon/auth.c
@@ -19,7 +19,8 @@
/* Code for cookie handling. This really needs to be modularized to
* support other XAuth types and possibly DECnet... */
-#include <config.h>
+#include "config.h"
+
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/daemon/choose.c b/daemon/choose.c
index 4b8880b6..aa40c84b 100644
--- a/daemon/choose.c
+++ b/daemon/choose.c
@@ -18,7 +18,8 @@
/* This file contains the XDMCP chooser glue */
-#include <config.h>
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <syslog.h>
diff --git a/daemon/cookie.c b/daemon/cookie.c
index 5d977cea..56b8c460 100644
--- a/daemon/cookie.c
+++ b/daemon/cookie.c
@@ -27,7 +27,8 @@
* Thus being more secure on systems without /dev/random and friends.
*/
-#include <config.h>
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <syslog.h>
diff --git a/daemon/display.c b/daemon/display.c
index 8cbd4866..81c50b8c 100644
--- a/daemon/display.c
+++ b/daemon/display.c
@@ -16,7 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
+
#include <glib/gi18n.h>
#include <syslog.h>
#include <signal.h>
diff --git a/daemon/errorgui.c b/daemon/errorgui.c
index 6da2fc2c..3c9fb933 100644
--- a/daemon/errorgui.c
+++ b/daemon/errorgui.c
@@ -19,7 +19,8 @@
/* This is the gdm slave process. gdmslave runs the chooser, greeter
* and the user's session scripts. */
-#include <config.h>
+#include "config.h"
+
#include <unistd.h>
#include <syslog.h>
#include <grp.h>
diff --git a/daemon/filecheck.c b/daemon/filecheck.c
index a42d5032..5cf60066 100644
--- a/daemon/filecheck.c
+++ b/daemon/filecheck.c
@@ -16,7 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
+
#include <glib/gi18n.h>
#include <syslog.h>
#include <sys/stat.h>
diff --git a/daemon/fstype.c b/daemon/fstype.c
index 49605d49..d95b9b49 100644
--- a/daemon/fstype.c
+++ b/daemon/fstype.c
@@ -34,7 +34,8 @@
*/
/* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
-#include <config.h>
+#include "config.h"
+
#include <stdio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -45,7 +46,6 @@
extern int errno;
#endif
#include <string.h>
-#include <glib.h>
#ifdef HAVE_LIBGEN_H
#include <libgen.h>
#endif
@@ -192,6 +192,9 @@ fstype_to_string (t)
#include <sys/ioccom.h>
#endif
+#include <glib.h>
+#include <glib/gstdio.h>
+
static int
in_afs (path)
char *path;
diff --git a/daemon/gdm.c b/daemon/gdm.c
index 8383da16..a28e6c33 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
#include <signal.h>
#include <limits.h>
diff --git a/daemon/gdmconfig.c b/daemon/gdmconfig.c
index f50795ac..2f33b63b 100644
--- a/daemon/gdmconfig.c
+++ b/daemon/gdmconfig.c
@@ -31,7 +31,7 @@
* placed in the _gdm_set_value_string, _gdm_set_value_int, or
* _gdm_set_value_bool functions.
*/
-#include <config.h>
+#include "config.h"
#include <stdlib.h>
#include <unistd.h>
diff --git a/daemon/server.c b/daemon/server.c
index 31c33276..9b28d2b7 100644
--- a/daemon/server.c
+++ b/daemon/server.c
@@ -18,7 +18,8 @@
/* This file contains functions for controlling local X servers */
-#include <config.h>
+#include "config.h"
+
#include <glib/gi18n.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/daemon/slave.c b/daemon/slave.c
index 2c363d96..d4eec19a 100644
--- a/daemon/slave.c
+++ b/daemon/slave.c
@@ -21,7 +21,7 @@
/* This is the gdm slave process. gdmslave runs the chooser, greeter
* and the user's session scripts. */
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/daemon/verify-crypt.c b/daemon/verify-crypt.c
index e94ffb8b..91ccf111 100644
--- a/daemon/verify-crypt.c
+++ b/daemon/verify-crypt.c
@@ -16,7 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
+
#include <glib/gi18n.h>
#include <syslog.h>
#include <pwd.h>
diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c
index e6b70c16..e27792da 100644
--- a/daemon/verify-pam.c
+++ b/daemon/verify-pam.c
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
#include <grp.h>
#include <sys/stat.h>
diff --git a/daemon/verify-shadow.c b/daemon/verify-shadow.c
index 5de6114f..093e9d79 100644
--- a/daemon/verify-shadow.c
+++ b/daemon/verify-shadow.c
@@ -16,7 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
+
#include <glib/gi18n.h>
#include <syslog.h>
#include <pwd.h>
diff --git a/daemon/xdmcp.c b/daemon/xdmcp.c
index 7fa4d72b..323d8f6c 100644
--- a/daemon/xdmcp.c
+++ b/daemon/xdmcp.c
@@ -54,7 +54,7 @@
*
*/
-#include <config.h>
+#include "config.h"
#ifdef HAVE_LIBXDMCP
#include <stdio.h>
diff --git a/gui/gdmchooser.c b/gui/gdmchooser.c
index 608ff2a7..0de0f994 100644
--- a/gui/gdmchooser.c
+++ b/gui/gdmchooser.c
@@ -20,7 +20,7 @@
* presents a list of them and allows the user to choose one. The
* selected hostname will be printed on stdout. */
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c
index 4aacfe25..c5120b17 100644
--- a/gui/gdmlogin.c
+++ b/gui/gdmlogin.c
@@ -18,7 +18,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
#include <math.h>
#include <stdio.h>
diff --git a/gui/gdmsession.c b/gui/gdmsession.c
index 2231dd91..cf37bb83 100644
--- a/gui/gdmsession.c
+++ b/gui/gdmsession.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
#include <unistd.h>
#include <dirent.h>
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index bdc74520..bfd022eb 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -16,7 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <dirent.h>
diff --git a/gui/misc.c b/gui/misc.c
index ad7d21ba..9ec09b23 100644
--- a/gui/misc.c
+++ b/gui/misc.c
@@ -16,7 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <config.h>
+#include "config.h"
+
#include <gtk/gtk.h>
#include <glade/glade.h>
#include <string.h>
diff --git a/gui/modules/dwellmouselistener.c b/gui/modules/dwellmouselistener.c
index 58435f9b..cc51585c 100644
--- a/gui/modules/dwellmouselistener.c
+++ b/gui/modules/dwellmouselistener.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
#include <ctype.h>
#include <string.h>
#include <stdlib.h>
@@ -32,7 +34,6 @@
#include <glib/gi18n.h>
#include <X11/Xlib.h>
-#include <config.h>
#ifdef HAVE_XINPUT
#include <X11/extensions/XInput.h>
diff --git a/gui/modules/keymouselistener.c b/gui/modules/keymouselistener.c
index 9e01e557..16421087 100644
--- a/gui/modules/keymouselistener.c
+++ b/gui/modules/keymouselistener.c
@@ -18,6 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -35,8 +37,6 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include <config.h>
-
#ifdef HAVE_XINPUT
#include <X11/extensions/XInput.h>
#endif
diff --git a/utils/gdm-dmx-reconnect-proxy.c b/utils/gdm-dmx-reconnect-proxy.c
index d59e1eb0..534b1fe2 100644
--- a/utils/gdm-dmx-reconnect-proxy.c
+++ b/utils/gdm-dmx-reconnect-proxy.c
@@ -17,7 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#include "config.h"
#include <stdlib.h>
#include <glib.h>
@@ -26,7 +26,6 @@
#include <X11/Xlib.h>
#include <X11/extensions/dmxext.h>
-
static char *to_display = NULL;
static char *backend_display = NULL;
static char *to_authfile = NULL;