[empathy: 1/2] Update to TPL 0.1.1
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy: 1/2] Update to TPL 0.1.1
- Date: Mon, 1 Mar 2010 12:42:04 +0000 (UTC)
commit 5b1255d0e3e92635985aa058bdd87670e8891095
Author: Cosimo Alfarano <cosimo alfarano collabora co uk>
Date: Fri Feb 26 13:52:36 2010 +0000
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.
configure.ac | 4 ++--
libempathy-gtk/empathy-chat.c | 2 +-
libempathy-gtk/empathy-log-window.c | 12 ++++++------
3 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index abb05a4..5d09d86 100644
--- 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 edb2aab..bec1d77 100644
--- 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 7044d2e..3345f5b 100644
--- 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",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]