Merge lp:~azzar1/unity/glib-deprecated into lp:unity

[Andrea Azzarone]

Remove deprecated glib function.

Remove deprecated function.

[Stephen M. Webb (bregma)]

Problem reproduced. Problem fixed.

review: Approve

[Łukasz Zemczak (sil2100)]

+1

review: Approve

=== modified file 'hud/StandaloneHud.cpp'
--- hud/StandaloneHud.cpp	2012-11-08 09:12:24 +0000
+++ hud/StandaloneHud.cpp	2013-01-17 16:13:29 +0000
@@ -132,8 +132,6 @@
   // no real tests right now, just make sure we don't get any criticals and such
   // waiting on nice perceptual diff support before we can build real tests
   // for views
-
-  g_type_init ();
   gtk_init (&argc, &argv);
 
   nux::NuxInitialize(0);
 
=== modified file 'launcher/StandaloneLauncher.cpp'
--- launcher/StandaloneLauncher.cpp	2012-11-22 16:35:20 +0000
+++ launcher/StandaloneLauncher.cpp	2013-01-17 16:13:29 +0000
@@ -41,7 +41,6 @@
 
 int main(int argc, char** argv)
 {
-  g_type_init();
   gtk_init(&argc, &argv);
   nux::NuxInitialize(0);
 
 
=== modified file 'launcher/StandaloneSwitcher.cpp'
--- launcher/StandaloneSwitcher.cpp	2012-12-19 09:45:55 +0000
+++ launcher/StandaloneSwitcher.cpp	2013-01-17 16:13:29 +0000
@@ -299,7 +299,6 @@
 
 int main(int argc, char** argv)
 {
-  g_type_init();
   gtk_init(&argc, &argv);
   nux::NuxInitialize(0);
 
 
=== modified file 'tests/test_main_dbus.cpp'
--- tests/test_main_dbus.cpp	2012-03-14 06:24:18 +0000
+++ tests/test_main_dbus.cpp	2013-01-17 16:13:29 +0000
@@ -9,7 +9,9 @@
 int main(int argc, char** argv)
 {
   ::testing::InitGoogleTest(&argc, argv);
+#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
   g_type_init();
+#endif
   
   nux::NuxInitialize (0);
 
 
=== modified file 'tests/test_main_xless.cpp'
--- tests/test_main_xless.cpp	2012-09-10 21:34:10 +0000
+++ tests/test_main_xless.cpp	2013-01-17 16:13:29 +0000
@@ -6,7 +6,9 @@
 int main(int argc, char** argv)
 {
   ::testing::InitGoogleTest(&argc, argv);
+#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
   g_type_init();
+#endif
   setlocale(LC_ALL, "C");
 
   // Slightly higher as we're more likely to test things we know will fail
 
=== modified file 'tests/test_service_main.c'
--- tests/test_service_main.c	2012-11-06 18:19:09 +0000
+++ tests/test_service_main.c	2013-01-17 16:13:29 +0000
@@ -43,8 +43,9 @@
 gint
 main(gint argc, gchar** argv)
 {
+#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
   g_type_init();
-
+#endif
   loop_ = g_main_loop_new(NULL, FALSE);
 
   lens_ = service_lens_new();
 
=== modified file 'tests/unit/TestMain.cpp'
--- tests/unit/TestMain.cpp	2012-11-06 18:19:09 +0000
+++ tests/unit/TestMain.cpp	2013-01-17 16:13:29 +0000
@@ -60,8 +60,6 @@
 main(int argc, char** argv)
 {
   g_setenv("GSETTINGS_SCHEMA_DIR", BUILDDIR"/settings/", TRUE);
-
-  g_type_init();
   
   gtk_init(&argc, &argv);
 
 
=== modified file 'unity-shared/IconLoader.cpp'
--- unity-shared/IconLoader.cpp	2012-11-06 18:19:09 +0000
+++ unity-shared/IconLoader.cpp	2013-01-17 16:13:29 +0000
@@ -634,11 +634,27 @@
 
     void PushSchedulerJob()
     {
-      ::g_io_scheduler_push_job (LoaderJobFunc, this, nullptr, G_PRIORITY_HIGH_IDLE, nullptr);
+#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
+      g_io_scheduler_push_job (LoaderJobFunc, this, nullptr, G_PRIORITY_HIGH_IDLE, nullptr);
+#else
+      glib::Object<GTask> task(g_task_new(nullptr, nullptr, [] (GObject*, GAsyncResult*, gpointer data) {
+        auto self = static_cast<IconLoaderTask*>(data);
+        self->LoadIconComplete(data);
+      }, this));
+
+      g_task_set_priority(task, G_PRIORITY_HIGH_IDLE);
+      g_task_set_task_data(task, this, nullptr);
+
+      g_task_run_in_thread(task, LoaderJobFunc);
+#endif
     }
 
     // Loading/rendering of pixbufs is done in a separate thread
+#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
     static gboolean LoaderJobFunc(GIOSchedulerJob* job, GCancellable *canc, gpointer data)
+#else
+    static void LoaderJobFunc(GTask* job, gpointer source_object, gpointer data, GCancellable* canc)
+#endif
     {
       auto task = static_cast<IconLoaderTask*>(data);
 
@@ -669,9 +685,10 @@
         }
       }
 
+#if G_ENCODE_VERSION (GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION) <= GLIB_VERSION_2_34
       g_io_scheduler_job_send_to_mainloop_async (job, LoadIconComplete, task, nullptr);
-
       return FALSE;
+#endif
     }
 
     // this will be invoked back in the thread from which push_job was called
 
=== modified file 'unity-shared/StandaloneAppManager.cpp'
--- unity-shared/StandaloneAppManager.cpp	2012-11-27 01:19:45 +0000
+++ unity-shared/StandaloneAppManager.cpp	2013-01-17 16:13:29 +0000
@@ -178,7 +178,6 @@
 
 int main(int argc, char* argv[])
 {
-  g_type_init();
   gtk_init(&argc, &argv);
   nux::logging::configure_logging(::getenv("UNITY_APP_LOG_SEVERITY"));
   g_log_set_default_handler(capture_g_log_calls, NULL);