Bump GLib dependency to 2.35

And drop deprecated g_type_init() calls.
This commit is contained in:
Matthias Clasen 2012-10-30 12:52:11 -04:00
parent 8bdc2aa228
commit 9ebeb4e68a
12 changed files with 4 additions and 23 deletions

View File

@ -39,7 +39,7 @@ AC_CONFIG_AUX_DIR([build-aux])
m4_define([gtk_binary_version], [3.0.0]) m4_define([gtk_binary_version], [3.0.0])
# required versions of other packages # 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([pango_required_version], [1.30.0])
m4_define([atk_required_version], [2.5.3]) m4_define([atk_required_version], [2.5.3])
m4_define([cairo_required_version], [1.10.0]) m4_define([cairo_required_version], [1.10.0])

View File

@ -411,8 +411,6 @@ bloat_pad_new (void)
{ {
BloatPad *bloat_pad; BloatPad *bloat_pad;
g_type_init ();
g_set_application_name ("Bloatpad"); g_set_application_name ("Bloatpad");
bloat_pad = g_object_new (bloat_pad_get_type (), bloat_pad = g_object_new (bloat_pad_get_type (),

View File

@ -465,8 +465,6 @@ plug_man_class_init (PlugManClass *class)
PlugMan * PlugMan *
plug_man_new (void) plug_man_new (void)
{ {
g_type_init ();
return g_object_new (plug_man_get_type (), return g_object_new (plug_man_get_type (),
"application-id", "org.gtk.Test.plugman", "application-id", "org.gtk.Test.plugman",
"flags", G_APPLICATION_HANDLES_OPEN, "flags", G_APPLICATION_HANDLES_OPEN,

View File

@ -191,8 +191,6 @@ menu_button_class_init (MenuButtonClass *class)
MenuButton * MenuButton *
menu_button_new (void) menu_button_new (void)
{ {
g_type_init ();
return g_object_new (menu_button_get_type (), return g_object_new (menu_button_get_type (),
"application-id", "org.gtk.Test.Sunny", "application-id", "org.gtk.Test.Sunny",
"flags", G_APPLICATION_HANDLES_OPEN, "flags", G_APPLICATION_HANDLES_OPEN,

View File

@ -274,8 +274,6 @@ gdk_pre_parse_libgtk_only (void)
_gdk_rendering_mode = GDK_RENDERING_MODE_RECORDING; _gdk_rendering_mode = GDK_RENDERING_MODE_RECORDING;
} }
g_type_init ();
/* Do any setup particular to the windowing system */ /* Do any setup particular to the windowing system */
gdk_display_manager_get (); gdk_display_manager_get ();
} }

View File

@ -65,8 +65,6 @@ main (int argc, char *argv[])
#endif #endif
#endif #endif
g_type_init ();
/* Translators: this message will appear immediately after the */ /* Translators: this message will appear immediately after the */
/* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE> */ /* usage string - Usage: COMMAND [OPTION]... <THIS_MESSAGE> */
context = context =

View File

@ -768,8 +768,9 @@ gtk_application_class_init (GtkApplicationClass *class)
* *
* Creates a new #GtkApplication instance. * Creates a new #GtkApplication instance.
* *
* This function calls g_type_init() for you. gtk_init() is called * When using #GtkApplication, it is not necessary to call gtk_init()
* as soon as the application gets registered as the primary instance. * 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 * Concretely, gtk_init() is called in the default handler for the
* #GApplication::startup signal. Therefore, #GtkApplication subclasses should * #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_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, return g_object_new (GTK_TYPE_APPLICATION,
"application-id", application_id, "application-id", application_id,
"flags", flags, "flags", flags,

View File

@ -710,9 +710,6 @@ do_post_parse_initialization (int *argc,
_gtk_register_resource (); _gtk_register_resource ();
/* do what the call to gtk_type_init() used to do */
g_type_init ();
_gtk_accel_map_init (); _gtk_accel_map_init ();
/* Set the 'initialized' flag. /* Set the 'initialized' flag.

View File

@ -1736,7 +1736,6 @@ main (int argc, char **argv)
if (!force_update && is_cache_up_to_date (path)) if (!force_update && is_cache_up_to_date (path))
return 0; return 0;
g_type_init ();
build_cache (path); build_cache (path);
if (strcmp (var_name, "-") != 0) if (strcmp (var_name, "-") != 0)

View File

@ -155,7 +155,6 @@ main (int argc, char **argv)
GtkWidget *w1; GtkWidget *w1;
gchar *path; gchar *path;
g_type_init ();
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL); toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);

View File

@ -67,7 +67,6 @@ main (int argc,
{ {
GtkWidget *w; GtkWidget *w;
g_type_init ();
gtk_init (&argc, &argv); gtk_init (&argc, &argv);
toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL); toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);

View File

@ -81,8 +81,6 @@ main (int argc, char **argv)
GtkPrintOperation *print; GtkPrintOperation *print;
GtkPrintSettings *settings; GtkPrintSettings *settings;
g_type_init ();
settings = gtk_print_settings_new (); settings = gtk_print_settings_new ();
/* gtk_print_settings_set_printer (settings, "printer"); */ /* gtk_print_settings_set_printer (settings, "printer"); */