version bump to 1.1.1, binary age 0, interface age 0. pass "gmodule" to

Mon Aug 17 01:40:00 1998  Tim Janik  <timj@gtk.org>

        * configure.in: version bump to 1.1.1, binary age 0, interface age 0.
        pass "gmodule" to AM_PATH_GLIB, with that we require libgmodule.so now.

        * gtk/gtkmain.c (gtk_init): since glib's g_return*_if_fail macros log
        with G_LOG_LEVEL_CRITICAL now, i added "--g-fatal-checks",
        "--gdk-fatal-checks" and "--gtk-fatal-checks". that makes up six
        different *-fatal-* arguments now. this needs to be revised and
        compressed to a reasonable amount of arguments.

diff --git a/ChangeLog b/ChangeLog
index 18e910d53b0e53e81977e764614782bc2d190998..e675d2e8807bfa66a0288c0146b5dd15ce91ee22 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Aug 17 01:40:00 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: version bump to 1.1.1, binary age 0, interface age 0.
+       pass "gmodule" to AM_PATH_GLIB, with that we require libgmodule.so now.
+
+       * gtk/gtkmain.c (gtk_init): since glib's g_return*_if_fail macros log
+       with G_LOG_LEVEL_CRITICAL now, i added "--g-fatal-checks",
+       "--gdk-fatal-checks" and "--gtk-fatal-checks". that makes up six
+       different *-fatal-* arguments now. this needs to be revised and
+       compressed to a reasonable amount of arguments.
+
 Sun Aug 16 20:51:59 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): fatal warning option is split up now,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 18e910d53b0e53e81977e764614782bc2d190998..e675d2e8807bfa66a0288c0146b5dd15ce91ee22 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Mon Aug 17 01:40:00 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: version bump to 1.1.1, binary age 0, interface age 0.
+       pass "gmodule" to AM_PATH_GLIB, with that we require libgmodule.so now.
+
+       * gtk/gtkmain.c (gtk_init): since glib's g_return*_if_fail macros log
+       with G_LOG_LEVEL_CRITICAL now, i added "--g-fatal-checks",
+       "--gdk-fatal-checks" and "--gtk-fatal-checks". that makes up six
+       different *-fatal-* arguments now. this needs to be revised and
+       compressed to a reasonable amount of arguments.
+
 Sun Aug 16 20:51:59 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): fatal warning option is split up now,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 18e910d53b0e53e81977e764614782bc2d190998..e675d2e8807bfa66a0288c0146b5dd15ce91ee22 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Mon Aug 17 01:40:00 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: version bump to 1.1.1, binary age 0, interface age 0.
+       pass "gmodule" to AM_PATH_GLIB, with that we require libgmodule.so now.
+
+       * gtk/gtkmain.c (gtk_init): since glib's g_return*_if_fail macros log
+       with G_LOG_LEVEL_CRITICAL now, i added "--g-fatal-checks",
+       "--gdk-fatal-checks" and "--gtk-fatal-checks". that makes up six
+       different *-fatal-* arguments now. this needs to be revised and
+       compressed to a reasonable amount of arguments.
+
 Sun Aug 16 20:51:59 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): fatal warning option is split up now,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 18e910d53b0e53e81977e764614782bc2d190998..e675d2e8807bfa66a0288c0146b5dd15ce91ee22 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Mon Aug 17 01:40:00 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: version bump to 1.1.1, binary age 0, interface age 0.
+       pass "gmodule" to AM_PATH_GLIB, with that we require libgmodule.so now.
+
+       * gtk/gtkmain.c (gtk_init): since glib's g_return*_if_fail macros log
+       with G_LOG_LEVEL_CRITICAL now, i added "--g-fatal-checks",
+       "--gdk-fatal-checks" and "--gtk-fatal-checks". that makes up six
+       different *-fatal-* arguments now. this needs to be revised and
+       compressed to a reasonable amount of arguments.
+
 Sun Aug 16 20:51:59 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): fatal warning option is split up now,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 18e910d53b0e53e81977e764614782bc2d190998..e675d2e8807bfa66a0288c0146b5dd15ce91ee22 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Mon Aug 17 01:40:00 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: version bump to 1.1.1, binary age 0, interface age 0.
