1connman-gnome: fix dbus interface name 2 3This patch resolves following error: 4 5"connman-dbus.xml": "connman" is not a valid D-Bus interface name 6 7https://502552.bugs.gentoo.org/attachment.cgi?id=380652 8 9Upstream-Status: Backport 10 11Signed-off-by: Chong Lu <Chong.Lu@windriver.com> 12--- 13 common/connman-client.c | 24 ++++++++++++------------ 14 common/connman-client.h | 4 ++-- 15 common/connman-dbus.c | 6 +++--- 16 common/connman-dbus.xml | 2 +- 17 4 files changed, 18 insertions(+), 18 deletions(-) 18 19diff --git a/common/connman-client.c b/common/connman-client.c 20index c55e25c..9d818b2 100644 21--- a/common/connman-client.c 22+++ b/common/connman-client.c 23@@ -289,7 +289,7 @@ gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device, 24 25 g_value_init(&value, DBUS_TYPE_G_DICTIONARY); 26 g_value_set_boxed(&value, ipv4); 27- ret = connman_set_property(proxy, "IPv4.Configuration", &value, NULL); 28+ ret = net_connman_set_property(proxy, "IPv4.Configuration", &value, NULL); 29 30 g_object_unref(proxy); 31 32@@ -317,7 +317,7 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, 33 g_value_set_boolean(&value, powered); 34 35 error = NULL; 36- connman_set_property(proxy, "Powered", &value, &error); 37+ net_connman_set_property(proxy, "Powered", &value, &error); 38 if( error ) 39 fprintf (stderr, "error: %s\n", error->message); 40 41@@ -325,7 +325,7 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, 42 } 43 44 void connman_client_scan(ConnmanClient *client, const gchar *device, 45- connman_scan_reply callback, gpointer user_data) 46+ net_connman_scan_reply callback, gpointer user_data) 47 { 48 ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); 49 DBusGProxy *proxy; 50@@ -339,7 +339,7 @@ void connman_client_scan(ConnmanClient *client, const gchar *device, 51 if (proxy == NULL) 52 return; 53 54- connman_scan_async(proxy, callback, user_data); 55+ net_connman_scan_async(proxy, callback, user_data); 56 57 g_object_unref(proxy); 58 } 59@@ -353,7 +353,7 @@ gboolean connman_client_get_offline_status(ConnmanClient *client) 60 61 DBG("client %p", client); 62 63- ret = connman_get_properties(priv->manager, &hash, NULL); 64+ ret = net_connman_get_properties(priv->manager, &hash, NULL); 65 66 if (ret == FALSE) 67 goto done; 68@@ -375,7 +375,7 @@ void connman_client_set_offlinemode(ConnmanClient *client, gboolean status) 69 g_value_init(&value, G_TYPE_BOOLEAN); 70 g_value_set_boolean(&value, status); 71 72- connman_set_property(priv->manager, "OfflineMode", &value, NULL); 73+ net_connman_set_property(priv->manager, "OfflineMode", &value, NULL); 74 } 75 76 static gboolean network_disconnect(GtkTreeModel *model, GtkTreePath *path, 77@@ -398,7 +398,7 @@ static gboolean network_disconnect(GtkTreeModel *model, GtkTreePath *path, 78 return TRUE; 79 80 if (type == CONNMAN_TYPE_WIFI) 81- connman_disconnect(proxy, NULL); 82+ net_connman_disconnect(proxy, NULL); 83 84 g_object_unref(proxy); 85 86@@ -422,13 +422,13 @@ void connman_client_connect(ConnmanClient *client, const gchar *network) 87 if (proxy == NULL) 88 return; 89 90- connman_connect(proxy, NULL); 91+ net_connman_connect(proxy, NULL); 92 93 g_object_unref(proxy); 94 } 95 96 void connman_client_connect_async(ConnmanClient *client, const gchar *network, 97- connman_connect_reply callback, gpointer userdata) 98+ net_connman_connect_reply callback, gpointer userdata) 99 { 100 ConnmanClientPrivate *priv = CONNMAN_CLIENT_GET_PRIVATE(client); 101 DBusGProxy *proxy; 102@@ -446,7 +446,7 @@ void connman_client_connect_async(ConnmanClient *client, const gchar *network, 103 if (proxy == NULL) 104 goto done; 105 106- connman_connect_async(proxy, callback, userdata); 107+ net_connman_connect_async(proxy, callback, userdata); 108 109 done: 110 return; 111@@ -476,7 +476,7 @@ void connman_client_disconnect(ConnmanClient *client, const gchar *network) 112 if (proxy == NULL) 113 return; 114 115- connman_disconnect(proxy, NULL); 116+ net_connman_disconnect(proxy, NULL); 117 118 g_object_unref(proxy); 119 } 120@@ -532,7 +532,7 @@ void connman_client_remove(ConnmanClient *client, const gchar *network) 121 if (proxy == NULL) 122 return; 123 124- connman_remove(proxy, NULL); 125+ net_connman_remove(proxy, NULL); 126 127 g_object_unref(proxy); 128 } 129diff --git a/common/connman-client.h b/common/connman-client.h 130index 9e2e6d5..98241de 100644 131--- a/common/connman-client.h 132+++ b/common/connman-client.h 133@@ -70,13 +70,13 @@ void connman_client_set_powered(ConnmanClient *client, const gchar *device, 134 gboolean connman_client_set_ipv4(ConnmanClient *client, const gchar *device, 135 struct ipv4_config *ipv4_config); 136 void connman_client_scan(ConnmanClient *client, const gchar *device, 137- connman_scan_reply callback, gpointer user_data); 138+ net_connman_scan_reply callback, gpointer user_data); 139 140 void connman_client_connect(ConnmanClient *client, const gchar *network); 141 void connman_client_disconnect(ConnmanClient *client, const gchar *network); 142 gchar *connman_client_get_security(ConnmanClient *client, const gchar *network); 143 void connman_client_connect_async(ConnmanClient *client, const gchar *network, 144- connman_connect_reply callback, gpointer userdata); 145+ net_connman_connect_reply callback, gpointer userdata); 146 void connman_client_set_remember(ConnmanClient *client, const gchar *network, 147 gboolean remember); 148 149diff --git a/common/connman-dbus.c b/common/connman-dbus.c 150index b82b3e1..543eb43 100644 151--- a/common/connman-dbus.c 152+++ b/common/connman-dbus.c 153@@ -655,15 +655,15 @@ DBusGProxy *connman_dbus_create_manager(DBusGConnection *conn, 154 155 DBG("getting manager properties"); 156 157- connman_get_properties_async(proxy, manager_properties, store); 158+ net_connman_get_properties_async(proxy, manager_properties, store); 159 160 DBG("getting technologies"); 161 162- connman_get_technologies_async(proxy, manager_technologies, store); 163+ net_connman_get_technologies_async(proxy, manager_technologies, store); 164 165 DBG("getting services"); 166 167- connman_get_services_async(proxy, manager_services, store); 168+ net_connman_get_services_async(proxy, manager_services, store); 169 170 return proxy; 171 } 172diff --git a/common/connman-dbus.xml b/common/connman-dbus.xml 173index 56b9582..0199d52 100644 174--- a/common/connman-dbus.xml 175+++ b/common/connman-dbus.xml 176@@ -1,7 +1,7 @@ 177 <?xml version="1.0" encoding="UTF-8" ?> 178 179 <node name="/"> 180- <interface name="connman"> 181+ <interface name="net.connman"> 182 <method name="GetProperties"> 183 <arg type="a{sv}" direction="out"/> 184 </method> 185-- 1861.9.1 187 188