From: billh <billh@e2bd861d-eb25-0410-b326-f6ed22b6b98c>
Date: Wed, 12 Dec 2001 18:32:32 +0000 (+0000)
Subject: A little more namespacing, of internal methods.
X-Git-Tag: AT_SPI2_ATK_2_12_0~1464
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c4303d5065bc559f88b1906d6a47ecfcdcbf1356;hp=d2e4455a1f174f2900ea63b59e9488416e47e32a;p=platform%2Fcore%2Fuifw%2Fat-spi2-atk.git

A little more namespacing, of internal methods.


git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@185 e2bd861d-eb25-0410-b326-f6ed22b6b98c
---

diff --git a/ChangeLog b/ChangeLog
index 97bc9da..915453f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 	* cspi/spi.h:
 	* cspi/spi_registry.c:
 	* cspi/spi_event.c:
+	* cspi/cspi-bonobo-listener.c:
 	Namespaced all methods that did not begin with an "SPI_" or
 	"Accessible" prefix to "SPI_".  
 
diff --git a/TODO b/TODO
index 3cec7a8..99e631a 100644
--- a/TODO
+++ b/TODO
@@ -7,11 +7,9 @@ idl:
 cspi: 
 	+ ensure spi-listener-impl's list notification methods don't
 	  have a re-enterancy hazard. [Michael]
-	+ namespace all methods missing a prepending Accessible
-	  or SPI_ prefix. [Bill]
 	+ Put LGPL headers everywhere.
 	+ Fix the conversion of Accessibility_Role CORBA enum to
-	AccessibleRole enums. [Bill]
+	  AccessibleRole enums. [Bill]
 
 registry:
 	+ move code into here from libspi [Michael]
diff --git a/cspi/bonobo/cspi-bonobo-listener.c b/cspi/bonobo/cspi-bonobo-listener.c
index 554c78f..bc40100 100644
--- a/cspi/bonobo/cspi-bonobo-listener.c
+++ b/cspi/bonobo/cspi-bonobo-listener.c
@@ -21,7 +21,7 @@ GObjectClass *keystroke_parent_class;
  */
 
 static EventHandler *
-event_handler_new (gpointer method, gpointer user_data)
+cspi_event_handler_new (gpointer method, gpointer user_data)
 {
   EventHandler *eh = g_new0 (EventHandler, 1);
 
@@ -32,13 +32,13 @@ event_handler_new (gpointer method, gpointer user_data)
 }
 
 static void
-event_handler_free (EventHandler *handler)
+cspi_event_handler_free (EventHandler *handler)
 {
   g_free (handler);
 }
 
 static GList *
-event_list_remove_by_cb (GList *list, gpointer callback)
+cspi_event_list_remove_by_cb (GList *list, gpointer callback)
 {
   GList *l, *next;
 	
@@ -49,7 +49,7 @@ event_list_remove_by_cb (GList *list, gpointer callback)
       
       list = g_list_delete_link (list, l);
       
-      event_handler_free (eh);
+      cspi_event_handler_free (eh);
     }
 
   return list;
@@ -102,7 +102,7 @@ cspi_event_listener_finalize (GObject *object)
   
   for (l = listener->callbacks; l; l = l->next)
     {
-      event_handler_free (l->data);
+      cspi_event_handler_free (l->data);
     }
   
   g_list_free (listener->callbacks);
@@ -141,7 +141,7 @@ cspi_event_listener_add_cb (AccessibleEventListener  *al,
   g_return_if_fail (CSPI_IS_EVENT_LISTENER (listener));
 
   listener->callbacks = g_list_prepend (listener->callbacks,
-					event_handler_new (callback, user_data));
+					cspi_event_handler_new (callback, user_data));
 }
 
 void
@@ -152,7 +152,7 @@ cspi_event_listener_remove_cb (AccessibleEventListener  *al,
 
   g_return_if_fail (CSPI_IS_EVENT_LISTENER (listener));
 
-  listener->callbacks = event_list_remove_by_cb (listener->callbacks, callback);
+  listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, callback);
 }
 
 /*
@@ -225,7 +225,7 @@ cspi_keystroke_listener_finalize (GObject *object)
   
   for (l = listener->callbacks; l; l = l->next)
     {
-      event_handler_free (l->data);
+      cspi_event_handler_free (l->data);
     }
   
   g_list_free (listener->callbacks);
@@ -268,7 +268,7 @@ cspi_keystroke_listener_add_cb (AccessibleKeystrokeListener  *al,
   g_return_if_fail (CSPI_IS_KEYSTROKE_LISTENER (listener));
 
   listener->callbacks = g_list_prepend (listener->callbacks,
-					event_handler_new (callback, user_data));
+					cspi_event_handler_new (callback, user_data));
 }
 
 void
@@ -279,7 +279,7 @@ cspi_keystroke_listener_remove_cb (AccessibleKeystrokeListener  *al,
 
   g_return_if_fail (CSPI_IS_KEYSTROKE_LISTENER (listener));
 
-  listener->callbacks = event_list_remove_by_cb (listener->callbacks, callback);
+  listener->callbacks = cspi_event_list_remove_by_cb (listener->callbacks, callback);
 }
 
 void