From 94e6913a2864e89ae4c2c2c00bd09e2b6c2ecb7a Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sat, 21 Dec 2002 16:39:48 +0000 Subject: [PATCH] Initialise wintab_window as NULL. (gdk_input_exit): Don't unref 2002-12-21 Tor Lillqvist * gdk/win32/gdkinput-win32.c: Initialise wintab_window as NULL. (gdk_input_exit): Don't unref wintab_window if it is NULL. (#101005, Katsuhiro Okuno) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/win32/gdkinput-win32.c | 10 +++++++--- 7 files changed, 43 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94465d1432..cac5d09663 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-12-21 Tor Lillqvist + + * gdk/win32/gdkinput-win32.c: Initialise wintab_window as NULL. + (gdk_input_exit): Don't unref wintab_window if it is + NULL. (#101005, Katsuhiro Okuno) + 2002-12-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Umm, I diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 94465d1432..cac5d09663 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2002-12-21 Tor Lillqvist + + * gdk/win32/gdkinput-win32.c: Initialise wintab_window as NULL. + (gdk_input_exit): Don't unref wintab_window if it is + NULL. (#101005, Katsuhiro Okuno) + 2002-12-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Umm, I diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 94465d1432..cac5d09663 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +2002-12-21 Tor Lillqvist + + * gdk/win32/gdkinput-win32.c: Initialise wintab_window as NULL. + (gdk_input_exit): Don't unref wintab_window if it is + NULL. (#101005, Katsuhiro Okuno) + 2002-12-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Umm, I diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 94465d1432..cac5d09663 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2002-12-21 Tor Lillqvist + + * gdk/win32/gdkinput-win32.c: Initialise wintab_window as NULL. + (gdk_input_exit): Don't unref wintab_window if it is + NULL. (#101005, Katsuhiro Okuno) + 2002-12-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Umm, I diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 94465d1432..cac5d09663 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2002-12-21 Tor Lillqvist + + * gdk/win32/gdkinput-win32.c: Initialise wintab_window as NULL. + (gdk_input_exit): Don't unref wintab_window if it is + NULL. (#101005, Katsuhiro Okuno) + 2002-12-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Umm, I diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 94465d1432..cac5d09663 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2002-12-21 Tor Lillqvist + + * gdk/win32/gdkinput-win32.c: Initialise wintab_window as NULL. + (gdk_input_exit): Don't unref wintab_window if it is + NULL. (#101005, Katsuhiro Okuno) + 2002-12-19 Tor Lillqvist * gdk/win32/gdkwindow-win32.c (gdk_window_get_geometry): Umm, I diff --git a/gdk/win32/gdkinput-win32.c b/gdk/win32/gdkinput-win32.c index 20cf69cb28..e7d5b23a83 100644 --- a/gdk/win32/gdkinput-win32.c +++ b/gdk/win32/gdkinput-win32.c @@ -156,7 +156,7 @@ static GList *wintab_contexts; static gint gdk_input_root_width; static gint gdk_input_root_height; -static GdkWindow *wintab_window; +static GdkWindow *wintab_window = NULL; static guint32 last_moved_cursor_id; #endif @@ -970,6 +970,7 @@ gdk_input_find_dev_from_ctx (HCTX hctx, } return NULL; } + static gint gdk_input_win32_other_event (GdkEvent *event, MSG *xevent) @@ -1587,8 +1588,11 @@ gdk_input_exit (void) g_list_free (gdk_input_windows); gdk_input_windows = NULL; - gdk_window_unref (wintab_window); - wintab_window = NULL; + if (wintab_window != NULL) + { + gdk_window_unref (wintab_window); + wintab_window = NULL; + } #if 1 for (tmp_list = wintab_contexts; tmp_list; tmp_list = tmp_list->next)