summaryrefslogtreecommitdiff
path: root/telepathy-logger
diff options
context:
space:
mode:
Diffstat (limited to 'telepathy-logger')
-rw-r--r--telepathy-logger/channel-text.c2
-rw-r--r--telepathy-logger/dbus-service.c2
-rw-r--r--telepathy-logger/log-entry-internal.h6
-rw-r--r--telepathy-logger/log-entry-text.c4
-rw-r--r--telepathy-logger/log-entry.c10
-rw-r--r--telepathy-logger/log-entry.h7
-rw-r--r--telepathy-logger/log-manager.c2
-rw-r--r--telepathy-logger/log-store-sqlite.c8
-rw-r--r--telepathy-logger/log-store-xml.c6
9 files changed, 24 insertions, 23 deletions
diff --git a/telepathy-logger/channel-text.c b/telepathy-logger/channel-text.c
index c7f1e34..35991a1 100644
--- a/telepathy-logger/channel-text.c
+++ b/telepathy-logger/channel-text.c
@@ -1286,7 +1286,7 @@ keepon_on_receiving_signal (TplLogEntryText *text_log)
tpl_contact_receiver = _tpl_contact_from_tp_contact (local);
DEBUG ("recvd:\n\tlog_id=\"%s\"\n\tto=\"%s (%s)\"\n\tfrom=\"%s (%s)\"\n\tmsg=\"%s\"",
- _tpl_log_entry_get_log_id (log),
+ tpl_log_entry_get_log_id (log),
tpl_contact_get_identifier (tpl_contact_receiver),
tpl_contact_get_alias (tpl_contact_receiver),
tpl_contact_get_identifier (tpl_contact_sender),
diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c
index 73888b0..168f869 100644
--- a/telepathy-logger/dbus-service.c
+++ b/telepathy-logger/dbus-service.c
@@ -409,7 +409,7 @@ _get_messages_return (GObject *manager,
const char *message = tpl_log_entry_text_get_message (
TPL_LOG_ENTRY_TEXT (log));
const char *sender = tpl_contact_get_identifier (
- _tpl_log_entry_get_sender (log));
+ tpl_log_entry_get_sender (log));
gint64 timestamp = tpl_log_entry_get_timestamp (log);
DEBUG ("Message: %" G_GINT64_FORMAT " <%s> %s",
diff --git a/telepathy-logger/log-entry-internal.h b/telepathy-logger/log-entry-internal.h
index 0d5fc15..e741cc4 100644
--- a/telepathy-logger/log-entry-internal.h
+++ b/telepathy-logger/log-entry-internal.h
@@ -100,12 +100,6 @@ void _tpl_log_entry_set_sender (TplLogEntry *self,
void _tpl_log_entry_set_receiver (TplLogEntry *self,
TplContact *data);
-const gchar * _tpl_log_entry_get_log_id (TplLogEntry *self);
-
-TplContact * _tpl_log_entry_get_sender (TplLogEntry *self);
-TplContact * _tpl_log_entry_get_receiver (TplLogEntry *self);
-
-gint _tpl_log_entry_get_pending_msg_id (TplLogEntry *self);
gboolean _tpl_log_entry_is_pending (TplLogEntry *self);
TplLogEntrySignalType _tpl_log_entry_get_signal_type (TplLogEntry *self);
const gchar * _tpl_log_entry_get_chat_id (TplLogEntry * self);
diff --git a/telepathy-logger/log-entry-text.c b/telepathy-logger/log-entry-text.c
index 715db5d..6e68579 100644
--- a/telepathy-logger/log-entry-text.c
+++ b/telepathy-logger/log-entry-text.c
@@ -339,6 +339,6 @@ _tpl_log_entry_text_equal (TplLogEntry *message1,
if (!tp_strdiff (priv1->entry.text->message, priv2->entry.text->message)) {
}
*/
- return !tp_strdiff (_tpl_log_entry_get_log_id (message1),
- _tpl_log_entry_get_log_id (message2));
+ return !tp_strdiff (tpl_log_entry_get_log_id (message1),
+ tpl_log_entry_get_log_id (message2));
}
diff --git a/telepathy-logger/log-entry.c b/telepathy-logger/log-entry.c
index e6a2891..34a7e15 100644
--- a/telepathy-logger/log-entry.c
+++ b/telepathy-logger/log-entry.c
@@ -382,7 +382,7 @@ tpl_log_entry_get_timestamp (TplLogEntry *self)
gint
-_tpl_log_entry_get_pending_msg_id (TplLogEntry *self)
+tpl_log_entry_get_pending_msg_id (TplLogEntry *self)
{
g_return_val_if_fail (TPL_IS_LOG_ENTRY (self), -1);
@@ -394,7 +394,7 @@ gboolean
_tpl_log_entry_is_pending (TplLogEntry *self)
{
return TPL_LOG_ENTRY_MSG_ID_IS_VALID (
- _tpl_log_entry_get_pending_msg_id (self));
+ tpl_log_entry_get_pending_msg_id (self));
}
@@ -408,7 +408,7 @@ _tpl_log_entry_get_signal_type (TplLogEntry *self)
const gchar *
-_tpl_log_entry_get_log_id (TplLogEntry *self)
+tpl_log_entry_get_log_id (TplLogEntry *self)
{
g_return_val_if_fail (TPL_IS_LOG_ENTRY (self), 0);
@@ -427,7 +427,7 @@ _tpl_log_entry_get_direction (TplLogEntry *self)
TplContact *
-_tpl_log_entry_get_sender (TplLogEntry *self)
+tpl_log_entry_get_sender (TplLogEntry *self)
{
g_return_val_if_fail (TPL_IS_LOG_ENTRY (self), NULL);
@@ -436,7 +436,7 @@ _tpl_log_entry_get_sender (TplLogEntry *self)
TplContact *
-_tpl_log_entry_get_receiver (TplLogEntry *self)
+tpl_log_entry_get_receiver (TplLogEntry *self)
{
g_return_val_if_fail (TPL_IS_LOG_ENTRY (self), NULL);
diff --git a/telepathy-logger/log-entry.h b/telepathy-logger/log-entry.h
index 5c8e182..3599e92 100644
--- a/telepathy-logger/log-entry.h
+++ b/telepathy-logger/log-entry.h
@@ -44,5 +44,12 @@ gint64 tpl_log_entry_get_timestamp (TplLogEntry *self);
const gchar *tpl_log_entry_get_account_path (TplLogEntry *self);
+TplContact * tpl_log_entry_get_sender (TplLogEntry *self);
+TplContact * tpl_log_entry_get_receiver (TplLogEntry *self);
+
+const gchar * tpl_log_entry_get_log_id (TplLogEntry *self);
+
+gint tpl_log_entry_get_pending_msg_id (TplLogEntry *self);
+
G_END_DECLS
#endif // __TPL_LOG_ENTRY_H__
diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c
index cefac8f..10bf9b2 100644
--- a/telepathy-logger/log-manager.c
+++ b/telepathy-logger/log-manager.c
@@ -255,7 +255,7 @@ _tpl_log_manager_add_message (TplLogManager *manager,
if (!retval)
{
CRITICAL ("Failed to write to all "
- "writable LogStores log-id %s.", _tpl_log_entry_get_log_id (message));
+ "writable LogStores log-id %s.", tpl_log_entry_get_log_id (message));
g_set_error_literal (error, TPL_LOG_MANAGER_ERROR,
TPL_LOG_MANAGER_ERROR_ADD_MESSAGE,
"Not recoverable error occurred during log manager's "
diff --git a/telepathy-logger/log-store-sqlite.c b/telepathy-logger/log-store-sqlite.c
index 7342088..7e69072 100644
--- a/telepathy-logger/log-store-sqlite.c
+++ b/telepathy-logger/log-store-sqlite.c
@@ -441,7 +441,7 @@ tpl_log_store_sqlite_add_message_counter (TplLogStore *self,
TPL_LOG_ENTRY_TEXT_SIGNAL_RECEIVED)
{
DEBUG ("ignoring msg %s, not interesting for message-counter",
- _tpl_log_entry_get_log_id (message));
+ tpl_log_entry_get_log_id (message));
retval = TRUE;
goto out;
}
@@ -579,7 +579,7 @@ tpl_log_store_sqlite_add_message_cache (TplLogStore *self,
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- log_id = _tpl_log_entry_get_log_id (message);
+ log_id = tpl_log_entry_get_log_id (message);
DEBUG ("received %s, considering if can be cached", log_id);
if (tpl_log_store_sqlite_log_id_is_present (self, log_id))
{
@@ -698,8 +698,8 @@ _insert_to_cache_table (TplLogStore *self,
account = get_account_name_from_entry (message);
channel = get_channel_name_from_entry (message);
identifier = _tpl_log_entry_get_chat_id (message);
- log_id = _tpl_log_entry_get_log_id (message);
- msg_id = _tpl_log_entry_get_pending_msg_id (message);
+ log_id = tpl_log_entry_get_log_id (message);
+ msg_id = tpl_log_entry_get_pending_msg_id (message);
chatroom = _tpl_log_entry_text_is_chatroom (TPL_LOG_ENTRY_TEXT (message));
date = get_datetime (message);
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index cd2626b..538f2d8 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -465,7 +465,7 @@ add_message_text_chat (TplLogStoreXml *self,
timestamp = log_store_xml_get_timestamp_from_message (
TPL_LOG_ENTRY (message));
- sender = _tpl_log_entry_get_sender (TPL_LOG_ENTRY (message));
+ sender = tpl_log_entry_get_sender (TPL_LOG_ENTRY (message));
contact_id = g_markup_escape_text (tpl_contact_get_identifier (sender), -1);
if (tpl_contact_get_alias (sender) != NULL)
contact_name = g_markup_escape_text (tpl_contact_get_alias (sender), -1);
@@ -476,7 +476,7 @@ add_message_text_chat (TplLogStoreXml *self,
entry = g_strdup_printf ("<message time='%s' cm_id='%s' id='%s' name='%s' "
"token='%s' isuser='%s' type='%s'>"
"%s</message>\n" LOG_FOOTER, timestamp,
- _tpl_log_entry_get_log_id (TPL_LOG_ENTRY (message)),
+ tpl_log_entry_get_log_id (TPL_LOG_ENTRY (message)),
contact_id, contact_name,
avatar_token ? avatar_token : "",
tpl_contact_get_contact_type (sender) ==
@@ -485,7 +485,7 @@ add_message_text_chat (TplLogStoreXml *self,
body);
DEBUG ("writing %s from %s (ts %s)",
- _tpl_log_entry_get_log_id (TPL_LOG_ENTRY (message)),
+ tpl_log_entry_get_log_id (TPL_LOG_ENTRY (message)),
contact_id, timestamp);
ret = _log_store_xml_write_to_store (self, account,
View Lorry Controller Status