X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fel-home-applet.c;h=511fd22120be2ccf8af81b147616affb1da1f2fe;hb=0a1aba622c30318dba749d269b464d660d4c7775;hp=6254576a94b54b4904570a7db8ff9ad494880601;hpb=da87b4f29a564fc648cc2d62cecdb2c05badc9e0;p=conv-inbox

diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index 6254576..511fd22 100644
--- a/src/el-home-applet.c
+++ b/src/el-home-applet.c
@@ -85,8 +85,8 @@
 static const gchar *conv_services[] = {"RTCOM_EL_SERVICE_SMS",
                                        "RTCOM_EL_SERVICE_CHAT",
                                        NULL};
-static const gchar *conv_event_types[] = {"RTCOM_EL_EVENTTYPE_SMS_INBOUND",
-                                          "RTCOM_EL_EVENTTYPE_CHAT_INBOUND",
+static const gchar *conv_event_types[] = {"RTCOM_EL_EVENTTYPE_SMS_MESSAGE",
+                                          "RTCOM_EL_EVENTTYPE_CHAT_MESSAGE",
                                           NULL};
 
 typedef enum {
@@ -720,7 +720,7 @@ contacts_added (OssoABookRoster  *roster,
 }
 
 static void
-reset_contact (ELHomeApplet *self)
+reset_contact (ELHomeApplet *self, gboolean resize)
 {
         ELHomeAppletPrivate *priv = self->priv;
 
@@ -742,7 +742,8 @@ reset_contact (ELHomeApplet *self)
                 priv->contact = NULL;
         }
 
-        resize_sender (priv);
+        if (resize)
+                resize_sender (priv);
 }
 
 static void
@@ -759,13 +760,13 @@ contacts_removed (OssoABookRoster *roster,
 
                 for (contact_id = ids; *contact_id; contact_id++) {
                         if (strcmp (*contact_id, priv->contact_id) == 0) {
-                                reset_contact (self);
+                                reset_contact (self, TRUE);
 
                                 gtk_widget_queue_draw (GTK_WIDGET (self));
                                 return;
                         }
                         if (strcmp (*contact_id, uid) == 0) {
-                                reset_contact (self);
+                                reset_contact (self, TRUE);
                                 resolve_contact (self);
                                 gtk_widget_queue_draw (GTK_WIDGET (self));
                                 return;
@@ -775,11 +776,11 @@ contacts_removed (OssoABookRoster *roster,
 }
 
 static void
-clean_contact (ELHomeApplet *self)
+clean_contact (ELHomeApplet *self, gboolean resize)
 {
         ELHomeAppletPrivate *priv = self->priv;
 
-        reset_contact (self);
+        reset_contact (self, resize);
 
         if (priv->aggregator) {
                 if (priv->aggregator_ready_closure){
@@ -852,7 +853,7 @@ dispose (GObject *self)
         }
 
         clean_state (EL_HOME_APPLET (self));
-        clean_contact (EL_HOME_APPLET (self));
+        clean_contact (EL_HOME_APPLET (self), FALSE);
 
         G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self);
 }
@@ -975,62 +976,43 @@ static void
 show_event (ELHomeApplet *self, RTComElIter *it)
 {
         ELHomeAppletPrivate *priv = self->priv;
-        const gchar *remote = NULL;
+        gchar *remote = NULL;
         gchar *received = NULL;
-        GValueArray *event = NULL;
 
         if (it && rtcom_el_iter_first (it)) {
-
-                event = rtcom_el_iter_get_valuearray (it,
-                                                      "id",
-                                                      "start-time",
-                                                      "local-uid",
-                                                      "remote-uid",
-                                                      "remote-name",
-                                                      "remote-ebook-uid",
-                                                      "free-text",
-                                                      "group-uid",
-                                                      NULL);
-                if (event) {
-                        time_t received_t;
-#define _VARR_DUP_STR(array, i) g_value_dup_string (g_value_array_get_nth ((array), (i)))
-
-                        priv->event_id = g_value_get_int (g_value_array_get_nth (event, 0));
-                        received_t = g_value_get_int (g_value_array_get_nth (event, 1));
+                time_t received_t;
+
+                if (rtcom_el_iter_get_values (it,
+                                              "id", &priv->event_id,
+                                              "start-time", &received_t,
+                                              "local-uid", &priv->local_id,
+                                              "remote-uid", &priv->remote_id,
+                                              "remote-name", &remote,
+                                              "remote-ebook-uid", &priv->contact_id,
+                                              "free-text", &priv->message,
+                                              "group-uid", &priv->group_uid,
+                                              NULL)) {
                         received = format_time (received_t, priv->time_fmt_24h);
-                        priv->local_id = _VARR_DUP_STR (event, 2);
-                        priv->remote_id = _VARR_DUP_STR (event, 3);
-                        if (priv->remote_id && priv->remote_id[0]) {
-                                remote = g_value_get_string (g_value_array_get_nth (event, 4));
-                                if (!remote)
-                                        remote = priv->remote_id;
-                                priv->contact_id = _VARR_DUP_STR (event, 5);
-                        }
-                        else if (priv->remote_id) {
+
+                        if (priv->remote_id && !priv->remote_id[0]) {
                                 g_free (priv->remote_id);
                                 priv->remote_id = NULL;
                         }
-
-                        priv->message = _VARR_DUP_STR (event, 6);
-                        priv->group_uid = _VARR_DUP_STR (event, 7);
-
-#undef _VARR_DUP_STR
                 }
+                else
+                        priv->event_id = -1;
         }
-        else {
+        else
                 priv->event_id = -1;
-        }
 
-        if (priv->message) {
+        if (priv->message)
                 gtk_widget_hide (priv->empty);
-        }
-        else {
+        else
                 gtk_widget_show (priv->empty);
-        }
 
         gtk_label_set_text (GTK_LABEL (priv->received), received);
 
-        if (remote)
+        if (remote && remote[0])
                 gtk_label_set_text (GTK_LABEL (priv->sender), remote);
         else
                 gtk_label_set_text (GTK_LABEL (priv->sender), priv->remote_id);
@@ -1042,9 +1024,6 @@ show_event (ELHomeApplet *self, RTComElIter *it)
                 priv->message_surface = NULL;
         }
 
-        if (event)
-                g_value_array_free (event);
-
         gtk_widget_hide (priv->cut_message);
         gtk_widget_queue_draw (GTK_WIDGET (self));
 }
@@ -1065,6 +1044,7 @@ make_query (RTComEl *el, gint event_id)
         else {
                 rtcom_el_query_prepare (query,
                                         "is-read", FALSE, RTCOM_EL_OP_EQUAL,
+                                        "outgoing", FALSE, RTCOM_EL_OP_EQUAL,
                                         "service", conv_services, RTCOM_EL_OP_IN_STRV,
                                         "event-type", conv_event_types, RTCOM_EL_OP_IN_STRV,
                                         NULL);
@@ -1222,7 +1202,7 @@ read_event (ELHomeApplet *self)
                 if (g_strcmp0 (priv->remote_id, remote_id) ||
                     new_account ||
                     !priv->contact) {
-                        clean_contact (self);
+                        clean_contact (self, TRUE);
                         start_aggregator (self);
                 }
                 else if (priv->contact) {
@@ -1287,7 +1267,7 @@ read_event (ELHomeApplet *self)
                                     dgettext ("rtcom-messaging-ui",
                                               "messaging_ap_conversations"));
 
-                clean_contact (self);
+                clean_contact (self, TRUE);
                 gtk_widget_hide (priv->icon);
         }