[gtk+] Bump GLib dependency to 2.35

[Matthias Clasen <matthiasc src gnome org>]

commit 9ebeb4e68a4623519f1876b80a65d73f945cd1a0
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Oct 30 12:52:11 2012 -0400

    Bump GLib dependency to 2.35
    
    And drop deprecated g_type_init() calls.

 configure.ac                 |    2 +-
 examples/bloatpad.c          |    2 --
 examples/plugman.c           |    2 --
 examples/sunny.c             |    2 --
 gdk/gdk.c                    |    2 --
 gtk/gtk-launch.c             |    2 --
 gtk/gtkapplication.c         |    7 +++----
 gtk/gtkmain.c                |    3 ---
 gtk/updateiconcache.c        |    1 -
 tests/testappchooser.c       |    1 -
 tests/testappchooserbutton.c |    1 -
 tests/testnouiprint.c        |    2 --
 12 files changed, 4 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index de69ffe..3938927 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 m4_define([gtk_binary_version], [3.0.0])
 
 # required versions of other packages
-m4_define([glib_required_version], [2.33.1])
+m4_define([glib_required_version], [2.35.0])
 m4_define([pango_required_version], [1.30.0])
 m4_define([atk_required_version], [2.5.3])
 m4_define([cairo_required_version], [1.10.0])
diff --git a/examples/bloatpad.c b/examples/bloatpad.c
index 8d0da4e..f5cf1a9 100644
--- a/examples/bloatpad.c
+++ b/examples/bloatpad.c
@@ -411,8 +411,6 @@ bloat_pad_new (void)
 {
   BloatPad *bloat_pad;
 
-  g_type_init ();
-
   g_set_application_name ("Bloatpad");
 
   bloat_pad = g_object_new (bloat_pad_get_type (),
diff --git a/examples/plugman.c b/examples/plugman.c
index 7efeeae..c074aa9 100644
--- a/examples/plugman.c
+++ b/examples/plugman.c
@@ -465,8 +465,6 @@ plug_man_class_init (PlugManClass *class)
 PlugMan *
 plug_man_new (void)
 {
-  g_type_init ();
-
   return g_object_new (plug_man_get_type (),
                        "application-id", "org.gtk.Test.plugman",
                        "flags", G_APPLICATION_HANDLES_OPEN,
diff --git a/examples/sunny.c b/examples/sunny.c
index 524b898..9178706 100644
--- a/examples/sunny.c
+++ b/examples/sunny.c
@@ -191,8 +191,6 @@ menu_button_class_init (MenuButtonClass *class)
 MenuButton *
 menu_button_new (void)
 {
-  g_type_init ();
-
   return g_object_new (menu_button_get_type (),
                        "application-id", "org.gtk.Test.Sunny",
                        "flags", G_APPLICATION_HANDLES_OPEN,
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 6c354b1..bc668d4 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -274,8 +274,6 @@ gdk_pre_parse_libgtk_only (void)
         _gdk_rendering_mode = GDK_RENDERING_MODE_RECORDING;
     }
 
-  g_type_init ();
-
   /* Do any setup particular to the windowing system */
   gdk_display_manager_get ();
 }
diff --git a/gtk/gtk-launch.c b/gtk/gtk-launch.c
index 7a15ffe..083b665 100644
--- a/gtk/gtk-launch.c
+++ b/gtk/gtk-launch.c
@@ -65,8 +65,6 @@ main (int argc, char *argv[])
 #endif
 #endif
 
-  g_type_init ();
-
   /* Translators: this message will appear immediately after the */
   /* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE>    */
   context =
diff --git a/gtk/gtkapplication.c b/gtk/gtkapplication.c
index 4e9de42..a4486c4 100644
--- a/gtk/gtkapplication.c
+++ b/gtk/gtkapplication.c
@@ -768,8 +768,9 @@ gtk_application_class_init (GtkApplicationClass *class)
  *
  * Creates a new #GtkApplication instance.
  *
- * This function calls g_type_init() for you. gtk_init() is called
- * as soon as the application gets registered as the primary instance.
+ * When using #GtkApplication, it is not necessary to call gtk_init()
+ * manually. It is called as soon as the application gets registered as
+ * the primary instance.
  *
  * Concretely, gtk_init() is called in the default handler for the
  * #GApplication::startup signal. Therefore, #GtkApplication subclasses should
@@ -800,8 +801,6 @@ gtk_application_new (const gchar       *application_id,
 {
   g_return_val_if_fail (application_id == NULL || g_application_id_is_valid (application_id), NULL);
 
-  g_type_init ();
-
   return g_object_new (GTK_TYPE_APPLICATION,
                        "application-id", application_id,
                        "flags", flags,
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 80dd3e4..f490aa2 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -710,9 +710,6 @@ do_post_parse_initialization (int    *argc,
 
   _gtk_register_resource ();
 
-  /* do what the call to gtk_type_init() used to do */
-  g_type_init ();
-
   _gtk_accel_map_init ();
 
   /* Set the 'initialized' flag.
diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
index 4159c93..d3ebd2c 100644
--- a/gtk/updateiconcache.c
+++ b/gtk/updateiconcache.c
@@ -1736,7 +1736,6 @@ main (int argc, char **argv)
   if (!force_update && is_cache_up_to_date (path))
     return 0;
 
-  g_type_init ();
   build_cache (path);
 
   if (strcmp (var_name, "-") != 0)
diff --git a/tests/testappchooser.c b/tests/testappchooser.c
index 76af238..436c56a 100644
--- a/tests/testappchooser.c
+++ b/tests/testappchooser.c
@@ -155,7 +155,6 @@ main (int argc, char **argv)
   GtkWidget *w1;
   gchar *path;
 
-  g_type_init ();
   gtk_init (&argc, &argv);
 
   toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
index 92fbb1a..0bc54fe 100644
--- a/tests/testappchooserbutton.c
+++ b/tests/testappchooserbutton.c
@@ -67,7 +67,6 @@ main (int argc,
 {
   GtkWidget *w;
 
-  g_type_init ();
   gtk_init (&argc, &argv);
 
   toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
diff --git a/tests/testnouiprint.c b/tests/testnouiprint.c
index b6a7b15..885fa24 100644
--- a/tests/testnouiprint.c
+++ b/tests/testnouiprint.c
@@ -81,8 +81,6 @@ main (int argc, char **argv)
   GtkPrintOperation *print;
   GtkPrintSettings *settings;
 
-  g_type_init ();
-
   settings = gtk_print_settings_new ();
   /* gtk_print_settings_set_printer (settings, "printer"); */