[ekiga] Put back g_type_init and g_thread_init with #if magic to keep our version needs as low as possible
- From: Julien Puydt <jpuydt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ekiga] Put back g_type_init and g_thread_init with #if magic to keep our version needs as low as possible
- Date: Wed, 19 Jun 2013 18:00:05 +0000 (UTC)
commit 08616e980e05808e2020fc56aafc6a4f3aba8f10
Author: Julien Puydt <jpuydt free fr>
Date: Wed Jun 19 10:58:15 2013 +0200
Put back g_type_init and g_thread_init with #if magic to keep our version needs as low as possible
src/dbus-helper/dbus-helper.cpp | 4 ++++
src/gui/main.cpp | 7 +++++++
2 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/src/dbus-helper/dbus-helper.cpp b/src/dbus-helper/dbus-helper.cpp
index ac8d46e..3d54551 100644
--- a/src/dbus-helper/dbus-helper.cpp
+++ b/src/dbus-helper/dbus-helper.cpp
@@ -167,6 +167,10 @@ main (G_GNUC_UNUSED int argc,
guint request_name_result;
GError *error = NULL;
+#if !GLIB_CHECK_VERSION(2,36,0)
+ g_type_init ();
+#endif
+
mainloop = g_main_loop_new (NULL, FALSE);
bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index 516248f..e52b4b0 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -92,6 +92,13 @@ main (int argc,
exit (1);
#endif
+#if !GLIB_CHECK_VERSION(2,36,0)
+ g_type_init ();
+#endif
+#if !GLIB_CHECK_VERSION(2,32,0)
+ g_thread_init();
+#endif
+
/* GTK+ initialization */
gtk_init (&argc, &argv);
#ifndef WIN32
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]