diff options
author | Brian Cameron <brian.cameron@sun.com> | 2006-04-18 18:44:53 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2006-04-18 18:44:53 +0000 |
commit | 5e92e6ea8a8637942b4f8620c35a7d1fe02516bd (patch) | |
tree | 9ac55ac9d1b93d9e2de04f2852a1a9108d50f0dd | |
parent | 661757a048a26b5035410ae6aaf87d3a2f4b4fa3 (diff) | |
download | gdm-5e92e6ea8a8637942b4f8620c35a7d1fe02516bd.tar.gz |
Fix for C89 compilers. Patch by Jens Granseuer <jensgr@gmx.net>.
2006-04-17 Brian Cameron <brian.cameron@sun.com>
* gui/gdmsetup.c: Fix for C89 compilers. Patch by Jens Granseuer
<jensgr@gmx.net>.
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | daemon/errorgui.c | 4 | ||||
-rw-r--r-- | gui/gdmsetup.c | 4 |
3 files changed, 12 insertions, 7 deletions
@@ -1,5 +1,10 @@ 2006-04-17 Brian Cameron <brian.cameron@sun.com> + * gui/gdmsetup.c: Fix for C89 compilers. Patch by Jens Granseuer + <jensgr@gmx.net>. + +2006-04-17 Brian Cameron <brian.cameron@sun.com> + * gui/gdmlogin.c, gui/gdmsetup.glade, gui/greeter/greeter.c: Fixed strings so that they are marked as translatable. Fixes bug #338765. Patch provided by Vincent Fretin @@ -310,7 +315,7 @@ * daemon/gdmconfig.c, daemon/gdm-net.c, gui/gdmsetup.c: Fix some GCC C-99 compile issues. Fixes bug #331450. - Patch provided by Jens Granseur. + Patch provided by Jens Granseur <jensgr@gmx.net>. 2006-02-15 Brian Cameron <brian.cameron@sun.com> @@ -2065,7 +2070,7 @@ 2005-07-21 Brian Cameron <brian.cameron@sun.com> * gui/gdmsetup.c: C89 compliance patch provided by Jens Granseuer. - Fixes bug #311097. + <jensgr@gmx.net>. Fixes bug #311097. 2005-07-21 Brian Cameron <brian.cameron@sun.com> @@ -2205,7 +2210,7 @@ * gui/gdmlogin.c, gui/gdmsetup.c: No longer use C99 features that do not work with gcc 2.95, specifically do not declare variables except at the beginning of a block. Fixes bug #309110, patch provied by - Jens Granseuer. + Jens Granseuer <jensgr@gmx.net>. * autgogen.sh: Add back USE_GNOME_MACROS2=1 It doesn't do anything if using GNOME 2.10 or later, but allows people using older gnome-autogen.sh to build. diff --git a/daemon/errorgui.c b/daemon/errorgui.c index 176275d1..51fe035c 100644 --- a/daemon/errorgui.c +++ b/daemon/errorgui.c @@ -387,9 +387,7 @@ gdm_error_box_full (GdmDisplay *d, GtkMessageType type, const char *error, details = NULL; } - setup_dialog (d, "gtk-error-box", -1, - (uid == 0 || uid == gdm_get_gdmuid ()) /* set_gdm_ids */, - uid); + setup_dialog (d, "gtk-error-box", -1, TRUE, uid); loc = gdm_locale_to_utf8 (error); diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c index e973f803..5dfeda3d 100644 --- a/gui/gdmsetup.c +++ b/gui/gdmsetup.c @@ -6508,10 +6508,12 @@ main (int argc, char *argv[]) if ( ! DOING_GDM_DEVELOPMENT && geteuid() != 0) { + GtkWidget *fatal_error; + /* Done using socket */ gdmcomm_comm_bulk_stop (); - GtkWidget *fatal_error = + fatal_error = ve_hig_dialog_new (NULL /* parent */, GTK_DIALOG_MODAL /* flags */, GTK_MESSAGE_ERROR, |