Remove TplEventDirection

TplEventDirection was redundant with the TplEntityType of the sender. In
all cases, if the sender is SELF then it's an outgoing message, otherwise
it's incoming.

8 files changed, 6 insertions, 62 deletions

diff --git a/telepathy-logger/channel-text.c b/telepathy-logger/channel-text.c
index a799781b7..f8a9a7386 100644
--- a/telepathy-logger/channel-text.c
+++ b/telepathy-logger/channel-text.c
@@ -1110,8 +1110,7 @@ on_sent_signal_cb (TpChannel *proxy,
 
   account = _tpl_channel_get_account (TPL_CHANNEL (tpl_text));
 
-  text_log = _tpl_event_text_new (log_id, account,
-      TPL_EVENT_DIRECTION_OUT);
+  text_log = _tpl_event_text_new (log_id, account);
   log = TPL_EVENT (text_log);
 
   _tpl_event_text_set_pending_msg_id (text_log,
@@ -1316,8 +1315,7 @@ on_received_signal_cb (TpChannel *proxy,
     }
 
   /* Initialize TplEventText (part 1) - chat_id still unknown */
-  text_log = _tpl_event_text_new (log_id, account,
-      TPL_EVENT_DIRECTION_IN);
+  text_log = _tpl_event_text_new (log_id, account);
   log = TPL_EVENT (text_log);
 
   _tpl_event_set_channel_path (log, channel_path);
diff --git a/telepathy-logger/event-internal.h b/telepathy-logger/event-internal.h
index f93665201..3dfa15766 100644
--- a/telepathy-logger/event-internal.h
+++ b/telepathy-logger/event-internal.h
@@ -57,9 +57,6 @@ struct _TplEventClass {
 void _tpl_event_set_timestamp (TplEvent *self,
     gint64 data);
 
-void _tpl_event_set_direction (TplEvent *self,
-    TplEventDirection data);
-
 void _tpl_event_set_id (TplEvent *self,
     const gchar *data);
 
@@ -75,8 +72,6 @@ void _tpl_event_set_receiver (TplEvent *self,
 const gchar * _tpl_event_get_id (TplEvent * self);
 const gchar * _tpl_event_get_channel_path (TplEvent *self);
 
-TplEventDirection _tpl_event_get_direction (TplEvent *self);
-
 gboolean _tpl_event_equal (TplEvent *self,
     TplEvent *data);
 
diff --git a/telepathy-logger/event-text-internal.h b/telepathy-logger/event-text-internal.h
index 39750f0ea..5a19b7210 100644
--- a/telepathy-logger/event-text-internal.h
+++ b/telepathy-logger/event-text-internal.h
@@ -53,8 +53,7 @@ struct _TplEventTextClass
 };
 
 TplEventText * _tpl_event_text_new (const gchar* log_id,
-    TpAccount *account,
-    TplEventDirection direction);
+    TpAccount *account);
 
 TpChannelTextMessageType _tpl_event_text_message_type_from_str (
     const gchar *type_str);
diff --git a/telepathy-logger/event-text.c b/telepathy-logger/event-text.c
index 995a4fcc6..838e3714a 100644
--- a/telepathy-logger/event-text.c
+++ b/telepathy-logger/event-text.c
@@ -222,13 +222,11 @@ tpl_event_text_init (TplEventText *self)
 
 TplEventText *
 _tpl_event_text_new (const gchar *log_id,
-    TpAccount *account,
-    TplEventDirection direction)
+    TpAccount *account)
 {
   return g_object_new (TPL_TYPE_EVENT_TEXT,
       "log-id", log_id,
       "account", account,
-      "direction", direction,
       NULL);
 }
 
diff --git a/telepathy-logger/event.c b/telepathy-logger/event.c
index e24509a95..4f99e86cd 100644
--- a/telepathy-logger/event.c
+++ b/telepathy-logger/event.c
@@ -84,9 +84,6 @@ struct _TplEventPriv
   TpAccount *account;
   gchar *channel_path;
 
-  /* incoming/outgoing */
-  TplEventDirection direction;
-
   /* message and receiver may be NULL depending on the signal. ie. status
    * changed signals set only the sender */
   TplEntity *sender;
@@ -96,7 +93,6 @@ struct _TplEventPriv
 enum {
     PROP_TIMESTAMP = 1,
     PROP_LOG_ID,
-    PROP_DIRECTION,
     PROP_ID,
     PROP_ACCOUNT,
     PROP_ACCOUNT_PATH,
@@ -151,8 +147,6 @@ tpl_event_get_property (GObject *object,
       case PROP_LOG_ID:
         g_value_set_string (value, priv->log_id);
         break;
-      case PROP_DIRECTION:
-        g_value_set_uint (value, priv->direction);
         break;
       case PROP_ID:
         g_value_set_string (value, priv->id);
@@ -194,9 +188,6 @@ tpl_event_set_property (GObject *object,
       case PROP_LOG_ID:
         tpl_event_set_log_id (self, g_value_get_string (value));
         break;
-      case PROP_DIRECTION:
-        _tpl_event_set_direction (self, g_value_get_uint (value));
-        break;
       case PROP_ID:
         _tpl_event_set_id (self, g_value_get_string (value));
         break;
@@ -254,13 +245,6 @@ tpl_event_class_init (TplEventClass *klass)
       G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
   g_object_class_install_property (object_class, PROP_LOG_ID, param_spec);
 
-  param_spec = g_param_spec_uint ("direction",
-      "Direction",
-      "The direction of the log event (in/out)",
-      0, G_MAXUINT32, TPL_EVENT_DIRECTION_NONE,
-      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_DIRECTION, param_spec);
-
   param_spec = g_param_spec_string ("id",
       "Id",
       "The event identifier to which the log event is related.",
@@ -338,15 +322,6 @@ _tpl_event_get_log_id (TplEvent *self)
 }
 
 
-TplEventDirection
-_tpl_event_get_direction (TplEvent *self)
-{
-  g_return_val_if_fail (TPL_IS_EVENT (self),
-      TPL_EVENT_DIRECTION_NONE);
-
-  return self->priv->direction;
-}
-
 /**
  * tpl_event_get_sender
  * @self: a #TplEvent
@@ -437,17 +412,6 @@ tpl_event_set_log_id (TplEvent *self,
 
 
 void
-_tpl_event_set_direction (TplEvent *self,
-    TplEventDirection data)
-{
-  g_return_if_fail (TPL_IS_EVENT (self));
-
-  self->priv->direction = data;
-  g_object_notify (G_OBJECT (self), "direction");
-}
-
-
-void
 _tpl_event_set_sender (TplEvent *self,
     TplEntity *data)
 {
diff --git a/telepathy-logger/event.h b/telepathy-logger/event.h
index 4dde59231..79186a923 100644
--- a/telepathy-logger/event.h
+++ b/telepathy-logger/event.h
@@ -42,14 +42,6 @@ typedef struct _TplEventPriv TplEventPriv;
 
 GType tpl_event_get_type (void);
 
-typedef enum
-{
-  TPL_EVENT_DIRECTION_NONE = 0,
-
-  TPL_EVENT_DIRECTION_IN,
-  TPL_EVENT_DIRECTION_OUT
-} TplEventDirection;
-
 gint64 tpl_event_get_timestamp (TplEvent *self);
 
 const gchar *tpl_event_get_account_path (TplEvent *self);
diff --git a/telepathy-logger/log-store-xml.c b/telepathy-logger/log-store-xml.c
index ab08e331c..589193d37 100644
--- a/telepathy-logger/log-store-xml.c
+++ b/telepathy-logger/log-store-xml.c
@@ -883,11 +883,10 @@ log_store_xml_get_events_for_file (TplLogStoreXml *self,
           g_free (instead_of_channel_path);
         }
 
-      message = _tpl_event_text_new (log_id, account, TPL_EVENT_DIRECTION_NONE);
+      message = _tpl_event_text_new (log_id, account);
       event = TPL_EVENT (message);
 
-      _tpl_event_text_set_pending_msg_id (message,
-          pending_id);
+      _tpl_event_text_set_pending_msg_id (message, pending_id);
       _tpl_event_set_sender (event, sender);
       _tpl_event_set_timestamp (event, t);
       _tpl_event_text_set_message (message, body);
diff --git a/tests/test-tpl-log-manager.c b/tests/test-tpl-log-manager.c
index 9d531ecd0..124848267 100644
--- a/tests/test-tpl-log-manager.c
+++ b/tests/test-tpl-log-manager.c
@@ -4,7 +4,6 @@
 
 #define LOG_ID 0
 #define CHAT_ID "echo@test.collabora.co.uk"
-#define DIRECTION TPL_ENTRY_DIRECTION_IN
 
 int main (int argc, char **argv)
 {