From 3e0fbb22c0d4814de4174d32e12a45cbad79980e Mon Sep 17 00:00:00 2001
From: Murray Cumming <murrayc@murrayc.com>
Date: Wed, 26 Oct 2011 22:34:01 +0200
Subject: Avoid use of deprecated API in tests and examples.

* tests/Makefile.am:
* examples/Makefile.am: Disable deprecated API.
* examples/network/socket-client.cc:
* examples/network/socket-server.cc:
* examples/thread/dispatcher.cc:
* examples/thread/dispatcher2.cc:
* examples/thread/thread.cc: Remove calls to Glib::thread_init(), instead
calling Glib::init() where that side-effect was also intended.
---
 examples/thread/dispatcher.cc  | 2 +-
 examples/thread/dispatcher2.cc | 2 +-
 examples/thread/thread.cc      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'examples/thread')

diff --git a/examples/thread/dispatcher.cc b/examples/thread/dispatcher.cc
index d5d7d8b0..01906ab9 100644
--- a/examples/thread/dispatcher.cc
+++ b/examples/thread/dispatcher.cc
@@ -213,7 +213,7 @@ void Application::on_progress_finished(ThreadProgress* thread_progress)
 
 int main(int, char**)
 {
-  Glib::thread_init();
+  Glib::init();
 
   Application application;
   application.run();
diff --git a/examples/thread/dispatcher2.cc b/examples/thread/dispatcher2.cc
index fd7379e3..2f837b31 100644
--- a/examples/thread/dispatcher2.cc
+++ b/examples/thread/dispatcher2.cc
@@ -216,7 +216,7 @@ void Dispatcher::end()
 
 int main(int, char**)
 {
-  Glib::thread_init();
+  Glib::init();
   main_loop = Glib::MainLoop::create();
 
   Dispatcher dispatcher;
diff --git a/examples/thread/thread.cc b/examples/thread/thread.cc
index 1e26430e..06c25f8c 100644
--- a/examples/thread/thread.cc
+++ b/examples/thread/thread.cc
@@ -4,7 +4,7 @@
 #include <glibmm/thread.h>
 #include <glibmm/random.h>
 #include <glibmm/timer.h>
-
+#include <glibmm/init.h>
 
 namespace
 {
@@ -93,7 +93,7 @@ void MessageQueue::consumer()
 
 int main(int, char**)
 {
-  Glib::thread_init();
+  Glib::init();
 
   MessageQueue queue;
 
-- 
cgit v1.2.1