summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-10-24 13:48:16 +0200
committerinfirit <[email protected]>2014-10-24 15:40:43 +0200
commit1e7c923638600f865601bda3e2f294cadea7a244 (patch)
treed83e70a8577922138f6177d2b79628e5c3956b94 /src
parent97fb53f44158608e56e236f2bb620752d3c04b4e (diff)
downloadmarco-1e7c923638600f865601bda3e2f294cadea7a244.tar.bz2
marco-1e7c923638600f865601bda3e2f294cadea7a244.tar.xz
Remove deprecated glib thread api calls.
Also bump minimum required glib version to 2.32.
Diffstat (limited to 'src')
-rw-r--r--src/core/main.c9
-rw-r--r--src/tools/marco-grayscale.c2
2 files changed, 0 insertions, 11 deletions
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)