Move & Rename dbus_gsm_init & dbus_gsm_exit

Rename to __ofono_dbus_init && __ofono_dbus_cleanup for consistency
Move to ofono.h

diff --git a/src/dbus-gsm.c b/src/dbus-gsm.c
index c03b6b9..d413135 100644 (file)
--- a/src/dbus-gsm.c
+++ b/src/dbus-gsm.c
@@ -200,7 +200,7 @@ static gboolean system_bus_reconnect(void *user_data)
 {
        DBusConnection *conn = ofono_dbus_get_connection();
 
-       if (!conn && (dbus_gsm_init() < 0))
+       if (!conn && (__ofono_dbus_init() < 0))
                return TRUE;
 
        conn = ofono_dbus_get_connection();
@@ -224,7 +224,7 @@ static void system_bus_disconnected(DBusConnection *conn, void *user_data)
                                system_bus_reconnect, NULL);
 }
 
-int dbus_gsm_init()
+int __ofono_dbus_init(void)
 {
        DBusConnection *conn;
        DBusError error;
@@ -248,7 +248,7 @@ int dbus_gsm_init()
        return 0;
 }
 
-void dbus_gsm_exit()
+void __ofono_dbus_cleanup(void)
 {
        DBusConnection *conn = ofono_dbus_get_connection();
 

diff --git a/src/dbus-gsm.h b/src/dbus-gsm.h
index 78a1eaf..4c08578 100644 (file)
--- a/src/dbus-gsm.h
+++ b/src/dbus-gsm.h
@@ -22,9 +22,6 @@
 #include <ofono/dbus.h>
 #include <gdbus.h>
 
-int dbus_gsm_init();
-void dbus_gsm_exit();
-
 #define MAX_DBUS_PATH_LEN 64
 
 void dbus_gsm_free_string_array(char **array);

diff --git a/src/main.c b/src/main.c
index 03d294d..caea3ff 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
 
        __ofono_log_init(option_detach, option_debug);
 
-       if (dbus_gsm_init() != 0)
+       if (__ofono_dbus_init() != 0)
                goto cleanup;
 
        if (__ofono_manager_init() < 0)
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
 
        __ofono_manager_cleanup();
 
-       dbus_gsm_exit();
+       __ofono_dbus_cleanup();
 
 cleanup:
        g_main_loop_unref(event_loop);

diff --git a/src/ofono.h b/src/ofono.h
index 99cbd60..d51be9a 100644 (file)
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -35,6 +35,11 @@ void __ofono_log_cleanup(void);
 
 void __ofono_toggle_debug(void);
 
+#include <ofono/dbus.h>
+
+int __ofono_dbus_init(void);
+void __ofono_dbus_cleanup(void);
+
 #include <ofono/plugin.h>
 
 int __ofono_plugin_init(const char *pattern, const char *exclude);