diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-01 20:41:46 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-03-01 20:41:46 +0800 |
| commit | 2f54d54b0f73b08de6be479eb62bf49b4a1162dc (patch) | |
| tree | 7485f397841cdf789b83ad3fe877b2e690344bda | |
| parent | 2af7013df4478db4683da15582705da493cb4cef (diff) | |
| parent | 5b1255d0e3e92635985aa058bdd87670e8891095 (diff) | |
| download | gsoc2013-empathy-2f54d54b0f73b08de6be479eb62bf49b4a1162dc.tar gsoc2013-empathy-2f54d54b0f73b08de6be479eb62bf49b4a1162dc.tar.gz gsoc2013-empathy-2f54d54b0f73b08de6be479eb62bf49b4a1162dc.tar.bz2 gsoc2013-empathy-2f54d54b0f73b08de6be479eb62bf49b4a1162dc.tar.lz gsoc2013-empathy-2f54d54b0f73b08de6be479eb62bf49b4a1162dc.tar.xz gsoc2013-empathy-2f54d54b0f73b08de6be479eb62bf49b4a1162dc.tar.zst gsoc2013-empathy-2f54d54b0f73b08de6be479eb62bf49b4a1162dc.zip | |
Merge commit 'ka/tpl-0.1.1'
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-chat.c | 2 | ||||
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index abb05a4a1..5d09d86f0 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 edb2aabc3..bec1d7704 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 7044d2e91..3345f5b15 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", |