Merge lp:~mc-return/nux/nux.merge-fix-deprecated-warnings into lp:nux

[MC Return]

Fixed [-Wdeprecated-declarations] warnings in MainLoopGLib.cpp by replacing 'g_source_get_current_time(source, &time_val);' with 'g_get_current_time(&time_val);' and 'g_thread_init (NULL);' with 'g_type_init();'.

Fixes [-Wdeprecated-declarations] warnings in MainLoopGLib.cpp by replacing 'g_source_get_current_time(source, &time_val);' with 'g_get_current_time(&time_val);' and 'g_thread_init (NULL);' with 'g_type_init();'.

[lp:~mc-return/nux/nux.merge-fix-deprecated-warnings]

655. By MC Return on 2012-09-02

Fixed indentation

[Martin Pitt (pitti)]

Looks good to me. However, g_type_init() does not have the same semantics as g_thread_init(NULL), you *always* have to call it exactly once. So I suggest to drop the "static bool gthread_initialized" bit as well. Does your configure.ac ensure you require at least glib 2.24 for this?

[MC Return (mc-return)]

> Looks good to me. However, g_type_init() does not have the same semantics as
> g_thread_init(NULL), you *always* have to call it exactly once. So I suggest
> to drop the "static bool gthread_initialized" bit as well.

Done in r656.

> Does your
> configure.ac ensure you require at least glib 2.24 for this?

Yep. configure.ac says:

glib-2.0 >= 2.25.14

[lp:~mc-return/nux/nux.merge-fix-deprecated-warnings]

656. By MC Return on 2012-09-04

Removed the static bool gthread_initialized

Unmerged revisions

656. By MC Return on 2012-09-04

Removed the static bool gthread_initialized

655. By MC Return on 2012-09-02

Fixed indentation

654. By MC Return on 2012-09-02

Hopefully fixed deprecated g_source_get_current_time correctly this time

653. By MC Return on 2012-09-02

Hopefully fixed g_source_get_time

652. By MC Return on 2012-09-02

Fixed [-Wdeprecated-declarations] warnings in MainLoopGLib.cpp and replaced 'void g_source_get_current_time(GSource*, GTimeVal*)' with 'void g_source_get_time(GSource*, GTimeVal*)' and 'g_thread_init (NULL);' with 'g_type_init();'

=== modified file 'Nux/MainLoopGLib.cpp'
--- Nux/MainLoopGLib.cpp	2012-05-31 21:40:37 +0000
+++ Nux/MainLoopGLib.cpp	2012-09-04 09:41:26 +0000
@@ -171,7 +171,7 @@
     GTimeVal time_val;
     bool has_timelines_left = false;
     nux_glib_threads_lock();
-    g_source_get_current_time(source, &time_val);
+    g_get_current_time(&time_val);
     WindowThread *window_thread = NUX_STATIC_CAST(WindowThread *, user_data);
 
     // pump the timelines
@@ -202,12 +202,7 @@
 
     if (!IsEmbeddedWindow())
     {
-      static bool gthread_initialized = false;
-
-      if (!gthread_initialized)
-        g_thread_init(NULL);
-
-      gthread_initialized = true;
+      g_type_init();
 
       if (((main_loop_glib_context_ == 0) || (main_loop_glib_ == 0)) && (main_context_created == false))
       {