+       pass "gmodule" to AM_PATH_GLIB, with that we require libgmodule.so now.
+
+       * gtk/gtkmain.c (gtk_init): since glib's g_return*_if_fail macros log
+       with G_LOG_LEVEL_CRITICAL now, i added "--g-fatal-checks",
+       "--gdk-fatal-checks" and "--gtk-fatal-checks". that makes up six
+       different *-fatal-* arguments now. this needs to be revised and
+       compressed to a reasonable amount of arguments.
+
 Sun Aug 16 20:51:59 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): fatal warning option is split up now,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 18e910d53b0e53e81977e764614782bc2d190998..e675d2e8807bfa66a0288c0146b5dd15ce91ee22 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Mon Aug 17 01:40:00 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: version bump to 1.1.1, binary age 0, interface age 0.
+       pass "gmodule" to AM_PATH_GLIB, with that we require libgmodule.so now.
+
+       * gtk/gtkmain.c (gtk_init): since glib's g_return*_if_fail macros log
+       with G_LOG_LEVEL_CRITICAL now, i added "--g-fatal-checks",
+       "--gdk-fatal-checks" and "--gtk-fatal-checks". that makes up six
+       different *-fatal-* arguments now. this needs to be revised and
+       compressed to a reasonable amount of arguments.
+
 Sun Aug 16 20:51:59 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): fatal warning option is split up now,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 18e910d53b0e53e81977e764614782bc2d190998..e675d2e8807bfa66a0288c0146b5dd15ce91ee22 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Mon Aug 17 01:40:00 1998  Tim Janik  <timj@gtk.org>
+
+       * configure.in: version bump to 1.1.1, binary age 0, interface age 0.
+       pass "gmodule" to AM_PATH_GLIB, with that we require libgmodule.so now.
+
+       * gtk/gtkmain.c (gtk_init): since glib's g_return*_if_fail macros log
+       with G_LOG_LEVEL_CRITICAL now, i added "--g-fatal-checks",
+       "--gdk-fatal-checks" and "--gtk-fatal-checks". that makes up six
+       different *-fatal-* arguments now. this needs to be revised and
+       compressed to a reasonable amount of arguments.
+
 Sun Aug 16 20:51:59 1998  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkmain.c (gtk_init): fatal warning option is split up now,

diff --git a/HACKING b/HACKING
index 21fd2c59844c2131ca032f4ac170f1eb398fd9fc..428a0b1323384fa6317f3844209487c2735bce28 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -9,21 +9,24 @@ to have the following packages installed:
 These should be available by ftp from ftp.gnu.org or any of the
 fine GNU mirrors.  Beta software can be found at alpha.gnu.org.
 
-If you are accessing gtk+ via CVS, then you will need to take several
-steps to get it to compile.  You can do all these steps at once
-by running:
+In order to get CVS gtk+ installed on your system, you need to have
+the most recent CVS version of glib installed as well.
+The installation process of glib is similar to that of gtk+, but
+needs to be fulfilled prior to installation of gtk+.
+
+To compile a CVS version of gtk+ on your system, you will need to take
+several steps to setup the tree for compilation.  You can do all these
+steps at once by running:
 
         cvsroot/gtk+# ./autogen.sh
    
 Basically this does the following for you:
 
        cvsroot/gtk+# aclocal; automake; autoconf
-        cvsroot/gtk+/glib# aclocal; automake; autoconf
 
         The above commands create the "configure" script.  Now you
        can run the configure script in cvsroot/gtk+ to create all
-       the Makefiles.  You only need to call "configure" in cvsroot/gtk+ 
-       as the one in glib will be invoked automatically.
+       the Makefiles.
 
 Before running autogen.sh or configure, make sure you have libtool 
 in your path.  
@@ -33,11 +36,12 @@ options like --prefix=/usr to configure you can give those options
 to autogen.sh and they will be passed on to configure.
 
 If at all possible, please use CVS to get the latest development version of
-gtk+.  You can do the following to get gtk+ from cvs:
+gtk+ and glib.  You can do the following to get glib and gtk+ from cvs:
 
    $ export CVSROOT=':pserver:anonymous@cvs.gimp.org:/debian/home/gnomecvs'
    $ cvs login
      (there is no password, just hit return)
