Merge "binding: bluetooth: fix typo of propertyies"

7 files changed, 27 insertions, 27 deletions

diff --git a/binding-bluetooth/bluetooth-api.c b/binding-bluetooth/bluetooth-api.c
index 705e040..520d9e2 100644
--- a/binding-bluetooth/bluetooth-api.c
+++ b/binding-bluetooth/bluetooth-api.c
@@ -766,7 +766,7 @@ const struct afb_binding *afbBindingV1Register (const struct afb_binding_interfa
     Binding_RegisterCallback_t API_Callback;
     API_Callback.binding_device_added = bt_broadcast_device_added;
     API_Callback.binding_device_removed = bt_broadcast_device_removed;
-    API_Callback.binding_device_propertyies_changed = bt_broadcast_device_properties_change;
+    API_Callback.binding_device_properties_changed = bt_broadcast_device_properties_change;
     API_Callback.binding_request_confirmation = bt_request_confirmation;
     BindingAPIRegister(&API_Callback);
 
diff --git a/binding-bluetooth/bluetooth-manager.c b/binding-bluetooth/bluetooth-manager.c
index 91dfa1c..b870e6f 100644
--- a/binding-bluetooth/bluetooth-manager.c
+++ b/binding-bluetooth/bluetooth-manager.c
@@ -558,8 +558,8 @@ bluez_device_properties_changed_cb (const gchar *pObjecPath,
 
     }
 
-    if (g_RegisterCallback.binding_device_propertyies_changed)
-        g_RegisterCallback.binding_device_propertyies_changed(device);
+    if (g_RegisterCallback.binding_device_properties_changed)
+        g_RegisterCallback.binding_device_properties_changed(device);
 
     devices_list_unlock();
 
@@ -586,10 +586,10 @@ void ofono_modem_added_cb(struct ofono_modem *modem)
 
         device->hfpconnected = modem->powered;
 
-        if ((NULL != g_RegisterCallback.binding_device_propertyies_changed)
+        if ((NULL != g_RegisterCallback.binding_device_properties_changed)
             && (old_value != device->hfpconnected))
         {
-            g_RegisterCallback.binding_device_propertyies_changed(device);
+            g_RegisterCallback.binding_device_properties_changed(device);
         }
     }
     devices_list_unlock();
@@ -615,10 +615,10 @@ void ofono_modem_removed_cb(struct ofono_modem *modem)
 
         device->hfpconnected = FALSE;
 
-        if ((NULL != g_RegisterCallback.binding_device_propertyies_changed)
+        if ((NULL != g_RegisterCallback.binding_device_properties_changed)
             && (old_value != device->hfpconnected))
         {
-            g_RegisterCallback.binding_device_propertyies_changed(device);
+            g_RegisterCallback.binding_device_properties_changed(device);
         }
     }
     devices_list_unlock();
@@ -643,10 +643,10 @@ void ofono_modem_properties_change_cb(struct ofono_modem *modem)
 
         device->hfpconnected = modem->powered;
 
-        if ((NULL != g_RegisterCallback.binding_device_propertyies_changed)
+        if ((NULL != g_RegisterCallback.binding_device_properties_changed)
             && (old_value != device->hfpconnected))
         {
-            g_RegisterCallback.binding_device_propertyies_changed(device);
+            g_RegisterCallback.binding_device_properties_changed(device);
         }
     }
     devices_list_unlock();
@@ -720,13 +720,13 @@ static int bt_manager_app_init(void)
     Bluez_RegisterCallback_t Bluez_API_Callback;
     Bluez_API_Callback.device_added = bluez_device_added_cb;
     Bluez_API_Callback.device_removed = bluez_device_removed_cb;
-    Bluez_API_Callback.device_propertyies_changed = bluez_device_properties_changed_cb;
+    Bluez_API_Callback.device_properties_changed = bluez_device_properties_changed_cb;
     BluezDeviceAPIRegister(&Bluez_API_Callback);
 
     Ofono_RegisterCallback_t Ofono_API_Callback;
     Ofono_API_Callback.modem_added = ofono_modem_added_cb;
     Ofono_API_Callback.modem_removed = ofono_modem_removed_cb;
-    Ofono_API_Callback.modem_propertyies_changed = ofono_modem_properties_change_cb;
+    Ofono_API_Callback.modem_properties_changed = ofono_modem_properties_change_cb;
     OfonoModemAPIRegister(&Ofono_API_Callback);
 
 
@@ -1505,10 +1505,10 @@ void BindingAPIRegister(const Binding_RegisterCallback_t* pstRegisterCallback)
                 pstRegisterCallback->binding_device_removed;
         }
 
-        if (NULL != pstRegisterCallback->binding_device_propertyies_changed)
+        if (NULL != pstRegisterCallback->binding_device_properties_changed)
         {
-            g_RegisterCallback.binding_device_propertyies_changed =
-                pstRegisterCallback->binding_device_propertyies_changed;
+            g_RegisterCallback.binding_device_properties_changed =
+                pstRegisterCallback->binding_device_properties_changed;
         }
 
         if (NULL != pstRegisterCallback->binding_request_confirmation)
