OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 | 47 |
48 protected: | 48 protected: |
49 rtc::Thread* thread_; | 49 rtc::Thread* thread_; |
50 GtkMainWnd* wnd_; | 50 GtkMainWnd* wnd_; |
51 Conductor* conductor_; | 51 Conductor* conductor_; |
52 PeerConnectionClient* client_; | 52 PeerConnectionClient* client_; |
53 }; | 53 }; |
54 | 54 |
55 int main(int argc, char* argv[]) { | 55 int main(int argc, char* argv[]) { |
56 gtk_init(&argc, &argv); | 56 gtk_init(&argc, &argv); |
57 // g_type_init API is deprecated (and does nothing) since glib 2.35.0, see: | 57 g_type_init(); |
58 // https://mail.gnome.org/archives/commits-list/2012-November/msg07809.html | |
59 #if !GLIB_CHECK_VERSION(2, 35, 0) | |
60 g_type_init(); | |
61 #endif | |
62 // g_thread_init API is deprecated since glib 2.31.0, see release note: | 58 // g_thread_init API is deprecated since glib 2.31.0, see release note: |
63 // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.ht
ml | 59 // http://mail.gnome.org/archives/gnome-announce-list/2011-October/msg00041.ht
ml |
64 #if !GLIB_CHECK_VERSION(2, 31, 0) | 60 #if !GLIB_CHECK_VERSION(2, 31, 0) |
65 g_thread_init(NULL); | 61 g_thread_init(NULL); |
66 #endif | 62 #endif |
67 | 63 |
68 rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true); | 64 rtc::FlagList::SetFlagsFromCommandLine(&argc, argv, true); |
69 if (FLAG_help) { | 65 if (FLAG_help) { |
70 rtc::FlagList::Print(NULL, false); | 66 rtc::FlagList::Print(NULL, false); |
71 return 0; | 67 return 0; |
(...skipping 30 matching lines...) Expand all Loading... |
102 thread->set_socketserver(NULL); | 98 thread->set_socketserver(NULL); |
103 // TODO(henrike): Run the Gtk main loop to tear down the connection. | 99 // TODO(henrike): Run the Gtk main loop to tear down the connection. |
104 /* | 100 /* |
105 while (gtk_events_pending()) { | 101 while (gtk_events_pending()) { |
106 gtk_main_iteration(); | 102 gtk_main_iteration(); |
107 } | 103 } |
108 */ | 104 */ |
109 rtc::CleanupSSL(); | 105 rtc::CleanupSSL(); |
110 return 0; | 106 return 0; |
111 } | 107 } |
OLD | NEW |