From: Artem Garmash <artemgarmash@gmail.com>
Date: Sun, 7 Mar 2010 20:55:53 +0000 (+0200)
Subject: Use el 1
X-Git-Url: http://git.maemo.org/git/?p=conv-inbox;a=commitdiff_plain;h=0a1aba622c30318dba749d269b464d660d4c7775

Use el 1
---

diff --git a/configure.ac b/configure.ac
index 2585eba..e541fae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.53)
-AC_INIT(conversations-inbox-widget, 1.0.4)
+AC_INIT(conversations-inbox-widget, 1.1.0)
 AM_INIT_AUTOMAKE([-Wall])
 AC_CONFIG_SRCDIR(src/el-home-applet.c)
 AM_CONFIG_HEADER(config.h)
@@ -12,7 +12,7 @@ AM_PATH_GLIB_2_0([2.16.0])
 CFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls"
 
 PKG_CHECK_MODULES([LIBEVENT_LOGGER],
-                  [rtcom-eventlogger])
+                  [rtcom-eventlogger >= 1.2])
 
 hildonhomedesktopentrydir=`pkg-config libhildondesktop-1 --variable=hildonhomedesktopentrydir`
 AC_SUBST(hildonhomedesktopentrydir)
diff --git a/debian/changelog b/debian/changelog
index b0ebc60..2761b49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+conversations-inbox-widget (1.1.0) unstable; urgency=low
+
+  * Use new eventlogger 1
+
+ -- Artem Garmash <artemgarmash@gmail.com>  Sun,  7 Mar 2010 22:54:37 +0200
+
 conversations-inbox-widget (1.0.4) unstable; urgency=low
 
   * Show the reboot note only during upgrade
diff --git a/debian/control b/debian/control
index 95c19f9..b4cc610 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: conversations-inbox-widget
 Priority: extra
 Section: user/desktop
 Maintainer: Artem Garmash <artemgarmash@gmail.com>
-Build-Depends: debhelper (>= 4.0.0), cdbs, autotools-dev, librtcom-eventlogger-dev,
+Build-Depends: debhelper (>= 4.0.0), cdbs, autotools-dev, librtcom-eventlogger-dev (>= 1.2),
  libhildondesktop1-dev (>= 2.1.7), libtelepathy-glib-dev, librtcom-telepathy-glib-dev,
  libosso-abook-dev
 Standards-Version: 3.6.2
diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index 930b474..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 {
@@ -976,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);
@@ -1043,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));
 }
@@ -1066,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);