callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove references to gdk_initialized (#81060, Jacob Berkman)

Browse Source 
Fri Aug  2 16:24:32 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkmain-x11.c: Remove references to
        gdk_initialized (#81060, Jacob Berkman)

        * gdk/gdk.c (gdk_exit): Remove gdk_exit_func().
This commit is contained in:
Owen Taylor
2002-08-02 20:25:38 +00:00
committed by Owen Taylor
parent b7c0c06b8e
commit c7aab6da1e
8 changed files with 42 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Aug 2 16:24:32 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
Fri Aug 2 16:24:32 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
Fri Aug 2 16:24:32 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
Fri Aug 2 16:24:32 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
Fri Aug 2 16:24:32 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
Fri Aug 2 16:24:32 2002 Owen Taylor <otaylor@redhat.com>
* 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 <otaylor@redhat.com> Fri Aug 2 15:56:47 2002 Owen Taylor <otaylor@redhat.com>
* gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix * gdk/x11/gdkscreen-x11.c (gdk_screen_x11_dispose): Fix

49
gdk/gdk.c
View File

@ -444,55 +444,6 @@ gdk_exit (gint errorcode)
exit (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 void
gdk_threads_enter () gdk_threads_enter ()
{ {

6
gdk/x11/gdkmain-x11.c
View File

@ -84,9 +84,6 @@ static int gdk_x_io_error (Display *display);
/* Private variable declarations /* 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_traps = NULL; /* List of error traps */
static GSList *gdk_error_trap_free_list = NULL; /* Free list */ 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 ()); display ? DisplayString (display) : gdk_get_display_arg_name ());
} }
/* Disable the atexit shutdown for GDK */
gdk_initialized = 0;
exit(1); exit(1);
} }