[gdm/wip/modernize: 6/10] Drop calls to g_type_init()/g_thread_init()
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm/wip/modernize: 6/10] Drop calls to g_type_init()/g_thread_init()
- Date: Mon, 3 Dec 2012 19:33:32 +0000 (UTC)
commit 4641a3559bda2d774a1a8f6fa670906cd9a84ca5
Author: Colin Walters <walters verbum org>
Date: Mon Dec 3 13:59:55 2012 -0500
Drop calls to g_type_init()/g_thread_init()
Both are deprecated and no longer necessary.
common/test-settings-client.c | 2 --
common/test-settings-server.c | 2 --
daemon/main.c | 2 --
daemon/session-worker-main.c | 2 --
daemon/simple-slave-main.c | 2 --
daemon/test-session-client.c | 2 --
daemon/xdmcp-chooser-slave-main.c | 2 --
gui/simple-chooser/chooser-main.c | 2 --
gui/simple-chooser/gdm-host-chooser.c | 2 --
.../extensions/smartcard/gdm-smartcard-manager.c | 7 -------
.../extensions/smartcard/gdm-smartcard-worker.c | 2 --
gui/simple-greeter/greeter-main.c | 2 --
gui/simple-greeter/test-filesystem-type.c | 2 --
gui/simple-greeter/test-user-manager.c | 4 ----
tests/m-common.c | 2 --
15 files changed, 0 insertions(+), 37 deletions(-)
---
diff --git a/common/test-settings-client.c b/common/test-settings-client.c
index 59309c9..4a483fe 100644
--- a/common/test-settings-client.c
+++ b/common/test-settings-client.c
@@ -76,8 +76,6 @@ main (int argc, char **argv)
{
GMainLoop *loop;
- g_type_init ();
-
if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
exit (1);
}
diff --git a/common/test-settings-server.c b/common/test-settings-server.c
index ce33415..358af5c 100644
--- a/common/test-settings-server.c
+++ b/common/test-settings-server.c
@@ -77,8 +77,6 @@ main (int argc, char **argv)
GMainLoop *main_loop;
GDBusConnection *connection;
- g_type_init ();
-
connection = get_system_bus ();
if (connection == NULL) {
goto out;
diff --git a/daemon/main.c b/daemon/main.c
index 7a8c8e2..c7aad76 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -343,8 +343,6 @@ main (int argc,
ret = 1;
- g_type_init ();
-
context = g_option_context_new (_("GNOME Display Manager"));
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_set_ignore_unknown_options (context, TRUE);
diff --git a/daemon/session-worker-main.c b/daemon/session-worker-main.c
index fb3d3a7..eff41dc 100644
--- a/daemon/session-worker-main.c
+++ b/daemon/session-worker-main.c
@@ -96,8 +96,6 @@ main (int argc,
textdomain (GETTEXT_PACKAGE);
setlocale (LC_ALL, "");
- g_type_init ();
-
/* Translators: worker is a helper process that does the work
of starting up a session */
context = g_option_context_new (_("GNOME Display Manager Session Worker"));
diff --git a/daemon/simple-slave-main.c b/daemon/simple-slave-main.c
index 7df80fb..740cd80 100644
--- a/daemon/simple-slave-main.c
+++ b/daemon/simple-slave-main.c
@@ -130,8 +130,6 @@ main (int argc,
textdomain (GETTEXT_PACKAGE);
setlocale (LC_ALL, "");
- g_type_init ();
-
context = g_option_context_new (_("GNOME Display Manager Slave"));
g_option_context_add_main_entries (context, entries, NULL);
diff --git a/daemon/test-session-client.c b/daemon/test-session-client.c
index 0327c71..0dba289 100644
--- a/daemon/test-session-client.c
+++ b/daemon/test-session-client.c
@@ -158,8 +158,6 @@ main (int argc,
char *address;
gboolean ok;
- g_type_init ();
-
g_debug ("creating instance of GdmDBusDisplay object...");
error = NULL;
diff --git a/daemon/xdmcp-chooser-slave-main.c b/daemon/xdmcp-chooser-slave-main.c
index 450e37b..9025bb2 100644
--- a/daemon/xdmcp-chooser-slave-main.c
+++ b/daemon/xdmcp-chooser-slave-main.c
@@ -130,8 +130,6 @@ main (int argc,
textdomain (GETTEXT_PACKAGE);
setlocale (LC_ALL, "");
- g_type_init ();
-
context = g_option_context_new (_("GNOME Display Manager Slave"));
g_option_context_add_main_entries (context, entries, NULL);
diff --git a/gui/simple-chooser/chooser-main.c b/gui/simple-chooser/chooser-main.c
index 1260615..ca5b92c 100644
--- a/gui/simple-chooser/chooser-main.c
+++ b/gui/simple-chooser/chooser-main.c
@@ -215,8 +215,6 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
- g_type_init ();
-
gdm_log_init ();
gdm_log_set_debug (TRUE);
diff --git a/gui/simple-chooser/gdm-host-chooser.c b/gui/simple-chooser/gdm-host-chooser.c
index f2e3521..fa15be3 100644
--- a/gui/simple-chooser/gdm-host-chooser.c
+++ b/gui/simple-chooser/gdm-host-chooser.c
@@ -214,8 +214,6 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
- g_type_init ();
-
gdm_log_init ();
gdm_log_set_debug (TRUE);
diff --git a/gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c b/gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c
index 07d1e5c..846610f 100644
--- a/gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c
+++ b/gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c
@@ -358,11 +358,6 @@ gdm_smartcard_manager_init (GdmSmartcardManager *manager)
g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_object_unref);
-
- if (!g_thread_supported()) {
- g_thread_init (NULL);
- }
-
}
static void
@@ -1448,8 +1443,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 = gdm_smartcard_manager_new (NULL);
g_message ("'smartcard manager' object created successfully");
diff --git a/gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c b/gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c
index 578ef37..711c2c7 100644
--- a/gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c
+++ b/gui/simple-greeter/extensions/smartcard/gdm-smartcard-worker.c
@@ -149,8 +149,6 @@ main (int argc,
setlocale (LC_ALL, "");
- g_type_init ();
-
g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, on_debug_message, NULL);
event_loop = g_main_loop_new (NULL, FALSE);
diff --git a/gui/simple-greeter/greeter-main.c b/gui/simple-greeter/greeter-main.c
index 055f031..de2ad65 100644
--- a/gui/simple-greeter/greeter-main.c
+++ b/gui/simple-greeter/greeter-main.c
@@ -223,8 +223,6 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
- g_type_init ();
-
gdm_profile_start ("Initializing settings client");
if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) {
g_critical ("Unable to initialize settings client");
diff --git a/gui/simple-greeter/test-filesystem-type.c b/gui/simple-greeter/test-filesystem-type.c
index 9f44b3d..30b795f 100644
--- a/gui/simple-greeter/test-filesystem-type.c
+++ b/gui/simple-greeter/test-filesystem-type.c
@@ -91,8 +91,6 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
- g_type_init ();
-
/* Option parsing */
ctx = g_option_context_new ("- Test filesystem type");
g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);
diff --git a/gui/simple-greeter/test-user-manager.c b/gui/simple-greeter/test-user-manager.c
index ed84b8c..71d7514 100644
--- a/gui/simple-greeter/test-user-manager.c
+++ b/gui/simple-greeter/test-user-manager.c
@@ -95,10 +95,6 @@ main (int argc, char *argv[])
setlocale (LC_ALL, "");
- g_type_init ();
-
- g_type_init ();
-
context = g_option_context_new ("GNOME Display Manager");
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_set_ignore_unknown_options (context, TRUE);
diff --git a/tests/m-common.c b/tests/m-common.c
index 6d38407..0c03805 100644
--- a/tests/m-common.c
+++ b/tests/m-common.c
@@ -45,8 +45,6 @@ main (int argc, char **argv)
failed = 0;
- g_type_init ();
-
context = g_option_context_new ("");
g_option_context_add_main_entries (context, entries, NULL);
error = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]