Merge branch 'master' into mgorse

[platform/upstream/at-spi2-core.git] / registryd / registry.c

diff --git a/registryd/registry.c b/registryd/registry.c
index 79251a5..f720920 100644 (file)
--- a/registryd/registry.c
+++ b/registryd/registry.c
@@ -64,7 +64,7 @@ static void emit_update_applications(SpiRegistry *reg, guint sigtype, const char
 
   if ((msg = dbus_message_new_signal (SPI_DBUS_PATH_REGISTRY,
                                       SPI_DBUS_INTERFACE_REGISTRY,
-                                      "updateApplications"))) {
+                                      "UpdateApplications"))) {
     dbus_message_append_args(msg, DBUS_TYPE_INT32, &sigtype,
                                   DBUS_TYPE_STRING, &app, DBUS_TYPE_INVALID);
 
@@ -165,7 +165,7 @@ add_bus_name_cb (gpointer item, gpointer data)
 }
 
 static DBusMessage *
-impl_getApplications (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_GetApplications (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   DBusMessage *reply = NULL;
   DBusMessageIter iter, iter_array;
@@ -183,7 +183,7 @@ impl_getApplications (DBusConnection *bus, DBusMessage *message, void *user_data
 /*---------------------------------------------------------------------------*/
 
 static DBusMessage*
-impl_registerApplication (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_RegisterApplication (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   gchar *app_name;
   SpiRegistry *reg = SPI_REGISTRY (user_data);
@@ -194,7 +194,7 @@ impl_registerApplication (DBusConnection *bus, DBusMessage *message, void *user_
 }
 
 static DBusMessage*
-impl_deregisterApplication (DBusConnection *bus, DBusMessage *message, void *user_data)
+impl_DeregisterApplication (DBusConnection *bus, DBusMessage *message, void *user_data)
 {
   gchar *app_name;
   SpiRegistry *reg = SPI_REGISTRY (user_data);
@@ -268,12 +268,12 @@ handle_registry_method (DBusConnection *bus, DBusMessage *message, void *user_da
   if (strcmp (iface, SPI_DBUS_INTERFACE_REGISTRY))
       return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
 
-  if      (!strcmp (member, "getApplications"))
-      reply = impl_getApplications (bus, message, user_data);
-  else if (!strcmp (member, "registerApplication"))
-      reply = impl_registerApplication (bus, message, user_data);
-  else if (!strcmp (member, "deregisterApplication"))
-      reply = impl_deregisterApplication (bus, message, user_data);
+  if      (!strcmp (member, "GetApplications"))
+      reply = impl_GetApplications (bus, message, user_data);
+  else if (!strcmp (member, "RegisterApplication"))
+      reply = impl_RegisterApplication (bus, message, user_data);
+  else if (!strcmp (member, "DeregisterApplication"))
+      reply = impl_DeregisterApplication (bus, message, user_data);
   else
       return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;