[gnome-shell] telepathyClient: Remove C-based TelepathyLogger wrapper
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] telepathyClient: Remove C-based TelepathyLogger wrapper
- Date: Fri, 1 Jun 2012 13:00:16 +0000 (UTC)
commit a1f68720e51a1fcfbe6e93edc5c14cc2142b04d4
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri May 25 14:55:20 2012 -0400
telepathyClient: Remove C-based TelepathyLogger wrapper
gjs has matured enough to the point where we don't need this
https://bugzilla.gnome.org/show_bug.cgi?id=676850
js/ui/telepathyClient.js | 8 ++++----
src/shell-tp-client.c | 28 ----------------------------
src/shell-tp-client.h | 7 -------
3 files changed, 4 insertions(+), 39 deletions(-)
---
diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index f54e4c0..9156849 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -509,10 +509,10 @@ const ChatSource = new Lang.Class({
_getLogMessages: function() {
let logManager = Tpl.LogManager.dup_singleton();
let entity = Tpl.Entity.new_from_tp_contact(this._contact, Tpl.EntityType.CONTACT);
- Shell.get_contact_events(logManager,
- this._account, entity,
- SCROLLBACK_HISTORY_LINES,
- Lang.bind(this, this._displayPendingMessages));
+
+ logManager.get_filtered_events_async(this._account, entity,
+ Tpl.EventTypeMask.TEXT, SCROLLBACK_HISTORY_LINES,
+ null, Lang.bind(this, this._displayPendingMessages));
},
_displayPendingMessages: function(logManager, result) {
diff --git a/src/shell-tp-client.c b/src/shell-tp-client.c
index d64129e..69da10f 100644
--- a/src/shell-tp-client.c
+++ b/src/shell-tp-client.c
@@ -330,34 +330,6 @@ shell_tp_client_grab_contact_list_changed (ShellTpClient *self,
/* Telepathy utility functions */
-
-/**
- * shell_get_contact_events:
- * @log_manager: A #TplLogManager
- * @account: A #TpAccount
- * @entity: A #TplEntity
- * @num_events: The number of events to retrieve
- * @callback: (scope async): User callback to run when the contact is ready
- *
- * Wrap tpl_log_manager_get_filtered_events_async because gjs cannot support
- * multiple callbacks in the same function call.
- */
-void
-shell_get_contact_events (TplLogManager *log_manager,
- TpAccount *account,
- TplEntity *entity,
- guint num_events,
- GAsyncReadyCallback callback)
-{
- tpl_log_manager_get_filtered_events_async (log_manager,
- account,
- entity,
- TPL_EVENT_MASK_TEXT,
- num_events,
- NULL, NULL,
- callback, NULL);
-}
-
/* gjs doesn't allow us to craft a GError so we need a C wrapper */
void
shell_decline_dispatch_op (TpAddDispatchOperationContext *context,
diff --git a/src/shell-tp-client.h b/src/shell-tp-client.h
index 82094a0..7406b70 100644
--- a/src/shell-tp-client.h
+++ b/src/shell-tp-client.h
@@ -7,7 +7,6 @@
#include <glib-object.h>
#include <telepathy-glib/telepathy-glib.h>
-#include <telepathy-logger/telepathy-logger.h>
G_BEGIN_DECLS
@@ -103,12 +102,6 @@ void shell_tp_client_grab_contact_list_changed (ShellTpClient *self,
/* Telepathy utility functions */
-void shell_get_contact_events (TplLogManager *log_manager,
- TpAccount *account,
- TplEntity *entity,
- guint num_events,
- GAsyncReadyCallback callback);
-
void shell_decline_dispatch_op (TpAddDispatchOperationContext *context,
const gchar *message);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]