summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-05-18 00:55:29 +0200
committerinfirit <[email protected]>2014-05-18 00:55:29 +0200
commit990a430ad13be7deb5a81457070a000b770b0ff3 (patch)
tree6175a97ca7bc76415300b309f2df2113b06762bd
parent1ed94d5aed85afbfad570cc76bc9ca26cdaba39f (diff)
downloadmate-settings-daemon-990a430ad13be7deb5a81457070a000b770b0ff3.tar.bz2
mate-settings-daemon-990a430ad13be7deb5a81457070a000b770b0ff3.tar.xz
Remove deprecated g_thread_init and g_type_init functions
-rw-r--r--mate-settings-daemon/main.c6
-rw-r--r--plugins/datetime/msd-datetime-mechanism-main.c4
-rw-r--r--plugins/smartcard/msd-smartcard-manager.c7
-rw-r--r--plugins/xsettings/fontconfig-monitor.c2
4 files changed, 0 insertions, 19 deletions
diff --git a/mate-settings-daemon/main.c b/mate-settings-daemon/main.c
index 364ff75..f2a0bb8 100644
--- a/mate-settings-daemon/main.c
+++ b/mate-settings-daemon/main.c
@@ -453,10 +453,6 @@ main (int argc, char *argv[])
manager = NULL;
- if (!g_thread_supported ()) {
- g_thread_init (NULL);
- }
-
mate_settings_profile_start (NULL);
bindtextdomain (GETTEXT_PACKAGE, MATE_SETTINGS_LOCALEDIR);
@@ -466,8 +462,6 @@ main (int argc, char *argv[])
parse_args (&argc, &argv);
- g_type_init ();
-
mate_settings_profile_start ("opening gtk display");
if (! gtk_init_check (NULL, NULL)) {
g_warning ("Unable to initialize GTK+");
diff --git a/plugins/datetime/msd-datetime-mechanism-main.c b/plugins/datetime/msd-datetime-mechanism-main.c
index df84550..473c968 100644
--- a/plugins/datetime/msd-datetime-mechanism-main.c
+++ b/plugins/datetime/msd-datetime-mechanism-main.c
@@ -130,11 +130,7 @@ main (int argc, char **argv)
ret = 1;
- if (! g_thread_supported ()) {
- g_thread_init (NULL);
- }
dbus_g_thread_init ();
- g_type_init ();
connection = get_system_bus ();
if (connection == NULL) {
diff --git a/plugins/smartcard/msd-smartcard-manager.c b/plugins/smartcard/msd-smartcard-manager.c
index 503123a..d22bbe3 100644
--- a/plugins/smartcard/msd-smartcard-manager.c
+++ b/plugins/smartcard/msd-smartcard-manager.c
@@ -340,11 +340,6 @@ msd_smartcard_manager_init (MsdSmartcardManager *manager)
g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_object_unref);
-
- if (!g_thread_supported ()) {
- g_thread_init (NULL);
- }
-
}
static void
@@ -1335,8 +1330,6 @@ main (int argc,
g_log_set_always_fatal (G_LOG_LEVEL_ERROR
| G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
- g_type_init ();
-
g_message ("creating instance of 'smartcard manager' object...");
manager = msd_smartcard_manager_new (NULL);
g_message ("'smartcard manager' object created successfully");
diff --git a/plugins/xsettings/fontconfig-monitor.c b/plugins/xsettings/fontconfig-monitor.c
index febb746..ed4a5a9 100644
--- a/plugins/xsettings/fontconfig-monitor.c
+++ b/plugins/xsettings/fontconfig-monitor.c
@@ -180,8 +180,6 @@ main (void)
{
GMainLoop *loop;
- g_type_init ();
-
fontconfig_monitor_start ((GFunc) yay, NULL);
loop = g_main_loop_new (NULL, TRUE);