Request all event fields in one call

diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index 020c37f..cf73261 100644 (file)
--- a/src/el-home-applet.c
+++ b/src/el-home-applet.c
@@ -767,41 +767,46 @@ static void
 show_event (ELHomeApplet *self, RTComElIter *it)
 {
         ELHomeAppletPrivate *priv = self->priv;
-        gchar *remote = NULL;
+        const gchar *remote = NULL;
         gchar *received = NULL;
-        /* const gchar *icon_name = NULL; */
+        GValueArray *event = NULL;
 
         if (it && rtcom_el_iter_first (it)) {
-                rtcom_el_iter_dup_string (it, "free-text", &priv->message);
-                if (priv->message) {
-                        /* const gchar *service; */
-                        time_t received_t;
 
-                        rtcom_el_iter_get_int (it, "id", &priv->event_id);
-                        if (rtcom_el_iter_get_int (it, "start-time", (gint*)&received_t))
-                                received = format_time (received_t);
-
-                        if (rtcom_el_iter_dup_string (it, "remote-uid", &priv->remote_id)) {
-                                if (priv->remote_id && priv->remote_id[0])  {
-                                        if (!rtcom_el_iter_dup_string (it, "remote-name", &remote))
-                                                remote = g_strdup (priv->remote_id);
-
-                                        rtcom_el_iter_dup_string (it, "remote-ebook-uid", &priv->contact_id);
-                                        rtcom_el_iter_dup_string (it, "local-uid", &priv->local_id);
-                                }
-                                else if (priv->remote_id) {
-                                        g_free (priv->remote_id);
-                                        priv->remote_id = NULL;
-                                }
+                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));
+                        received = format_time (received_t);
+                        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);
                         }
-                        rtcom_el_iter_dup_string (it, "group-uid", &priv->group_uid);
-#if 0
-                        service = rtcom_el_iter_get_service (it);
-                        if (!g_strcmp0 (service, "RTCOM_EL_SERVICE_SMS"))
-                                icon_name = "chat_unread_sms";
-                        else if (!g_strcmp0 (service, "RTCOM_EL_SERVICE_CHAT"))
-                                icon_name = "chat_unread_chat";
-#endif
+                        else if (priv->remote_id) {
+                                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 {
@@ -819,28 +824,10 @@ show_event (ELHomeApplet *self, RTComElIter *it)
 
         gtk_label_set_text (GTK_LABEL (priv->received), received);
 
-#if 0
-        gtk_widget_hide (priv->avatar);
-        if (icon_name) {
-                const gchar *current_icon_name;
-                gtk_image_get_icon_name (GTK_IMAGE (priv->icon),
-                                         &current_icon_name,
-                                         NULL);
-                if (g_strcmp0 (current_icon_name, icon_name))
-                        gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
-                                                      icon_name,
-                                                      HILDON_ICON_SIZE_FINGER);
-                gtk_widget_show (priv->icon);
-        }
-        else
-                gtk_widget_hide (priv->icon);
-#endif
-
         if (remote)
                 gtk_label_set_text (GTK_LABEL (priv->sender), remote);
         else
                 gtk_label_set_text (GTK_LABEL (priv->sender), priv->remote_id);
-        g_free (remote);
 
         stop_scroll_anim (priv);
         priv->scroll_offset = 0;
@@ -849,6 +836,9 @@ 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));
 }