summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--src/core/main.c9
-rw-r--r--src/tools/marco-grayscale.c2
3 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 9074723e..f43612ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,7 +181,7 @@ AM_GLIB_GNU_GETTEXT
## here we get the flags we'll actually use
# GOptionEntry requires glib-2.6.0
-PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
+PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.32.0)
# gtk_window_set_icon_name requires gtk2+-2.60
PKG_CHECK_MODULES(MARCO_MESSAGE, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
PKG_CHECK_MODULES(MARCO_WINDOW_DEMO, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
diff --git a/src/core/main.c b/src/core/main.c
index 4e141762..39405127 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -421,18 +421,9 @@ main (int argc, char **argv)
guint i;
GIOChannel *channel;
-#if GLIB_CHECK_VERSION (2, 32, 0)
- /* g_thread_init () deprecated */
-#else
- if (!g_thread_supported ())
- g_thread_init (NULL);
-#endif
-
if (setlocale (LC_ALL, "") == NULL)
meta_warning ("Locale not understood by C library, internationalization will not work\n");
- g_type_init ();
-
sigemptyset (&empty_mask);
act.sa_handler = SIG_IGN;
act.sa_mask = empty_mask;
diff --git a/src/tools/marco-grayscale.c b/src/tools/marco-grayscale.c
index 7eb3e2b7..4add2771 100644
--- a/src/tools/marco-grayscale.c
+++ b/src/tools/marco-grayscale.c
@@ -81,8 +81,6 @@ main (int argc, char **argv)
return 1;
}
- g_type_init ();
-
err = NULL;
pixbuf = gdk_pixbuf_new_from_file (argv[1], &err);
if (err != NULL)