The moment I want to stop maintaining gdm, I find an annoying bug that I just

have to fix :)

George

Thu Jan 13 17:59:05 2005  George Lebl <jirka@5z.com>

	* gui/gdmwm.c: don't init the wm twice if gdm_wm_init is called
	  twice.  Fixes the greeter hanging if something went wrong with
	  loading the theme.

	* gui/greeter/greeter.c: always destroy the dialog widget because
	  sometimes we don't actually exit.  Fixes non-fatal error dialogs
	  hanging around.

ChangeLog

+Thu Jan 13 17:59:05 2005  George Lebl <jirka@5z.com>
+
+	* gui/gdmwm.c: don't init the wm twice if gdm_wm_init is called
+	  twice.  Fixes the greeter hanging if something went wrong with
+	  loading the theme.
+
+	* gui/greeter/greeter.c: always destroy the dialog widget because
+	  sometimes we don't actually exit.  Fixes non-fatal error dialogs
+	  hanging around.
+
 Tue Dec 14 12:23:35 2004  George Lebl <jirka@5z.com>
 
 	* daemon/verify-pam.c: fix very unlikely possible leak

gui/gdmwm.c

@@ -1167,6 +1167,10 @@ gdm_wm_init (Window login_window)
 
 	wm_login_window = login_window;
 
+	if (wm_disp != NULL) {
+		return;
+	}
+
 	wm_disp = XOpenDisplay (gdk_get_display ());
 	if (wm_disp == NULL) {
 		/* EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEK! */

gui/greeter/greeter.c

@@ -647,6 +647,7 @@ verify_gdm_version (void)
       gdm_common_setup_cursor (GDK_LEFT_PTR);
     
       gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
     
       return EXIT_SUCCESS;
     }
@@ -1188,6 +1189,7 @@ main (int argc, char *argv[])
         gdm_common_setup_cursor (GDK_LEFT_PTR);
     
         gtk_dialog_run (GTK_DIALOG (dialog));
+	gtk_widget_destroy (dialog);
 
 	if (DOING_GDM_DEVELOPMENT)
 	  {
@@ -1236,6 +1238,7 @@ main (int argc, char *argv[])
       gdm_common_setup_cursor (GDK_LEFT_PTR);
 
       gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
 
       root = NULL;
     }
@@ -1272,6 +1275,7 @@ main (int argc, char *argv[])
       gdm_common_setup_cursor (GDK_LEFT_PTR);
     
       gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
 
       execl (EXPANDED_BINDIR "/gdmlogin", EXPANDED_BINDIR "/gdmlogin", NULL);
       execlp ("gdmlogin", "gdmlogin", NULL);
@@ -1294,6 +1298,7 @@ main (int argc, char *argv[])
       gdm_common_setup_cursor (GDK_LEFT_PTR);
     
       gtk_dialog_run (GTK_DIALOG (dialog));
+      gtk_widget_destroy (dialog);
 
       _exit (DISPLAY_ABORT);
     }