Rename internal ofono history funcs to __ofono

diff --git a/src/history.c b/src/history.c
index 1720cf9..4f1284b 100644 (file)
--- a/src/history.c
+++ b/src/history.c
@@ -59,7 +59,7 @@ static struct ofono_history_context *history_context_create(
        return context;
 }
 
-void ofono_history_probe_drivers(struct ofono_modem *modem)
+void __ofono_history_probe_drivers(struct ofono_modem *modem)
 {
        GSList *l;
        struct ofono_history_context *context;
@@ -78,7 +78,7 @@ void ofono_history_probe_drivers(struct ofono_modem *modem)
        }
 }
 
-void ofono_history_remove_drivers(struct ofono_modem *modem)
+void __ofono_history_remove_drivers(struct ofono_modem *modem)
 {
        GSList *l;
        struct ofono_history_context *context;
@@ -96,7 +96,7 @@ void ofono_history_remove_drivers(struct ofono_modem *modem)
        modem->history_contexts = NULL;
 }
 
-void ofono_history_call_ended(struct ofono_modem *modem,
+void __ofono_history_call_ended(struct ofono_modem *modem,
                                const struct ofono_call *call,
                                time_t start, time_t end)
 {
@@ -111,7 +111,7 @@ void ofono_history_call_ended(struct ofono_modem *modem,
        }
 }
 
-void ofono_history_call_missed(struct ofono_modem *modem,
+void __ofono_history_call_missed(struct ofono_modem *modem,
                                const struct ofono_call *call, time_t when)
 {
        struct ofono_history_context *context;

diff --git a/src/manager.c b/src/manager.c
index 0c8f49b..b8e250c 100644 (file)
--- a/src/manager.c
+++ b/src/manager.c
@@ -77,7 +77,7 @@ struct ofono_modem *ofono_modem_register(struct ofono_modem_attribute_ops *ops)
 
        ++g_next_modem_id;
 
-       ofono_history_probe_drivers(modem);
+       __ofono_history_probe_drivers(modem);
        g_modem_list = g_slist_prepend(g_modem_list, modem);
 
        if (modem_list(&modems) == 0) {
@@ -100,7 +100,7 @@ int ofono_modem_unregister(struct ofono_modem *m)
        if (modem == NULL)
                return -1;
 
-       ofono_history_remove_drivers(modem);
+       __ofono_history_remove_drivers(modem);
        modem_remove(modem);
 
        g_modem_list = g_slist_remove(g_modem_list, modem);

diff --git a/src/ofono.h b/src/ofono.h
index 9197337..434f7ba 100644 (file)
--- a/src/ofono.h
+++ b/src/ofono.h
@@ -59,12 +59,12 @@ void __ofono_plugin_cleanup(void);
 
 #include <ofono/history.h>
 
-void ofono_history_probe_drivers(struct ofono_modem *modem);
-void ofono_history_remove_drivers(struct ofono_modem *modem);
+void __ofono_history_probe_drivers(struct ofono_modem *modem);
+void __ofono_history_remove_drivers(struct ofono_modem *modem);
 
-void ofono_history_call_ended(struct ofono_modem *modem,
+void __ofono_history_call_ended(struct ofono_modem *modem,
                                const struct ofono_call *call,
                                time_t start, time_t end);
 
-void ofono_history_call_missed(struct ofono_modem *modem,
+void __ofono_history_call_missed(struct ofono_modem *modem,
                                const struct ofono_call *call, time_t when);

diff --git a/src/voicecall.c b/src/voicecall.c
index f5a969c..07b254f 100644 (file)
--- a/src/voicecall.c
+++ b/src/voicecall.c
@@ -1248,9 +1248,9 @@ void ofono_voicecall_disconnected(struct ofono_modem *modem, int id,
        voicecall_set_call_status(modem, call, CALL_STATUS_DISCONNECTED);
 
        if (prev_status == CALL_STATUS_INCOMING)
-               ofono_history_call_missed(modem, call->call, ts);
+               __ofono_history_call_missed(modem, call->call, ts);
        else
-               ofono_history_call_ended(modem, call->call,
+               __ofono_history_call_ended(modem, call->call,
                                                call->detect_time, ts);
 
        voicecall_dbus_unregister(modem, call);