From: Daniel Wagner <[email protected]>
Adapt to ConnMan release v0.64 changes.
---
Any ideas to whom I can send this?
callouts/3g/ggg-service.c | 8 ++++----
callouts/3g/main.c | 4 ++--
carrick/carrick-list.c | 6 +++---
carrick/carrick-network-model.c | 6 +++---
carrick/carrick-network-model.h | 2 +-
carrick/carrick-pane.c | 28 ++++++++++++++--------------
carrick/carrick-service-item.c | 14 +++++++-------
carrick/connman-manager.xml | 2 +-
carrick/connman-service.xml | 2 +-
9 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/callouts/3g/ggg-service.c b/callouts/3g/ggg-service.c
index b53cc78..656b58e 100644
--- a/callouts/3g/ggg-service.c
+++ b/callouts/3g/ggg-service.c
@@ -26,7 +26,7 @@
#include "carrick/connman-service-bindings.h"
#include "ggg-service.h"
-#define CONNMAN_SERVICE "org.moblin.connman"
+#define CONNMAN_SERVICE "net.connman"
#define CONNMAN_MANAGER_PATH "/"
#define CONNMAN_MANAGER_INTERFACE CONNMAN_SERVICE ".Manager"
#define CONNMAN_SERVICE_INTERFACE CONNMAN_SERVICE ".Service"
@@ -104,7 +104,7 @@ ggg_service_new (DBusGConnection *connection, const char
*path)
path,
CONNMAN_SERVICE_INTERFACE);
- if (!org_moblin_connman_Service_get_properties (proxy, &props, &error)) {
+ if (!net_connman_Service_get_properties (proxy, &props, &error)) {
g_printerr ("Cannot get properties for service: %s\n", error->message);
g_error_free (error);
g_object_unref (proxy);
@@ -189,7 +189,7 @@ set_string_prop (DBusGProxy *proxy, const char *name, const
char *string)
g_value_init (&value, G_TYPE_STRING);
g_value_set_static_string (&value, string);
- if (!org_moblin_connman_Service_set_property
+ if (!net_connman_Service_set_property
(proxy, name, &value, &error)) {
g_printerr ("Cannot set property %s to %s: %s\n",
name, string, error->message);
@@ -221,7 +221,7 @@ ggg_service_connect (GggService *service)
GError *error = NULL;
if (service->priv->proxy) {
- if (!org_moblin_connman_Service_connect (service->priv->proxy, &error)) {
+ if (!net_connman_Service_connect (service->priv->proxy, &error)) {
g_printerr ("Cannot connect: %s\n", error->message);
g_error_free (error);
}
diff --git a/callouts/3g/main.c b/callouts/3g/main.c
index 675475e..9fd790e 100644
--- a/callouts/3g/main.c
+++ b/callouts/3g/main.c
@@ -36,7 +36,7 @@
#include "carrick/connman-manager-bindings.h"
-#define CONNMAN_SERVICE "org.moblin.connman"
+#define CONNMAN_SERVICE "net.connman"
#define CONNMAN_MANAGER_PATH "/"
#define CONNMAN_MANAGER_INTERFACE CONNMAN_SERVICE ".Manager"
#define CONNMAN_SERVICE_INTERFACE CONNMAN_SERVICE ".Service"
@@ -257,7 +257,7 @@ find_services (void)
CONNMAN_SERVICE, "/",
CONNMAN_MANAGER_INTERFACE);
- if (!org_moblin_connman_Manager_get_properties (proxy, &props, &error)) {
+ if (!net_connman_Manager_get_properties (proxy, &props, &error)) {
g_printerr ("Cannot get properties for manager: %s\n", error->message);
g_error_free (error);
g_object_unref (proxy);
diff --git a/carrick/carrick-list.c b/carrick/carrick-list.c
index 02c858c..8987b93 100644
--- a/carrick/carrick-list.c
+++ b/carrick/carrick-list.c
@@ -291,7 +291,7 @@ carrick_list_drag_end (GtkWidget *widget,
(CARRICK_SERVICE_ITEM (other_widget));
path = dbus_g_proxy_get_path (other_service);
- org_moblin_connman_Service_move_before_async (service,
+ net_connman_Service_move_before_async (service,
path,
move_notify_cb,
data);
@@ -313,7 +313,7 @@ carrick_list_drag_end (GtkWidget *widget,
(CARRICK_SERVICE_ITEM (other_widget));
path = dbus_g_proxy_get_path (other_service);
- org_moblin_connman_Service_move_after_async (service,
+ net_connman_Service_move_after_async (service,
path,
move_notify_cb,
data);
@@ -1178,7 +1178,7 @@ carrick_list_set_fallback (CarrickList *list)
* Make D-Bus calls to determine whether there's a reason that we have no
* content. If so, set the fallback label.
*/
- org_moblin_connman_Manager_get_properties_async
+ net_connman_Manager_get_properties_async
(manager,
list_get_properties_cb,
list);
diff --git a/carrick/carrick-network-model.c b/carrick/carrick-network-model.c
index bced858..bfe3cfd 100644
--- a/carrick/carrick-network-model.c
+++ b/carrick/carrick-network-model.c
@@ -94,7 +94,7 @@ carrick_network_model_init (CarrickNetworkModel *self)
self,
NULL);
- org_moblin_connman_Manager_get_properties_async
+ net_connman_Manager_get_properties_async
(priv->manager,
network_model_manager_get_properties_cb,
self);
@@ -456,7 +456,7 @@ network_model_service_changed_cb (DBusGProxy *service,
/* Rather than store this property we're just going to trigger
* GetProperties to pull the up-to-date passphrase
*/
- org_moblin_connman_Service_get_properties_async
+ net_connman_Service_get_properties_async
(service,
network_model_service_get_properties_cb,
self);
@@ -608,7 +608,7 @@ network_model_update_property (const gchar *property,
self,
NULL);
- org_moblin_connman_Service_get_properties_async
+ net_connman_Service_get_properties_async
(service,
network_model_service_get_properties_cb,
self);
diff --git a/carrick/carrick-network-model.h b/carrick/carrick-network-model.h
index 06ebe96..37f15e7 100644
--- a/carrick/carrick-network-model.h
+++ b/carrick/carrick-network-model.h
@@ -26,7 +26,7 @@
#include <gtk/gtk.h>
#include <dbus/dbus-glib.h>
-#define CONNMAN_SERVICE "org.moblin.connman"
+#define CONNMAN_SERVICE "net.connman"
#define CONNMAN_MANAGER_PATH "/"
#define CONNMAN_MANAGER_INTERFACE CONNMAN_SERVICE ".Manager"
#define CONNMAN_SERVICE_INTERFACE CONNMAN_SERVICE ".Service"
diff --git a/carrick/carrick-pane.c b/carrick/carrick-pane.c
index bd42f9e..4fd6118 100644
--- a/carrick/carrick-pane.c
+++ b/carrick/carrick-pane.c
@@ -338,7 +338,7 @@ _wifi_switch_callback (MxGtkLightSwitch *wifi_switch,
"wifi",
"ready",
"all");
- org_moblin_connman_Manager_enable_technology_async (priv->manager,
+ net_connman_Manager_enable_technology_async (priv->manager,
"wifi",
wifi_switch_notify_cb,
pane);
@@ -349,7 +349,7 @@ _wifi_switch_callback (MxGtkLightSwitch *wifi_switch,
"wifi",
"idle",
"all");
- org_moblin_connman_Manager_disable_technology_async (priv->manager,
+ net_connman_Manager_disable_technology_async (priv->manager,
"wifi",
wifi_switch_notify_cb,
pane);
@@ -399,7 +399,7 @@ _ethernet_switch_callback (MxGtkLightSwitch
*ethernet_switch,
"ethernet",
"ready",
"all");
- org_moblin_connman_Manager_enable_technology_async (priv->manager,
+ net_connman_Manager_enable_technology_async (priv->manager,
"ethernet",
ethernet_switch_notify_cb,
pane);
@@ -410,7 +410,7 @@ _ethernet_switch_callback (MxGtkLightSwitch
*ethernet_switch,
"ethernet",
"idle",
"all");
- org_moblin_connman_Manager_disable_technology_async (priv->manager,
+ net_connman_Manager_disable_technology_async (priv->manager,
"ethernet",
ethernet_switch_notify_cb,
pane);
@@ -460,7 +460,7 @@ _threeg_switch_callback (MxGtkLightSwitch *threeg_switch,
"cellular",
"ready",
"all");
- org_moblin_connman_Manager_enable_technology_async (priv->manager,
+ net_connman_Manager_enable_technology_async (priv->manager,
"cellular",
threeg_switch_notify_cb,
pane);
@@ -471,7 +471,7 @@ _threeg_switch_callback (MxGtkLightSwitch *threeg_switch,
"cellular",
"idle",
"all");
- org_moblin_connman_Manager_disable_technology_async (priv->manager,
+ net_connman_Manager_disable_technology_async (priv->manager,
"cellular",
threeg_switch_notify_cb,
pane);
@@ -521,7 +521,7 @@ _wimax_switch_callback (MxGtkLightSwitch *wimax_switch,
"wimax",
"ready",
"all");
- org_moblin_connman_Manager_enable_technology_async (priv->manager,
+ net_connman_Manager_enable_technology_async (priv->manager,
"wimax",
wimax_switch_notify_cb,
pane);
@@ -532,7 +532,7 @@ _wimax_switch_callback (MxGtkLightSwitch *wimax_switch,
"wimax",
"idle",
"all");
- org_moblin_connman_Manager_disable_technology_async (priv->manager,
+ net_connman_Manager_disable_technology_async (priv->manager,
"wimax",
wimax_switch_notify_cb,
pane);
@@ -582,7 +582,7 @@ _bluetooth_switch_callback (MxGtkLightSwitch
*bluetooth_switch,
"bluetooth",
"ready",
"all");
- org_moblin_connman_Manager_enable_technology_async (priv->manager,
+ net_connman_Manager_enable_technology_async (priv->manager,
"bluetooth",
bluetooth_switch_notify_cb,
pane);
@@ -593,7 +593,7 @@ _bluetooth_switch_callback (MxGtkLightSwitch
*bluetooth_switch,
"bluetooth",
"idle",
"all");
- org_moblin_connman_Manager_disable_technology_async (priv->manager,
+ net_connman_Manager_disable_technology_async (priv->manager,
"bluetooth",
bluetooth_switch_notify_cb,
pane);
@@ -817,7 +817,7 @@ _new_connection_cb (GtkButton *button,
* set the timeout nice and long before we make the call
*/
dbus_g_proxy_set_default_timeout (priv->manager, 120000);
- org_moblin_connman_Manager_connect_service_async (priv->manager,
+ net_connman_Manager_connect_service_async (priv->manager,
method_props,
connect_service_notify_cb,
self);
@@ -879,7 +879,7 @@ _offline_mode_switch_callback (MxGtkLightSwitch
*flight_switch,
g_value_set_boolean (value,
new_state);
- org_moblin_connman_Manager_set_property_async (priv->manager,
+ net_connman_Manager_set_property_async (priv->manager,
"OfflineMode",
value,
offline_switch_notify_cb,
@@ -1389,7 +1389,7 @@ carrick_pane_init (CarrickPane *self)
self,
NULL);
- org_moblin_connman_Manager_get_properties_async (priv->manager,
+ net_connman_Manager_get_properties_async (priv->manager,
pane_manager_get_properties_cb,
self);
@@ -1615,7 +1615,7 @@ carrick_pane_update (CarrickPane *pane)
* The UI doesn't really care if the call to scan completes or
* not so just fire and forget
*/
- org_moblin_connman_Manager_request_scan_async (priv->manager,
+ net_connman_Manager_request_scan_async (priv->manager,
"",
dbus_proxy_notify_cb,
pane);
diff --git a/carrick/carrick-service-item.c b/carrick/carrick-service-item.c
index 70a0227..9ab4003 100644
--- a/carrick/carrick-service-item.c
+++ b/carrick/carrick-service-item.c
@@ -499,7 +499,7 @@ _connect (CarrickServiceItem *self)
* success or an error.
*/
dbus_g_proxy_set_default_timeout (self->priv->proxy, 120000);
- org_moblin_connman_Service_connect_async (self->priv->proxy,
+ net_connman_Service_connect_async (self->priv->proxy,
dbus_proxy_notify_cb,
self);
dbus_g_proxy_set_default_timeout (self->priv->proxy, -1);
@@ -579,7 +579,7 @@ _delete_button_cb (GtkButton *delete_button,
/* The service is marked failure, use Service.Remove to set
* back to idle state and clear password and favorite flag
*/
- org_moblin_connman_Service_remove_async (priv->proxy,
+ net_connman_Service_remove_async (priv->proxy,
dbus_proxy_notify_cb,
item);
}
@@ -592,7 +592,7 @@ _delete_button_cb (GtkButton *delete_button,
priv->type,
"idle",
priv->name);
- org_moblin_connman_Service_remove_async (priv->proxy,
+ net_connman_Service_remove_async (priv->proxy,
dbus_proxy_notify_cb,
item);
}
@@ -601,7 +601,7 @@ _delete_button_cb (GtkButton *delete_button,
/* The service isn't marked favorite so probably hasn't been
* successfully connected to before, just clear the passphrase
*/
- org_moblin_connman_Service_clear_property_async (priv->proxy,
+ net_connman_Service_clear_property_async (priv->proxy,
"Passphrase",
dbus_proxy_notify_cb,
item);
@@ -688,7 +688,7 @@ _connect_button_cb (GtkButton *connect_button,
priv->type,
"idle",
priv->name);
- org_moblin_connman_Service_disconnect_async (priv->proxy,
+ net_connman_Service_disconnect_async (priv->proxy,
dbus_proxy_notify_cb,
item);
}
@@ -790,7 +790,7 @@ _connect_with_password (CarrickServiceItem *item)
g_value_init (value, G_TYPE_STRING);
g_value_set_string (value, passphrase);
- org_moblin_connman_Service_set_property_async (priv->proxy,
+ net_connman_Service_set_property_async (priv->proxy,
"Passphrase",
value,
set_passphrase_notify_cb,
@@ -1312,7 +1312,7 @@ apply_button_clicked_cb (GtkButton *button,
g_value_init (value, DBUS_TYPE_G_STRING_STRING_HASHTABLE);
g_value_set_boxed (value, ipv4);
- org_moblin_connman_Service_set_property_async (priv->proxy,
+ net_connman_Service_set_property_async (priv->proxy,
"IPv4.Configuration",
value,
set_ipv4_configuration_cb,
diff --git a/carrick/connman-manager.xml b/carrick/connman-manager.xml
index ee44586..a9aa43f 100644
--- a/carrick/connman-manager.xml
+++ b/carrick/connman-manager.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<node name="/Manager"
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>
- <interface name="org.moblin.connman.Manager">
+ <interface name="net.connman.Manager">
<method name="GetProperties" tp:name-for-bindings="Get_Properties">
<arg name="properties" type="a{sv}" direction="out"/>
diff --git a/carrick/connman-service.xml b/carrick/connman-service.xml
index 2a7d0c7..042edf2 100644
--- a/carrick/connman-service.xml
+++ b/carrick/connman-service.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<node name="/Service"
xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0";>
- <interface name="org.moblin.connman.Service">
+ <interface name="net.connman.Service">
<method name="GetProperties" tp:name-for-bindings="Get_Properties">
<arg name="properties" type="a{sv}" direction="out"/>
--
1.7.3.2
_______________________________________________
connman mailing list
[email protected]
http://lists.connman.net/listinfo/connman
