commit 919cddb0abc1a1611643d1ce7fcf6b94580c8d85
author Kristian Høgsberg <krh@bitplanet.net> Mon Jul 08 19:03:57 2013 -0400
committer Kristian Høgsberg <krh@bitplanet.net> Tue Jul 09 02:02:11 2013 -0400
tree 74310158e4ad8245dbefdb94a2c7c4e83360c74b
parent ac3a8b83fd900c8d38f808f1255e4b1d0ee50c5c

Convert to wl_global_create/destroy()

src/text-backend.c

diff --git a/src/text-backend.c b/src/text-backend.c
index b7a1a40..3a1d68c 100644
--- a/src/text-backend.c
+++ b/src/text-backend.c
@@ -398,8 +398,7 @@
 	struct text_input_manager *text_input_manager =
 		container_of(listener, struct text_input_manager, destroy_listener);
 
-	wl_display_remove_global(text_input_manager->ec->wl_display,
-				 text_input_manager->text_input_manager_global);
+	wl_global_destroy(text_input_manager->text_input_manager_global);
 
 	free(text_input_manager);
 }
@@ -414,9 +413,9 @@
 	text_input_manager->ec = ec;
 
 	text_input_manager->text_input_manager_global =
-		wl_display_add_global(ec->wl_display,
-				      &wl_text_input_manager_interface,
-				      text_input_manager, bind_text_input_manager);
+		wl_global_create(ec->wl_display,
+				 &wl_text_input_manager_interface, 1,
+				 text_input_manager, bind_text_input_manager);
 
 	text_input_manager->destroy_listener.notify = text_input_manager_notifier_destroy;
 	wl_signal_add(&ec->destroy_signal, &text_input_manager->destroy_listener);
@@ -792,8 +791,7 @@
 	if (input_method->model)
 		deactivate_text_input(input_method->model, input_method);
 
-	wl_display_remove_global(input_method->seat->compositor->wl_display,
-				 input_method->input_method_global);
+	wl_global_destroy(input_method->input_method_global);
 
 	free(input_method);
 }
@@ -899,9 +897,8 @@
 	input_method->text_backend = text_backend;
 
 	input_method->input_method_global =
-		wl_display_add_global(ec->wl_display,
-				      &wl_input_method_interface,
-				      input_method, bind_input_method);
+		wl_global_create(ec->wl_display, &wl_input_method_interface, 1,
+				 input_method, bind_input_method);
 
 	input_method->destroy_listener.notify = input_method_notifier_destroy;
 	wl_signal_add(&seat->destroy_signal, &input_method->destroy_listener);