diff --git a/binding-bluetooth/bluetooth-manager.h b/binding-bluetooth/bluetooth-manager.h
index 2876552..896d213 100644
--- a/binding-bluetooth/bluetooth-manager.h
+++ b/binding-bluetooth/bluetooth-manager.h
@@ -150,7 +150,7 @@ typedef struct tagBinding_RegisterCallback
 {
     void (*binding_device_added)(struct btd_device *BDdevice);
     void (*binding_device_removed)(struct btd_device *BDdevice);
-    void (*binding_device_propertyies_changed)(struct btd_device *BDdevice);
+    void (*binding_device_properties_changed)(struct btd_device *BDdevice);
     gboolean (*binding_request_confirmation)(const gchar *device, guint passkey);
 }Binding_RegisterCallback_t;
 
diff --git a/binding-bluetooth/bluez-client.c b/binding-bluetooth/bluez-client.c
index ddaedbb..3b97fef 100644
--- a/binding-bluetooth/bluez-client.c
+++ b/binding-bluetooth/bluez-client.c
@@ -657,8 +657,8 @@ on_interface_proxy_properties_changed (GDBusObjectManagerClient *manager,
     if( (0 == g_strcmp0(pInterface, DEVICE_INTERFACE)) ||
         (0 == g_strcmp0(pInterface, MEDIA_CONTROL1_INTERFACE))) {
 
-        if (bluez_RegisterCallback.device_propertyies_changed)
-            bluez_RegisterCallback.device_propertyies_changed(pObjecPath,
+        if (bluez_RegisterCallback.device_properties_changed)
+            bluez_RegisterCallback.device_properties_changed(pObjecPath,
                                             pInterface, changed_properties);
 
     }
@@ -944,10 +944,10 @@ void BluezDeviceAPIRegister(const Bluez_RegisterCallback_t* pstRegisterCallback)
                 pstRegisterCallback->device_removed;
         }
 
-        if (NULL != pstRegisterCallback->device_propertyies_changed)
+        if (NULL != pstRegisterCallback->device_properties_changed)
         {
-            bluez_RegisterCallback.device_propertyies_changed =
-                pstRegisterCallback->device_propertyies_changed;
+            bluez_RegisterCallback.device_properties_changed =
+                pstRegisterCallback->device_properties_changed;
         }
     }
 }
diff --git a/binding-bluetooth/bluez-client.h b/binding-bluetooth/bluez-client.h
index 2ff50e6..64ee9ad 100644
--- a/binding-bluetooth/bluez-client.h
+++ b/binding-bluetooth/bluez-client.h
@@ -57,7 +57,7 @@ typedef struct tagBluez_RegisterCallback
 {
     void (*device_added)(struct bt_device *device);
     void (*device_removed)(const gchar *path);
-    void (*device_propertyies_changed)(const gchar *pObjecPath, const gchar *pInterface, GVariant *value);
+    void (*device_properties_changed)(const gchar *pObjecPath, const gchar *pInterface, GVariant *value);
 }Bluez_RegisterCallback_t;
 
 /* --- PUBLIC FUNCTIONS --- */
diff --git a/binding-bluetooth/ofono-client.c b/binding-bluetooth/ofono-client.c
index 26b28c7..4b17dab 100644
--- a/binding-bluetooth/ofono-client.c
+++ b/binding-bluetooth/ofono-client.c
@@ -202,9 +202,9 @@ static void on_modem_property_changed (OFONOMODEMOrgOfonoModem* object,
         //old_value = modem->powered;
         modem->powered = new_value;
 
-        if (NULL != ofono_RegisterCallback.modem_propertyies_changed)
+        if (NULL != ofono_RegisterCallback.modem_properties_changed)
         {
-            ofono_RegisterCallback.modem_propertyies_changed(modem);
+            ofono_RegisterCallback.modem_properties_changed(modem);
         }
     }
 
@@ -660,10 +660,10 @@ void OfonoModemAPIRegister(const Ofono_RegisterCallback_t* pstRegisterCallback)
                 pstRegisterCallback->modem_removed;
         }
 
-        if (NULL != pstRegisterCallback->modem_propertyies_changed)
+        if (NULL != pstRegisterCallback->modem_properties_changed)
         {
-            ofono_RegisterCallback.modem_propertyies_changed =
-                pstRegisterCallback->modem_propertyies_changed;
+            ofono_RegisterCallback.modem_properties_changed =
+                pstRegisterCallback->modem_properties_changed;
         }
 
     }
diff --git a/binding-bluetooth/ofono-client.h b/binding-bluetooth/ofono-client.h
index 8c6b0a2..38ab24f 100644
--- a/binding-bluetooth/ofono-client.h
+++ b/binding-bluetooth/ofono-client.h
@@ -55,7 +55,7 @@ typedef struct tagOfono_RegisterCallback
 {
     void (*modem_added)(struct ofono_modem *modem);
     void (*modem_removed)(struct ofono_modem *modem);
-    void (*modem_propertyies_changed)(struct ofono_modem *modem);
+    void (*modem_properties_changed)(struct ofono_modem *modem);
 }Ofono_RegisterCallback_t;
 
 /* --- PUBLIC FUNCTIONS --- */