[Xfce4-commits] <xfce4-appfinder:master> Use new glib 2.32 api.
Nick Schermer
noreply at xfce.org
Tue Jan 1 20:12:01 CET 2013
Updating branch refs/heads/master
to 7fc2e009ceddc4c0b29e993a437d1a728654070e (commit)
from e6380a6dfbd755f40b4c5d28efb7a6281e1026ab (commit)
commit 7fc2e009ceddc4c0b29e993a437d1a728654070e
Author: Nick Schermer <nick at xfce.org>
Date: Tue Jan 1 18:25:44 2013 +0100
Use new glib 2.32 api.
src/appfinder-model.c | 4 ++++
src/main.c | 2 ++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/appfinder-model.c b/src/appfinder-model.c
index 79a4966..50de137 100644
--- a/src/appfinder-model.c
+++ b/src/appfinder-model.c
@@ -220,7 +220,11 @@ xfce_appfinder_model_init (XfceAppfinderModel *model)
model->menu = garcon_menu_new_applications ();
appfinder_refcount_debug_add (G_OBJECT (model->menu), "main menu");
+#if GLIB_CHECK_VERSION (2, 32, 0)
+ model->collect_thread = g_thread_new ("Collector", xfce_appfinder_model_collect_thread, model);
+#else
model->collect_thread = g_thread_create (xfce_appfinder_model_collect_thread, model, TRUE, NULL);
+#endif
}
diff --git a/src/main.c b/src/main.c
index 3c2cdb8..58368e7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -510,8 +510,10 @@ main (gint argc, gchar **argv)
g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
#endif
+#if !GLIB_CHECK_VERSION (2, 32, 0)
if (!g_thread_supported ())
g_thread_init (NULL);
+#endif
/* get the startup notification id */
startup_id = g_getenv ("DESKTOP_STARTUP_ID");
More information about the Xfce4-commits
mailing list