Update to TPL 0.1.1

Updated the the pkg-config version to 0.1.1
Updated the the pkg-config dep name fom libtelepathy-logger to telepathy-logger
Updated TPL's _finish() methods using one for each async API.

diff --git a/configure.ac b/configure.ac
index abb05a4a1773170ed6917d5dc49f66a7e100a22b..5d09d86f0d872f799b1c1a95fa2092ca71e3984d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ GLIB_REQUIRED=2.22.0
 GTK_REQUIRED=2.18.0
 GCONF_REQUIRED=1.2.0
 TELEPATHY_GLIB_REQUIRED=0.9.2
-TELEPATHY_LOGGER=0.1.0
+TELEPATHY_LOGGER=0.1.1
 ENCHANT_REQUIRED=1.2.0
 ISO_CODES_REQUIRED=0.35
 LIBNOTIFY_REQUIRED=0.4.4
@@ -152,7 +152,7 @@ fi
 if test "x$enable_tpl" = "xyes"; then
   PKG_CHECK_MODULES(TPL,
   [
-     libtelepathy-logger = $TELEPATHY_LOGGER
+     telepathy-logger = $TELEPATHY_LOGGER
   ])
   AC_SUBST(TPL_CFLAGS)
   AC_SUBST(TPL_LIBS)

diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index edb2aabc36abd89731ad0c51b9636914afb65b28..bec1d7704fa640ca770a42967a9c2f2347ebe883 100644 (file)
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -1815,7 +1815,7 @@ got_filtered_messages_cb (GObject *manager,
        EmpathyChatPriv *priv = GET_PRIV (chat);
        GError *error = NULL;
 
-       messages = tpl_log_manager_async_operation_finish (result, &error);
+       messages = tpl_log_manager_get_filtered_messages_async_finish (result, &error);
 
        if (error != NULL) {
                DEBUG ("%s. Aborting.", error->message);

diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c
index 7044d2e9176b5a3e3366f456b4d37bd65f3045d4..3345f5b150253db0d8141322925f84b3653f1105 100644 (file)
--- a/libempathy-gtk/empathy-log-window.c
+++ b/libempathy-gtk/empathy-log-window.c
@@ -365,7 +365,7 @@ got_messages_for_date_cb (GObject *manager,
        gboolean       can_do_next;
        GError        *error = NULL;
 
-       messages = tpl_log_manager_async_operation_finish (result, &error);
+       messages = tpl_log_manager_get_messages_for_date_async_finish (result, &error);
 
        if (error != NULL) {
                        DEBUG ("Unable to retrieve messages for the selected date: %s. Aborting",
@@ -520,7 +520,7 @@ log_manager_searched_new_cb (GObject *manager,
        GtkListStore        *store = user_data;
        GError              *error = NULL;
 
-       hits = tpl_log_manager_async_operation_finish (result, &error);
+       hits = tpl_log_manager_search_new_async_finish (result, &error);
 
        if (error != NULL) {
                        DEBUG ("%s. Aborting", error->message);
@@ -832,7 +832,7 @@ log_manager_got_chats_cb (GObject *manager,
        GtkTreeIter            iter;
        GError                *error = NULL;
 
-       chats = tpl_log_manager_async_operation_finish (result, &error);
+       chats = tpl_log_manager_get_chats_async_finish (result, &error);
 
        if (error != NULL) {
                        DEBUG ("%s. Aborting", error->message);
@@ -1130,7 +1130,7 @@ log_window_got_messages_for_date_cb (GObject *manager,
   GList *l;
   GError *error = NULL;
 
-  messages = tpl_log_manager_async_operation_finish (result, &error);
+  messages = tpl_log_manager_get_messages_for_date_async_finish (result, &error);
 
   if (error != NULL) {
       DEBUG ("Unable to retrieve messages for the selected date: %s. Aborting",
@@ -1205,7 +1205,7 @@ log_manager_got_dates_cb (GObject *manager,
   const gchar   *date = NULL;
   GError        *error = NULL;
 
-  dates = tpl_log_manager_async_operation_finish (result, &error);
+  dates = tpl_log_manager_get_dates_async_finish (result, &error);
 
   if (error != NULL) {
     DEBUG ("Unable to retrieve messages' dates: %s. Aborting",
@@ -1507,7 +1507,7 @@ log_window_updating_calendar_month_cb (GObject *manager,
        guint                                    month_selected;
        GError                          *error = NULL;
 
-       dates = tpl_log_manager_async_operation_finish (result, &error);
+       dates = tpl_log_manager_get_dates_async_finish (result, &error);
 
        if (error != NULL) {
                        DEBUG ("Unable to retrieve messages' dates: %s. Aborting",