diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-06-06 00:56:00 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-06-06 00:56:00 +0000 |
| commit | 3a917e9da7774112e07a6361bbef7424d380c6a7 (patch) | |
| tree | ee8d3869a1befbc61e344e47bf3a6992163bb902 /gdk/gdk.c | |
| parent | eaa77a475488d6a1ca364b848c72462446c0f6c2 (diff) | |
| download | gtk+-3a917e9da7774112e07a6361bbef7424d380c6a7.tar.gz | |
Add call to g_type_init() - we'll need this later, and this makes sure
Mon Jun 5 16:00:09 2000 Owen Taylor <otaylor@redhat.com>
* gdk/gdk.c (gdk_init_check): Add call to g_type_init() - we'll
need this later, and this makes sure that the atexit for
glib gets called after that for GDK, so atexits are
properly ordered for object leak checking.
* gdk/gdk.c (gdk_exit_func): Call gdk_windowing_exit().
* gdk/x11/gdkmain-x11.c (gdk_windowing_exit): Call
pango_x_shutdown_display()
* gtk/simple.c (main): Close window on destroy.
Diffstat (limited to 'gdk/gdk.c')
| -rw-r--r-- | gdk/gdk.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -277,7 +277,7 @@ gdk_init_check (int *argc, if (gdk_initialized) return TRUE; - + if (g_thread_supported ()) gdk_threads_mutex = g_mutex_new (); @@ -321,6 +321,8 @@ gdk_init_check (int *argc, GDK_NOTE (MISC, g_message ("progname: \"%s\"", g_get_prgname ())); + g_type_init (); + result = _gdk_windowing_init_check (argc_orig, argv_orig); for (i = 0; i < argc_orig; i++) @@ -425,6 +427,8 @@ gdk_exit_func (void) gdk_image_exit (); gdk_input_exit (); gdk_key_repeat_restore (); + + gdk_windowing_exit (); gdk_initialized = 0; } |