[gnome-desktop] Drop calls to g_type_init(), bump GLib requirement
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-desktop] Drop calls to g_type_init(), bump GLib requirement
- Date: Sun, 28 Oct 2012 21:34:13 +0000 (UTC)
commit 405bfde5885e1662ff142ed5435c7a401aead4b6
Author: Colin Walters <walters verbum org>
Date: Sun Oct 28 17:32:37 2012 -0400
Drop calls to g_type_init(), bump GLib requirement
See http://git.gnome.org/browse/glib/commit/?id=2002479c02fa6e468fc3f67ddc663657a52ebde8
configure.ac | 2 +-
libgnome-desktop/gnome-rr-debug.c | 1 -
libgnome-desktop/test-pnp-ids.c | 2 --
libgnome-desktop/test-wall-clock.c | 2 --
libgnome-desktop/tests/test-wallclock.c | 2 --
5 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5c3a473..0cb08e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,7 +113,7 @@ dnl it too, or it will never make it into the spec file!
GDK_PIXBUF_REQUIRED=2.21.3
GTK_REQUIRED=3.3.6
-GLIB_REQUIRED=2.33.3
+GLIB_REQUIRED=2.35.0
XRANDR_REQUIRED=1.3
GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=3.5.91
XEXT_REQUIRED=1.1
diff --git a/libgnome-desktop/gnome-rr-debug.c b/libgnome-desktop/gnome-rr-debug.c
index fdfc681..622d6cd 100644
--- a/libgnome-desktop/gnome-rr-debug.c
+++ b/libgnome-desktop/gnome-rr-debug.c
@@ -72,7 +72,6 @@ main (int argc, char *argv[])
guint8 *result = NULL;
guint i;
- g_type_init ();
gtk_init (&argc, &argv);
screen = gnome_rr_screen_new (gdk_screen_get_default (), &error);
if (screen == NULL) {
diff --git a/libgnome-desktop/test-pnp-ids.c b/libgnome-desktop/test-pnp-ids.c
index 80b2ff0..1ac55cc 100644
--- a/libgnome-desktop/test-pnp-ids.c
+++ b/libgnome-desktop/test-pnp-ids.c
@@ -39,8 +39,6 @@ main (int argc, char *argv[])
GnomePnpIds *ids;
guint i;
- g_type_init ();
-
ids = gnome_pnp_ids_new ();
if (argc == 2 &&
diff --git a/libgnome-desktop/test-wall-clock.c b/libgnome-desktop/test-wall-clock.c
index f3e212f..a1c591c 100644
--- a/libgnome-desktop/test-wall-clock.c
+++ b/libgnome-desktop/test-wall-clock.c
@@ -19,8 +19,6 @@ int main (int argc, char **argv)
g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
- g_type_init ();
-
loop = g_main_loop_new (NULL, FALSE);
clock = g_object_new (GNOME_TYPE_WALL_CLOCK, NULL);
diff --git a/libgnome-desktop/tests/test-wallclock.c b/libgnome-desktop/tests/test-wallclock.c
index 2e0c089..0f0e08f 100644
--- a/libgnome-desktop/tests/test-wallclock.c
+++ b/libgnome-desktop/tests/test-wallclock.c
@@ -22,8 +22,6 @@ main (int argc,
GnomeWallClock *clock;
GMainLoop *loop;
- g_type_init ();
-
loop = g_main_loop_new (NULL, TRUE);
clock = g_object_new (GNOME_TYPE_WALL_CLOCK, NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]