+   $ cvs -z9 checkout glib
    $ cvs -z9 checkout gtk+
 
 Please submit patches to the gtk-list@redhat.com mailing list (you must

diff --git a/INSTALL b/INSTALL
index aa2d716b07ab7f53e4d58cbd0c511a0b814bf30e..2cfefd874917644b2edb520731e6530c072763b0 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -7,8 +7,8 @@ you got this package.
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-1.1.1.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-1.1.1                          # change to the toplevel directory
+  % gzip -cd gtk+-1.1.2.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-1.1.2                          # change to the toplevel directory
   % ./configure                            # run the `configure' script
   % make                                   # build GTK
   [ Become root if necessary ]
@@ -92,7 +92,7 @@ You can compile GTK+ against a copy of GLIB that you have not
 yet installed. To do this, give the --with-glib=DIR options
 to ./configure. For instance:
 
- ./configure --with-glib=../glib-1.1.1
+ ./configure --with-glib=../glib-1.1.3
 
 This, however, will not work if you built GLIB with different
 source and build directories.

diff --git a/README b/README
index 1c0166254435431d8fde510c0b6149a52436e4e6..74cf3d745826a3e2894ff59ad6eb4d633c08c357 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 1.1.1.   GTK+, which stands for the Gimp ToolKit, 
+This is GTK+ version 1.1.2.   GTK+, which stands for the Gimp ToolKit, 
 is a library for creating graphical user interfaces for the X Window 
 System. It is designed to be small, efficient, and flexible. GTK+ is 
 written in C with a very object-oriented approach.

diff --git a/TODO b/TODO
index 7be80a4428848a1aebb6f356ca6472f8e9460ae1..0be764de5e564d6945b42af354394cd67e4d3142 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,5 +1,3 @@
-For 1.1.0 release:
-
 For 1.2.0 release:
 -      remove deprecated functions from *.[hc] files, especially the
        non-functional ones.

diff --git a/configure.in b/configure.in
index 486340d7deb9b0fa5a874c9b02c96322d139d1ea..d99fd83383f75e850813a384ee0c3a683af35405 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ cflags_set=${CFLAGS+set}
 #
 GTK_MAJOR_VERSION=1
 GTK_MINOR_VERSION=1
-GTK_MICRO_VERSION=1
+GTK_MICRO_VERSION=2
 GTK_INTERFACE_AGE=0
 GTK_BINARY_AGE=0
 GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
@@ -140,8 +140,9 @@ if test x$with_glib = x ; then
 
   AM_PATH_GLIB(1.1.3,,
     AC_MSG_ERROR([
-*** GLIB 1.1.1 or better is required. The latest version of GLIB
-*** is always available from ftp://ftp.gtk.org.]))
+*** GLIB 1.1.3 or better is required. The latest version of GLIB
+*** is always available from ftp://ftp.gtk.org.]),
+    gmodule)
 
   glib_cflags=$GLIB_CFLAGS
   glib_libs=$GLIB_LIBS

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index b1c5ceda50e38d547404d756f233b02029701cfc..657e50fd590b919d40c47664469f4e6de1bc67dd 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -334,6 +334,33 @@ gtk_init (int       *argc,
               g_log_set_fatal_mask (G_LOG_DOMAIN, fatal_levels);
              (*argv)[i] = NULL;
            }
+         else if (strcmp ("--g-fatal-checks", (*argv)[i]) == 0)
+           {
+             GLogLevelFlags fatal_levels;
+
+             fatal_levels = g_log_set_fatal_mask (g_log_domain_glib, G_LOG_FATAL_MASK);
+             fatal_levels |= G_LOG_LEVEL_CRITICAL;
+              g_log_set_fatal_mask (g_log_domain_glib, fatal_levels);
+             (*argv)[i] = NULL;
+           }
+         else if (strcmp ("--gdk-fatal-checks", (*argv)[i]) == 0)
+           {
+             GLogLevelFlags fatal_levels;
+
+             fatal_levels = g_log_set_fatal_mask ("Gdk", G_LOG_FATAL_MASK);
+             fatal_levels |= G_LOG_LEVEL_CRITICAL;
+              g_log_set_fatal_mask ("Gdk", fatal_levels);
+             (*argv)[i] = NULL;
+           }
+         else if (strcmp ("--gtk-fatal-checks", (*argv)[i]) == 0)
+           {
+             GLogLevelFlags fatal_levels;
+
+             fatal_levels = g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_FATAL_MASK);
+             fatal_levels |= G_LOG_LEVEL_CRITICAL;
+              g_log_set_fatal_mask (G_LOG_DOMAIN, fatal_levels);
+             (*argv)[i] = NULL;
+           }
          i += 1;
        }