port to latest tp-logger API

diff --git a/configure.ac b/configure.ac
index 18094002e33b3803740e5e574c4316bd1d9789da..f0e784787b515d33d22eaa2409e61aab01ca6711 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ GLIB_REQUIRED=2.25.9
 GTK_REQUIRED=2.21.2
 GCONF_REQUIRED=1.2.0
 TELEPATHY_GLIB_REQUIRED=0.11.7
-TELEPATHY_LOGGER=0.1.1
+TELEPATHY_LOGGER=0.1.2
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index e68b91dbe8ff8f83064f438bfd828e0851b813f3..43fabfb7d71017bbf73283a29b160fbbf93ebe84 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -2005,9 +2005,8 @@ got_filtered_messages_cb (GObject *manager,
        EmpathyChatPriv *priv = GET_PRIV (chat);
        GError *error = NULL;
 
-       messages = tpl_log_manager_get_filtered_messages_async_finish (result, &error);
-
-       if (error != NULL) {
+       if (!tpl_log_manager_get_filtered_messages_finish (TPL_LOG_MANAGER (manager),
+               result, &messages, &error)) {
                DEBUG ("%s. Aborting.", error->message);
                empathy_chat_view_append_event (chat->view,
                        _("Failed to retrieve recent logs"));

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index ac889fc967c529e9a1435a7b33014b8085c4ff51..11d7ca43f8f56c43ee03d1f6bdc6df3f404f585a 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -368,9 +368,8 @@ got_messages_for_date_cb (GObject *manager,
        gboolean       can_do_next;
        GError        *error = NULL;
 
-       messages = tpl_log_manager_get_messages_for_date_async_finish (result, &error);
-
-       if (error != NULL) {
+       if (!tpl_log_manager_get_messages_for_date_finish (TPL_LOG_MANAGER (manager),
+               result, &messages, &error)) {
                        DEBUG ("Unable to retrieve messages for the selected date: %s. Aborting",
                                        error->message);
                        empathy_chat_view_append_event (window->chatview_find,
@@ -523,9 +522,8 @@ log_manager_searched_new_cb (GObject *manager,
        GtkListStore        *store = user_data;
        GError              *error = NULL;
 
-       hits = tpl_log_manager_search_new_async_finish (result, &error);
-
-       if (error != NULL) {
+       if (!tpl_log_manager_search_new_finish (TPL_LOG_MANAGER (manager), result,
+               &hits, &error)) {
                        DEBUG ("%s. Aborting", error->message);
                        g_error_free (error);
                        return;
@@ -848,9 +846,8 @@ log_manager_got_chats_cb (GObject *manager,
        GtkTreeIter            iter;
        GError                *error = NULL;
 
-       chats = tpl_log_manager_get_chats_async_finish (result, &error);
-
-       if (error != NULL) {
+       if (!tpl_log_manager_get_chats_finish (TPL_LOG_MANAGER (manager),
+               result, &chats, &error)) {
                        DEBUG ("%s. Aborting", error->message);
                        g_error_free (error);
                        return;
@@ -1146,9 +1143,8 @@ log_window_got_messages_for_date_cb (GObject *manager,
   GList *l;
   GError *error = NULL;
 
-  messages = tpl_log_manager_get_messages_for_date_async_finish (result, &error);
-
-  if (error != NULL) {
+  if (!tpl_log_manager_get_messages_for_date_finish (TPL_LOG_MANAGER (manager),
+        result, &messages, &error)) {
       DEBUG ("Unable to retrieve messages for the selected date: %s. Aborting",
           error->message);
       empathy_chat_view_append_event (window->chatview_find,
@@ -1221,9 +1217,8 @@ log_manager_got_dates_cb (GObject *manager,
   const gchar   *date = NULL;
   GError        *error = NULL;
 
-  dates = tpl_log_manager_get_dates_async_finish (result, &error);
-
-  if (error != NULL) {
+  if (!tpl_log_manager_get_dates_finish (TPL_LOG_MANAGER (manager),
+        result, &dates, &error)) {
     DEBUG ("Unable to retrieve messages' dates: %s. Aborting",
         error->message);
     empathy_chat_view_append_event (window->chatview_find,
@@ -1523,9 +1518,8 @@ log_window_updating_calendar_month_cb (GObject *manager,
        guint                                    month_selected;
        GError                          *error = NULL;
 
-       dates = tpl_log_manager_get_dates_async_finish (result, &error);
-
-       if (error != NULL) {
+       if (!tpl_log_manager_get_dates_finish (TPL_LOG_MANAGER (manager),
+               result, &dates, &error)) {
                        DEBUG ("Unable to retrieve messages' dates: %s. Aborting",
                                        error->message);
                        empathy_chat_view_append_event (window->chatview_find,

diff --git a/libempathy/empathy-message.c b/libempathy/empathy-message.c
index 85d5cbc588bf107e5cce92eef8057e2d71b03540..b3234d3480054b43a54191aa8df22560fb02940f 100644 (file)
--- a/libempathy/empathy-message.c
+++ b/libempathy/empathy-message.c
@@ -302,8 +302,8 @@ empathy_message_from_tpl_log_entry (TplLogEntry *logentry)
 
        body = g_strdup (tpl_log_entry_text_get_message (
                                TPL_LOG_ENTRY_TEXT (logentry)));
-       receiver = tpl_log_entry_text_get_receiver (TPL_LOG_ENTRY_TEXT (logentry));
-       sender = tpl_log_entry_text_get_sender (TPL_LOG_ENTRY_TEXT (logentry));
+       receiver = tpl_log_entry_get_receiver (logentry);
+       sender = tpl_log_entry_get_sender (logentry);
 
        retval = empathy_message_new (body);
        if (receiver != NULL)
@@ -316,7 +316,7 @@ empathy_message_from_tpl_log_entry (TplLogEntry *logentry)
        empathy_message_set_timestamp (retval,
                        tpl_log_entry_get_timestamp (logentry));
        empathy_message_set_id (retval,
-                       tpl_log_entry_text_get_log_id (TPL_LOG_ENTRY_TEXT (logentry)));
+                       tpl_log_entry_get_pending_msg_id (logentry));
        empathy_message_set_is_backlog (retval, FALSE);
 
        g_free (body);

diff --git a/src/empathy.c b/src/empathy.c
index ac292fcff4c816d9010a773e7a7df4bece59dcad..552b8e17194e8afb3bb142d9a3b69cf3d1966bf5 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -46,7 +46,6 @@
 
 #ifdef ENABLE_TPL
 #include <telepathy-logger/log-manager.h>
-#include <telepathy-logger/log-store-empathy.h>
 #else
 
 #include <libempathy/empathy-log-manager.h>