From c7aab6da1e88f96c030437014d376c72f4240682 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 2 Aug 2002 20:25:38 +0000 Subject: [PATCH] Remove references to gdk_initialized (#81060, Jacob Berkman) Fri Aug 2 16:24:32 2002 Owen Taylor * gdk/x11/gdkmain-x11.c: Remove references to gdk_initialized (#81060, Jacob Berkman) * gdk/gdk.c (gdk_exit): Remove gdk_exit_func(). --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/gdk.c | 49 ------------------------------------------- gdk/x11/gdkmain-x11.c | 6 ------ 8 files changed, 42 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index d741b8b531..a6b9baf396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Aug 2 16:24:32 2002 Owen Taylor + + * gdk/x11/gdkmain-x11.c: Remove references to + gdk_initialized (#81060, Jacob Berkman) + + * gdk/gdk.c (gdk_exit): Remove gdk_exit_func(). + Fri Aug 2 15:56:47 2002 Owen Taylor * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d741b8b531..a6b9baf396 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Fri Aug 2 16:24:32 2002 Owen Taylor + + * gdk/x11/gdkmain-x11.c: Remove references to + gdk_initialized (#81060, Jacob Berkman) + + * gdk/gdk.c (gdk_exit): Remove gdk_exit_func(). + Fri Aug 2 15:56:47 2002 Owen Taylor * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d741b8b531..a6b9baf396 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Fri Aug 2 16:24:32 2002 Owen Taylor + + * gdk/x11/gdkmain-x11.c: Remove references to + gdk_initialized (#81060, Jacob Berkman) + + * gdk/gdk.c (gdk_exit): Remove gdk_exit_func(). + Fri Aug 2 15:56:47 2002 Owen Taylor * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d741b8b531..a6b9baf396 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Fri Aug 2 16:24:32 2002 Owen Taylor + + * gdk/x11/gdkmain-x11.c: Remove references to + gdk_initialized (#81060, Jacob Berkman) + + * gdk/gdk.c (gdk_exit): Remove gdk_exit_func(). + Fri Aug 2 15:56:47 2002 Owen Taylor * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d741b8b531..a6b9baf396 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Fri Aug 2 16:24:32 2002 Owen Taylor + + * gdk/x11/gdkmain-x11.c: Remove references to + gdk_initialized (#81060, Jacob Berkman) + + * gdk/gdk.c (gdk_exit): Remove gdk_exit_func(). + Fri Aug 2 15:56:47 2002 Owen Taylor * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d741b8b531..a6b9baf396 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Fri Aug 2 16:24:32 2002 Owen Taylor + + * gdk/x11/gdkmain-x11.c: Remove references to + gdk_initialized (#81060, Jacob Berkman) + + * gdk/gdk.c (gdk_exit): Remove gdk_exit_func(). + Fri Aug 2 15:56:47 2002 Owen Taylor * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix diff --git a/gdk/gdk.c b/gdk/gdk.c index ee77ef78b9..1eee68bbb5 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -444,55 +444,6 @@ gdk_exit (gint errorcode) exit (errorcode); } -#if 0 - -/* This is disabled, but the code isn't removed, because we might - * want to have some sort of explicit way to shut down GDK cleanly - * at some point in the future. - */ - -/* - *-------------------------------------------------------------- - * gdk_exit_func - * - * This is the "atexit" function that makes sure the - * library gets a chance to cleanup. - * - * Arguments: - * - * Results: - * - * Side effects: - * The library is un-initialized and the program exits. - * - *-------------------------------------------------------------- - */ - -static void -gdk_exit_func (void) -{ - static gboolean in_gdk_exit_func = FALSE; - - /* This is to avoid an infinite loop if a program segfaults in - an atexit() handler (and yes, it does happen, especially if a program - has trounced over memory too badly for even g_message to work) */ - if (in_gdk_exit_func == TRUE) - return; - in_gdk_exit_func = TRUE; - - if (gdk_initialized) - { - _gdk_image_exit (); - _gdk_input_exit (); - - _gdk_windowing_exit (); - - gdk_initialized = 0; - } -} - -#endif - void gdk_threads_enter () { diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index b74dbd447c..06e92d53d0 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -84,9 +84,6 @@ static int gdk_x_io_error (Display *display); /* Private variable declarations */ -static int gdk_initialized = 0; /* 1 if the library is initialized, - * 0 otherwise. - */ static GSList *gdk_error_traps = NULL; /* List of error traps */ static GSList *gdk_error_trap_free_list = NULL; /* Free list */ @@ -615,9 +612,6 @@ gdk_x_io_error (Display *display) display ? DisplayString (display) : gdk_get_display_arg_name ()); } - /* Disable the atexit shutdown for GDK */ - gdk_initialized = 0; - exit(1); }