Feb 1 08:57:38 2002 Owen Taylor <otaylor@redhat.com>

        * gtk/gtkmain.c (gtk_exit_func): Remove this useless
        atexit handler. (existance pointed out by Stefan Kost)

        * gtk/gtkmain.c (gtk_init_check): Warning fixes.

diff --git a/ChangeLog b/ChangeLog
index f81301d8d407fefdea1aed72a5b825cd31909858..956bcd4a4d5c4fce6e1cbeae54aff98910049131 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb  1 08:57:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_exit_func): Remove this useless
+       atexit handler. (existance pointed out by Stefan Kost)
+
+       * gtk/gtkmain.c (gtk_init_check): Warning fixes.
+
 Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f81301d8d407fefdea1aed72a5b825cd31909858..956bcd4a4d5c4fce6e1cbeae54aff98910049131 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Fri Feb  1 08:57:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_exit_func): Remove this useless
+       atexit handler. (existance pointed out by Stefan Kost)
+
+       * gtk/gtkmain.c (gtk_init_check): Warning fixes.
+
 Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f81301d8d407fefdea1aed72a5b825cd31909858..956bcd4a4d5c4fce6e1cbeae54aff98910049131 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Fri Feb  1 08:57:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_exit_func): Remove this useless
+       atexit handler. (existance pointed out by Stefan Kost)
+
+       * gtk/gtkmain.c (gtk_init_check): Warning fixes.
+
 Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f81301d8d407fefdea1aed72a5b825cd31909858..956bcd4a4d5c4fce6e1cbeae54aff98910049131 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Fri Feb  1 08:57:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_exit_func): Remove this useless
+       atexit handler. (existance pointed out by Stefan Kost)
+
+       * gtk/gtkmain.c (gtk_init_check): Warning fixes.
+
 Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f81301d8d407fefdea1aed72a5b825cd31909858..956bcd4a4d5c4fce6e1cbeae54aff98910049131 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Fri Feb  1 08:57:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_exit_func): Remove this useless
+       atexit handler. (existance pointed out by Stefan Kost)
+
+       * gtk/gtkmain.c (gtk_init_check): Warning fixes.
+
 Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f81301d8d407fefdea1aed72a5b825cd31909858..956bcd4a4d5c4fce6e1cbeae54aff98910049131 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Fri Feb  1 08:57:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_exit_func): Remove this useless
+       atexit handler. (existance pointed out by Stefan Kost)
+
+       * gtk/gtkmain.c (gtk_init_check): Warning fixes.
+
 Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f81301d8d407fefdea1aed72a5b825cd31909858..956bcd4a4d5c4fce6e1cbeae54aff98910049131 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Fri Feb  1 08:57:38 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmain.c (gtk_exit_func): Remove this useless
+       atexit handler. (existance pointed out by Stefan Kost)
+
+       * gtk/gtkmain.c (gtk_init_check): Warning fixes.
+
 Thu Jan 31 18:46:10 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreemodel.c (gtk_tree_row_reference_free): unref the

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index b8c8135f67a33ad0de71fe784f5e4b601a14629e..1b7bb1092eb5e35ec1607ba846a680506c9de8d0 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -101,7 +101,6 @@ struct _GtkKeySnooperData
   guint id;
 };
 
-static void  gtk_exit_func              (void);
 static gint  gtk_quit_invoke_function   (GtkQuitFunction    *quitf);
 static void  gtk_quit_destroy           (GtkQuitFunction    *quitf);
 static gint  gtk_invoke_key_snoopers    (GtkWidget          *grab_widget,
@@ -444,7 +443,7 @@ gtk_init_check (int  *argc,
   GString *gtk_modules_string = NULL;
   GSList *gtk_modules = NULL;
   GSList *slist;
-  gchar *env_string;
+  const gchar *env_string;
 
   if (gtk_initialized)
     return TRUE;
@@ -630,10 +629,6 @@ gtk_init_check (int         *argc,
   _gtk_accel_map_init ();  
   _gtk_rc_init ();
   
-  /* Register an exit function to make sure we are able to cleanup.
-   */
-  g_atexit (gtk_exit_func);
-  
   /* Set the 'initialized' flag.
    */
   gtk_initialized = TRUE;
@@ -704,9 +699,6 @@ gtk_exit (gint errorcode)
 {
   /* Only if "gtk" has been initialized should we de-initialize.
    */
-  /* de-initialisation is done by the gtk_exit_funct(),
-   * no need to do this here (Alex J.)
-   */
   gdk_exit (errorcode);
 }
 
@@ -1723,16 +1715,6 @@ gtk_get_event_widget (GdkEvent *event)
   return widget;
 }
 
-static void
-gtk_exit_func (void)
-{
-  if (gtk_initialized)
-    {
-      gtk_initialized = FALSE;
-    }
-}
-
-
 static gint
 gtk_quit_invoke_function (GtkQuitFunction *quitf)
 {