ue Jun 18 12:04:10 2002 Owen Taylor <otaylor@redhat.com>

        * gdk/gdk.c (gdk_init_check): Change handling
        of gdk_intialized(), so that gdk_parse_args(),
        gdk_init_check() sequence works.

diff --git a/ChangeLog b/ChangeLog
index ea4bb613dcefc06e4b9abdcef0fc243ac85456e7..03624255eecd4ddc3f015c80acd847700aee99be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 18 12:04:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c (gdk_init_check): Change handling 
+       of gdk_intialized(), so that gdk_parse_args(),
+       gdk_init_check() sequence works.
+
 Tue Jun 18 11:46:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index ea4bb613dcefc06e4b9abdcef0fc243ac85456e7..03624255eecd4ddc3f015c80acd847700aee99be 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Jun 18 12:04:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c (gdk_init_check): Change handling 
+       of gdk_intialized(), so that gdk_parse_args(),
+       gdk_init_check() sequence works.
+
 Tue Jun 18 11:46:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index ea4bb613dcefc06e4b9abdcef0fc243ac85456e7..03624255eecd4ddc3f015c80acd847700aee99be 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Tue Jun 18 12:04:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c (gdk_init_check): Change handling 
+       of gdk_intialized(), so that gdk_parse_args(),
+       gdk_init_check() sequence works.
+
 Tue Jun 18 11:46:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index ea4bb613dcefc06e4b9abdcef0fc243ac85456e7..03624255eecd4ddc3f015c80acd847700aee99be 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue Jun 18 12:04:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c (gdk_init_check): Change handling 
+       of gdk_intialized(), so that gdk_parse_args(),
+       gdk_init_check() sequence works.
+
 Tue Jun 18 11:46:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index ea4bb613dcefc06e4b9abdcef0fc243ac85456e7..03624255eecd4ddc3f015c80acd847700aee99be 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Jun 18 12:04:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c (gdk_init_check): Change handling 
+       of gdk_intialized(), so that gdk_parse_args(),
+       gdk_init_check() sequence works.
+
 Tue Jun 18 11:46:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index ea4bb613dcefc06e4b9abdcef0fc243ac85456e7..03624255eecd4ddc3f015c80acd847700aee99be 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Jun 18 12:04:10 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/gdk.c (gdk_init_check): Change handling 
+       of gdk_intialized(), so that gdk_parse_args(),
+       gdk_init_check() sequence works.
+
 Tue Jun 18 11:46:33 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkwindow-x11.c (get_move_resize_data): Add

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 8f6d99ec3788bb311b1d37586f5a2aa63d6070db..98e0590ebfa6ea0388e38eed0df1da807806356c 100644 (file)
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -286,6 +286,11 @@ gdk_parse_args (int    *argc,
   GdkArgContext *arg_context;
   gint i;
 
+  if (gdk_initialized)
+    return TRUE;
+
+  gdk_initialized = TRUE;
+
   if (argc && argv)
     {
       gdk_argc = *argc;
@@ -385,13 +390,11 @@ gdk_init_check (int    *argc,
 {
   GdkDisplay *display;
   
-  if (gdk_initialized)
-    return TRUE;
-
   gdk_parse_args (argc, argv);
 
-  gdk_initialized = 1;
-
+  if (gdk_get_default_display ())
+    return TRUE;
+    
   display = gdk_open_display (_gdk_display_name);
 
   if (display)