Plub mem leak
[conv-inbox] / src / el-home-applet.c
index 5835938..77c3c4c 100644 (file)
 
 #include "config.h"
 #include "el-home-applet.h"
-
+#include <libintl.h>
 #include <hildon/hildon.h>
 #include <rtcom-eventlogger/eventlogger.h>
 #include <sqlite3.h>
 #include <string.h>
+#include <gconf/gconf-client.h>
+#include <libosso-abook/osso-abook-init.h>
+#include <libosso-abook/osso-abook-aggregator.h>
+#include <libosso-abook/osso-abook-contact.h>
+#include <libosso-abook/osso-abook-waitable.h>
+#include <libosso-abook/osso-abook-presence.h>
+#include <libosso-abook/osso-abook-touch-contact-starter.h>
+#include <libosso-abook/osso-abook-temporary-contact-dialog.h>
+#include <libosso-abook/osso-abook-account-manager.h>
+
+#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/dbus.h>
+#include <rtcom-telepathy-glib/extensions.h>
 
 #define EL_HOME_APPLET_GET_PRIVATE(obj) ( \
         G_TYPE_INSTANCE_GET_PRIVATE (obj, \
                 EL_TYPE_HOME_APPLET, ELHomeAppletPrivate))
 
 #define BOX_WIDTH 352
-#define BOX_HEIGHT 252
+#define BOX_HEIGHT 284
 
-#define C_WIDTH (BOX_WIDTH - 2*HILDON_MARGIN_HALF)
-#define C_HEIGHT (BOX_HEIGHT - 2*HILDON_MARGIN_HALF)
-#define C_X HILDON_MARGIN_HALF
-#define C_Y HILDON_MARGIN_HALF
+#define CONTENT_OFFSET_X HILDON_MARGIN_HALF
+#define CONTENT_OFFSET_Y_TOP 4*HILDON_MARGIN_HALF
+#define CONTENT_OFFSET_Y_BOTTOM HILDON_MARGIN_HALF
+#define C_WIDTH (BOX_WIDTH - 2*CONTENT_OFFSET_X)
+#define C_HEIGHT (BOX_HEIGHT - (CONTENT_OFFSET_Y_TOP + CONTENT_OFFSET_Y_BOTTOM))
 
 #define HEADER_HEIGHT 48
-#define MESSAGE_HEIGHT (C_HEIGHT - HEADER_HEIGHT)
+#define FOOTER_HEIGHT 24
+#define FOOTER_HEIGHT_PRESS FOOTER_HEIGHT*2 /* approx, used only for checking clicks */
+#define FOOTER_WIDTH C_WIDTH/4
+#define FOOTER_WIDTH_PRESS (FOOTER_WIDTH + FOOTER_WIDTH/2) /* approx, used only for checking clicks, bigger than controls */
+
+#define MESSAGE_HEIGHT (C_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT)
 #define MESSAGE_WIDTH (C_WIDTH - 2*HILDON_MARGIN_DEFAULT)
 
-#define BOX_RADIOUS 10
+#define AVATAR_SIZE HILDON_ICON_PIXEL_SIZE_THUMB
+
+#define AVATAR_X (C_WIDTH - AVATAR_SIZE - HILDON_MARGIN_DEFAULT)
+#define AVATAR_Y 3*HILDON_MARGIN_HALF
+
+#define BOX_RADIOUS 20
+
+#define SCROLL_PERIOD 100 /* ms */
+#define SCROLL_STEP 1 /* pixel */
+#define TEXT_Y_OFFSET (HEADER_HEIGHT + HILDON_MARGIN_HALF)
+
+#define NOTIFICATION_UI_DBUS_NAME     "org.freedesktop.Telepathy.Client.NotificationUI"
+#define NOTIFICATION_UI_DBUS_PATH     "/org/freedesktop/Telepathy/Client/NotificationUI"
+#define NOTIFICATION_UI_DBUS_IFACE    "com.nokia.RtcomNotificationUi"
+
+#define CONVERSATIONS_UI_DBUS_NAME     "com.nokia.MessagingUI"
+#define CONVERSATIONS_UI_DBUS_PATH     "/com/nokia/MessagingUI"
+#define CONVERSATIONS_UI_DBUS_IFACE    "com.nokia.MessagingUI"
+
+static const gchar *conv_services[] = {"RTCOM_EL_SERVICE_SMS",
+                                       "RTCOM_EL_SERVICE_CHAT",
+                                       NULL};
+static const gchar *conv_event_types[] = {"RTCOM_EL_EVENTTYPE_SMS_MESSAGE",
+                                          "RTCOM_EL_EVENTTYPE_CHAT_MESSAGE",
+                                          NULL};
+
+typedef enum {
+        SELECTED_NONE,
+        SELECTED_HEADER,
+        SELECTED_BODY,
+        SELECTED_FOOTER
+} WidgetActiveSelection;
 
 struct _ELHomeAppletPrivate
 {
         RTComEl *eventlogger;
 
         GtkWidget *sender;
-        GtkWidget *message;
         GtkWidget *icon;
         GtkWidget *unread;
         GtkWidget *received;
+        GtkWidget *cut_message;
+
+        /* empty view*/
+        GtkWidget *empty;
+        GtkWidget *sms_total;
+        GtkWidget *chat_total;
 
-        gint       event_id;
+        gchar *message;
+        gint event_id;
 
-        gboolean   active;
+        WidgetActiveSelection active;
 
         guint unread_count;
 
-        const gchar *current_font;
+        struct {
+                float red;
+                float green;
+                float blue;
+        } active_color;
+        PangoFontDescription *font_desc;
+
+        GdkPixbuf *avatar_pixbuf;
+        GdkPixbuf *presence_pixbuf;
 
         guint idle_id;
-        /* new or updated event id */
-        gint  new_event_id;
+
+        cairo_surface_t *message_surface;
+
+        gboolean scroll_on_click;
+        gint scroll_offset;
+        gint hidden_message_height;
+        guint scroll_anim_id;
+
+        OssoABookRoster *aggregator;
+        OssoABookWaitableClosure *aggregator_ready_closure;
+        gchar *contact_id;
+        gchar *remote_id;
+        gchar *local_id;
+        gchar *group_uid;
+        OssoABookContact *contact;
+
+        gboolean time_fmt_24h;
+
+        guint init_timer;
 };
 
 HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM);
 
-const gchar* g_module_check_init(GModule *module);
+const gchar* g_module_check_init (GModule *module);
 const gchar*
-g_module_check_init(GModule *module)
+g_module_check_init (GModule *module)
 {
-       g_module_make_resident (module);
-       return NULL;
+        g_module_make_resident (module);
+        return NULL;
 }
 
 static void
@@ -99,50 +180,208 @@ el_home_applet_realize (GtkWidget *widget)
         GTK_WIDGET_CLASS (el_home_applet_parent_class)->realize (widget);
 }
 
-/*
- * Thanks http://cairographics.org/cookbook/roundedrectangles/
+enum {
+        ROUND_CORNER_TL = 1,
+        ROUND_CORNER_TR = 1<<1,
+        ROUND_CORNER_BL = 1<<2,
+        ROUND_CORNER_BR = 1<<3,
+        ROUND_CORNER_ALL = ROUND_CORNER_TL | ROUND_CORNER_TR |
+                           ROUND_CORNER_BL | ROUND_CORNER_BR
+};
+
+/**
+ * Draw rectangle with optional round corners.
+ *
+ * @x
+ * @y
+ * @w width
+ * @h height
+ * @r round corner radious
+ * @round_corners define which corners draw round, ROUND_CORNER_TL,
+ *                ROUND_CORNER_TR, ROUND_CORNER_BL, ROUND_CORNER_BR
  */
 static void
 rounded_rectangle (cairo_t *cr,
-                   double   x,
-                   double   y,
-                   double   w,
-                   double   h,
-                   double   r)
-{
-        cairo_move_to (cr, x + r, y);
-        cairo_line_to (cr, x + w - r, y);
-        cairo_curve_to (cr, x + w, y,
-                        x + w, y,
-                        x + w, y + r);
-        cairo_line_to (cr, x + w, y + h - r);
-        cairo_curve_to (cr, x + w, y + h,
-                        x + w, y + h,
-                        x + w - r, y + h);
-        cairo_line_to (cr, x + r, y + h);
-        cairo_curve_to (cr, x, y + h,
-                        x, y + h,
-                        x, y + h - r);
-        cairo_line_to (cr, x, y + r);
-        cairo_curve_to (cr, x, y,
-                        x, y,
-                        x + r, y);
+                   double x,
+                   double y,
+                   double w,
+                   double h,
+                   double r,
+                   guint round_corners)
+{
+        if (round_corners & ROUND_CORNER_TL)
+                cairo_move_to (cr, x + r, y);
+        else
+                cairo_move_to (cr, x, y);
+
+        if (round_corners & ROUND_CORNER_TR) {
+                cairo_line_to (cr, x + w - r, y);
+                cairo_rel_curve_to (cr,
+                                    r, 0,
+                                    r, 0,
+                                    r, r);
+        }
+        else
+                cairo_line_to (cr, x + w, y);
+
+        if (round_corners & ROUND_CORNER_BR) {
+                cairo_line_to (cr, x + w, y + h - r);
+                cairo_rel_curve_to (cr,
+                                    0, r,
+                                    0, r,
+                                    -r, r);
+        }
+        else
+                cairo_line_to (cr, x + w, y + h);
+
+        if (round_corners & ROUND_CORNER_BL) {
+                cairo_line_to (cr, x + r, y + h);
+                cairo_rel_curve_to (cr,
+                                    -r, 0,
+                                    -r, 0,
+                                    -r, -r);
+        }
+        else
+                cairo_line_to (cr, x, y + h);
+
+        if (round_corners & ROUND_CORNER_TL) {
+                cairo_line_to (cr, x, y + r);
+                cairo_rel_curve_to (cr,
+                                    0, -r,
+                                    0, -r,
+                                    r, -r);
+        }
+        else
+                cairo_line_to (cr, x, y);
+}
+
+static cairo_surface_t*
+draw_text (cairo_t              *cr,
+           PangoFontDescription *desc,
+           const gchar          *text,
+           gint                  width,
+           gint                 *height)
+{
+        PangoLayout *layout;
+        PangoRectangle extent;
+
+        cairo_surface_t *gdk_surface, *result_surface;
+        cairo_t *msg_cr;
+
+        /* Create a PangoLayout, set the font and text */
+        layout = pango_cairo_create_layout (cr);
+        pango_layout_set_text (layout,
+                               text,
+                               -1);
+        pango_layout_set_font_description (layout, desc);
+
+        pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR);
+        pango_layout_set_width (layout, PANGO_SCALE*width);
+
+        pango_layout_get_pixel_extents (layout, NULL, &extent);
+        *height = extent.height;
+
+        gdk_surface = cairo_get_target (cr);
+        result_surface = cairo_surface_create_similar
+                (gdk_surface,
+                 CAIRO_CONTENT_COLOR_ALPHA,
+                 width,
+                 extent.height);
+        msg_cr = cairo_create (result_surface);
+
+        pango_cairo_update_layout (msg_cr, layout);
+        /* draw shadow */
+        cairo_move_to (msg_cr, 1, 1);
+        cairo_set_source_rgba (msg_cr, 0.2, 0.2, 0.2, 0.8);
+        pango_cairo_show_layout (msg_cr, layout);
+
+        /* draw fg */
+        cairo_move_to (msg_cr, 0, 0);
+        cairo_set_source_rgba (msg_cr, 1.0, 1.0, 1.0, 1.0);
+        pango_cairo_show_layout (msg_cr, layout);
+
+        cairo_destroy (msg_cr);
+        g_object_unref (layout);
+
+        return result_surface;
 }
 
 static gboolean
-expose_event (GtkWidget *self, GdkEventExpose *event)
+stop_scroll_anim (ELHomeAppletPrivate *priv)
 {
-        ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv;
+        gboolean result = priv->scroll_anim_id > 0;
 
-        cairo_t *cr;
+        if (result) {
+                g_source_remove (priv->scroll_anim_id);
+                priv->scroll_anim_id = 0;
+                priv->scroll_on_click = FALSE;
+                gtk_widget_hide (priv->cut_message);
+        }
+
+        return result;
+}
+
+static void
+style_set_cb (GtkWidget *widget,
+              GtkStyle  *previous_style,
+              ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
         GdkColor color;
-        float red, green, blue;
+        GtkStyle *font_style;
+
+        font_style = gtk_rc_get_style_by_paths (gtk_widget_get_settings (widget),
+                                                "SystemFont",
+                                                NULL,
+                                                G_TYPE_NONE);
+        if (font_style && font_style->font_desc) {
+                if (priv->font_desc)
+                        pango_font_description_free (priv->font_desc);
+                priv->font_desc = pango_font_description_copy (font_style->font_desc);
+        }
+
+        if (gtk_style_lookup_color (widget->style,
+                                    "ActiveTextColor",
+                                    &color)) {
+                priv->active_color.red = color.red/(float)G_MAXUINT16;
+                priv->active_color.green = color.green/(float)G_MAXUINT16;
+                priv->active_color.blue = color.blue/(float)G_MAXUINT16;
+        }
+}
+
+static void
+reset_scroll (ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+
+        if (stop_scroll_anim (self->priv)) {
+                priv->scroll_on_click = TRUE;/* priv->scroll_offset; */
+                priv->scroll_offset = 0;
+                if (priv->scroll_on_click)
+                        gtk_widget_show (priv->cut_message);
+        }
+}
+
+static void
+notify_on_current_desktop (GObject      *object,
+                           GParamSpec   *unused G_GNUC_UNUSED,
+                           ELHomeApplet *self)
+{
+        gboolean on;
+
+        g_object_get (object, "is-on-current-desktop", &on, NULL);
+        if (!on) {
+                reset_scroll (self);
+                gtk_widget_queue_draw (GTK_WIDGET (self));
+        }
+}
 
-        /* find theme active color */
-        gtk_style_lookup_color (self->style, "ActiveTextColor", &color);
-        red = color.red/(float)G_MAXUINT16;
-        green = color.green/(float)G_MAXUINT16;
-        blue = color.blue/(float)G_MAXUINT16;
+static gboolean
+expose_event (GtkWidget *self, GdkEventExpose *event)
+{
+        ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv;
+        cairo_t *cr;
+        cairo_pattern_t *grad;
 
         cr = gdk_cairo_create (self->window);
         gdk_cairo_region (cr, event->region);
@@ -150,62 +389,200 @@ expose_event (GtkWidget *self, GdkEventExpose *event)
 
         cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
+        /* draw bound box */
         cairo_set_source_rgba (cr, 0.4f, 0.4f, 0.4f, 0.1f);
         cairo_set_line_width (cr, 3.0f);
 
         rounded_rectangle (cr,
-                           C_X,
-                           C_Y,
-                           BOX_WIDTH - 2*C_X,
-                           BOX_HEIGHT - 2*C_Y,
-                           BOX_RADIOUS);
-
-        cairo_close_path(cr);
+                           CONTENT_OFFSET_X,
+                           CONTENT_OFFSET_Y_TOP,
+                           BOX_WIDTH - 2*CONTENT_OFFSET_X,
+                           BOX_HEIGHT - (CONTENT_OFFSET_Y_TOP + CONTENT_OFFSET_Y_BOTTOM),
+                           BOX_RADIOUS,
+                           ROUND_CORNER_ALL);
+
+        cairo_close_path (cr);
         cairo_stroke (cr);
 
+        /* draw header */
         cairo_set_line_width (cr, 1.0f);
 
-        cairo_translate (cr, C_X, C_Y);
-        cairo_move_to (cr, 0, HEADER_HEIGHT);
-        cairo_line_to (cr, 0, BOX_RADIOUS);
-        cairo_curve_to (cr, 0, 0, 0, 0, BOX_RADIOUS, 0);
-        cairo_line_to (cr, C_WIDTH - BOX_RADIOUS, 0);
-        cairo_curve_to (cr, C_WIDTH, 0, C_WIDTH, 0, C_WIDTH, BOX_RADIOUS);
-        cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT);
-        cairo_line_to (cr, 0, HEADER_HEIGHT);
-
-        cairo_close_path(cr);
+        cairo_translate (cr, CONTENT_OFFSET_X, CONTENT_OFFSET_Y_TOP);
+        rounded_rectangle (cr,
+                           0, 0,
+                           C_WIDTH, HEADER_HEIGHT,
+                           BOX_RADIOUS,
+                           ROUND_CORNER_TL | ROUND_CORNER_TR);
+        cairo_close_path (cr);
+
+        switch (priv->active) {
+        case SELECTED_HEADER:
+                cairo_set_source_rgba (cr,
+                                       priv->active_color.red,
+                                       priv->active_color.green,
+                                       priv->active_color.blue,
+                                       0.8f);
+                break;
+        default:
+                cairo_set_source_rgba (cr, 0.2f, 0.2f, 0.2f, 0.8f);
+        }
 
-        cairo_set_source_rgba (cr, 0.2f, 0.2f, 0.2f, 0.8f);
-        cairo_fill_preserve (cr);
-        cairo_set_source_rgba (cr, red, green, blue, 1.0f);
-        cairo_stroke (cr);
+        cairo_fill (cr);
 
         cairo_move_to (cr, 0, HEADER_HEIGHT);
-        cairo_line_to (cr, 0, C_HEIGHT - BOX_RADIOUS);
-        cairo_curve_to (cr, 0, C_HEIGHT, 0, C_HEIGHT, BOX_RADIOUS, C_HEIGHT);
-        cairo_line_to (cr, C_WIDTH - BOX_RADIOUS, C_HEIGHT);
-        cairo_curve_to (cr, C_WIDTH, C_HEIGHT, C_WIDTH, C_HEIGHT, C_WIDTH, C_HEIGHT - BOX_RADIOUS);
         cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT);
-        cairo_line_to (cr, 0, HEADER_HEIGHT);
-        cairo_close_path(cr);
+        cairo_set_source_rgba (cr,
+                               priv->active_color.red,
+                               priv->active_color.green,
+                               priv->active_color.blue,
+                               1.0f);
+        cairo_stroke (cr);
 
-        if (priv->active)
-                cairo_set_source_rgba (cr, red, green, blue, 0.8f);
+        /* draw body */
+        if (!priv->message) {
+                rounded_rectangle (cr,
+                                   0, HEADER_HEIGHT,
+                                   C_WIDTH, C_HEIGHT,
+                                   BOX_RADIOUS,
+                                   ROUND_CORNER_BL | ROUND_CORNER_BR);
+                cairo_close_path (cr);
+        }
         else
-                cairo_set_source_rgba (cr, 0.4f, 0.4f, 0.4f, 0.8f);
+                cairo_rectangle (cr, 0, HEADER_HEIGHT,
+                                 C_WIDTH, MESSAGE_HEIGHT);
+
+        /* draw body filling depending on (in)active state */
+        grad = cairo_pattern_create_linear (0, HEADER_HEIGHT,
+                                            0, C_HEIGHT - FOOTER_HEIGHT);
+
+        switch (priv->active) {
+        case SELECTED_BODY:
+                cairo_pattern_add_color_stop_rgba (grad,
+                                                   0.5f,
+                                                   priv->active_color.red,
+                                                   priv->active_color.green,
+                                                   priv->active_color.blue,
+                                                   0.8f);
+                cairo_pattern_add_color_stop_rgba (grad,
+                                                   1.0f,
+                                                   priv->active_color.red/2,
+                                                   priv->active_color.green/2,
+                                                   priv->active_color.blue/2,
+                                                   0.8f);
+                break;
+        default:
+                cairo_pattern_add_color_stop_rgba (grad, 0.5f,
+                                                   0.4f, 0.4f, 0.4f, 0.8f);
+                cairo_pattern_add_color_stop_rgba (grad, 1.0f,
+                                                   0.2f, 0.2f, 0.2f, 0.8f);
+        }
+
+        cairo_set_source (cr, grad);
         cairo_fill (cr);
 
-        /* cairo_set_source_rgba (cr, red, green, blue, 1.0f); */
-        /* cairo_translate (cr, -C_X, -C_Y); */
-        /* rounded_rectangle (cr, */
-        /*                    C_X, */
-        /*                    C_Y, */
-        /*                    BOX_WIDTH - 2*C_X, */
-        /*                    BOX_HEIGHT - 2*C_Y, */
-        /*                    BOX_RADIOUS); */
-        /* cairo_close_path(cr); */
-        /* cairo_stroke (cr); */
+        cairo_pattern_destroy (grad);
+
+        /* draw avatar */
+        if (priv->avatar_pixbuf) {
+                rounded_rectangle (cr,
+                                   AVATAR_X, -AVATAR_Y,
+                                   AVATAR_SIZE, AVATAR_SIZE,
+                                   BOX_RADIOUS,
+                                   ROUND_CORNER_ALL);
+                cairo_close_path (cr);
+
+                gdk_cairo_set_source_pixbuf (cr,
+                                             priv->avatar_pixbuf,
+                                             AVATAR_X,
+                                             -AVATAR_Y);
+                cairo_fill_preserve (cr);
+
+                cairo_set_source_rgba (cr,
+                                       priv->active_color.red,
+                                       priv->active_color.green,
+                                       priv->active_color.blue,
+                                       1.0f);
+                cairo_stroke (cr);
+        }
+        if (priv->presence_pixbuf) {
+                guint x = C_WIDTH - HILDON_ICON_PIXEL_SIZE_XSMALL - HILDON_MARGIN_DEFAULT;
+                guint y = (HEADER_HEIGHT - HILDON_ICON_PIXEL_SIZE_XSMALL)/2;
+
+                if (priv->avatar_pixbuf)
+                        x -= AVATAR_SIZE + HILDON_MARGIN_DEFAULT;
+
+                cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+                gdk_cairo_set_source_pixbuf (cr,
+                                             priv->presence_pixbuf,
+                                             x,
+                                             y);
+                cairo_paint (cr);
+        }
+
+        if (priv->message) {
+                /* draw footer unread part bg */
+                rounded_rectangle (cr,
+                                   0, C_HEIGHT - FOOTER_HEIGHT,
+                                   FOOTER_WIDTH, FOOTER_HEIGHT,
+                                   BOX_RADIOUS,
+                                   ROUND_CORNER_BL);
+                cairo_close_path (cr);
+
+                /* draw body filling depending on (in)active state */
+                switch (priv->active) {
+                case SELECTED_FOOTER:
+                        cairo_set_source_rgba (cr,
+                                               priv->active_color.red,
+                                               priv->active_color.green,
+                                               priv->active_color.blue,
+                                               0.8f);
+                        break;
+                default:
+                        cairo_set_source_rgba (cr, 0.1f, 0.1f, 0.1f, 0.9f);
+                }
+                cairo_fill (cr);
+
+                /* draw footer received part bg */
+                rounded_rectangle (cr,
+                                   FOOTER_WIDTH, C_HEIGHT - FOOTER_HEIGHT,
+                                   C_WIDTH - FOOTER_WIDTH, FOOTER_HEIGHT,
+                                   BOX_RADIOUS,
+                                   ROUND_CORNER_BR);
+                cairo_close_path (cr);
+
+                cairo_set_source_rgba (cr, 0.2f, 0.2f, 0.2f, 0.8f);
+                cairo_fill (cr);
+
+                /* draw message */
+                if (!priv->message_surface) {
+                        gint height;
+
+                        priv->message_surface = draw_text (cr,
+                                                           priv->font_desc,
+                                                           priv->message,
+                                                           MESSAGE_WIDTH,
+                                                           &height);
+
+                        priv->hidden_message_height = height - MESSAGE_HEIGHT;
+                        priv->scroll_on_click = priv->hidden_message_height > 0;
+                        if (priv->scroll_on_click)
+                                gtk_widget_show (priv->cut_message);
+                }
+
+                cairo_rectangle (cr,
+                                 2*CONTENT_OFFSET_X,
+                                 TEXT_Y_OFFSET,
+                                 MESSAGE_WIDTH,
+                                 MESSAGE_HEIGHT);
+                cairo_clip (cr);
+
+                cairo_set_source_surface (cr,
+                                          priv->message_surface,
+                                          2*CONTENT_OFFSET_X,
+                                          TEXT_Y_OFFSET - priv->scroll_offset);
+                cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+                cairo_paint (cr);
+        }
 
         cairo_destroy (cr);
 
@@ -213,18 +590,270 @@ expose_event (GtkWidget *self, GdkEventExpose *event)
 }
 
 static void
+resize_sender (ELHomeAppletPrivate *priv)
+{
+        guint width = C_WIDTH;
+
+        if (priv->avatar_pixbuf) {
+                width -= AVATAR_SIZE + HILDON_MARGIN_DEFAULT;
+        }
+
+        if (priv->presence_pixbuf) {
+                width -= HILDON_ICON_PIXEL_SIZE_XSMALL + HILDON_MARGIN_DEFAULT;
+        }
+
+        gtk_widget_set_size_request (priv->sender,
+                                     width,
+                                     HILDON_ICON_PIXEL_SIZE_THUMB);
+}
+
+static void
+update_presence_pixbuf (ELHomeApplet *self,
+                        OssoABookPresence *presence)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+        const gchar *icon_name = osso_abook_presence_get_icon_name (presence);
+        gboolean resize = !!priv->presence_pixbuf ^ !!icon_name; /* logical via bit XOR */
+
+        if (priv->presence_pixbuf) {
+                g_object_unref (priv->presence_pixbuf);
+                priv->presence_pixbuf = NULL;
+        }
+
+        if (icon_name)
+                priv->presence_pixbuf = gtk_icon_theme_load_icon
+                        (gtk_icon_theme_get_default (),
+                         icon_name,
+                         HILDON_ICON_PIXEL_SIZE_XSMALL,
+                         0, NULL);
+        if (resize)
+                resize_sender (priv);
+
+        gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+presence_updated (OssoABookPresence *presence,
+                  GParamSpec *spec,
+                  gpointer *user_data)
+{
+        ELHomeApplet *self = EL_HOME_APPLET(user_data);
+
+        if (!OSSO_ABOOK_IS_CONTACT(self->priv->contact))
+                return;
+
+        update_presence_pixbuf (self, presence);
+}
+
+static void
+show_contact (ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+
+        g_return_if_fail (priv->contact);
+
+        gtk_label_set_text (GTK_LABEL (priv->sender),
+                            osso_abook_contact_get_display_name (priv->contact));
+        resize_sender (priv);
+        gtk_widget_queue_draw (GTK_WIDGET (self));
+}
+
+static void
+resolve_contact (ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+        GList *contacts = NULL;
+
+        if (priv->contact_id) {
+                contacts = osso_abook_aggregator_lookup
+                        (OSSO_ABOOK_AGGREGATOR (priv->aggregator),
+                         priv->contact_id);
+        }
+        else if (priv->local_id && priv->remote_id) {
+                if (g_strcmp0 (priv->local_id, "ring/tel/ring" == 0)) {
+                        contacts = osso_abook_aggregator_find_contacts_for_phone_number
+                                (OSSO_ABOOK_AGGREGATOR (priv->aggregator),
+                                 priv->remote_id,
+                                 TRUE);
+                }
+                else {
+                        McAccount *account;
+                        account = osso_abook_account_manager_lookup_by_name
+                                (NULL,
+                                 priv->local_id);
+                        if (account) {
+                                contacts = osso_abook_aggregator_find_contacts_for_im_contact
+                                        (OSSO_ABOOK_AGGREGATOR (priv->aggregator),
+                                         priv->remote_id,
+                                         account);
+                        }
+                }
+        }
+
+        if (contacts && contacts->data) {
+                priv->contact = g_object_ref (OSSO_ABOOK_CONTACT (contacts->data));
+                g_signal_connect (priv->contact,
+                                  "notify::presence-status",
+                                  G_CALLBACK (presence_updated),
+                                  self);
+                priv->avatar_pixbuf = osso_abook_avatar_get_image_scaled
+                        (OSSO_ABOOK_AVATAR (priv->contact),
+                         HILDON_ICON_PIXEL_SIZE_THUMB,
+                         HILDON_ICON_PIXEL_SIZE_THUMB,
+                         TRUE);
+                update_presence_pixbuf (self,
+                                        OSSO_ABOOK_PRESENCE (priv->contact));
+                show_contact (self);
+        }
+}
+
+static void
+contacts_added (OssoABookRoster  *roster,
+                OssoABookContact **contacts,
+                gpointer          userdata)
+{
+        ELHomeApplet *self = EL_HOME_APPLET (userdata);
+        ELHomeAppletPrivate *priv = self->priv;
+
+        if (!priv->contact)
+                resolve_contact (self);
+}
+
+static void
+reset_contact (ELHomeApplet *self, gboolean resize)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+
+        if (priv->avatar_pixbuf) {
+                g_object_unref (priv->avatar_pixbuf);
+                priv->avatar_pixbuf = NULL;
+        }
+
+        if (priv->presence_pixbuf) {
+                g_object_unref (priv->presence_pixbuf);
+                priv->presence_pixbuf = NULL;
+        }
+
+        if (priv->contact) {
+                g_signal_handlers_disconnect_by_func (priv->contact,
+                                                      presence_updated,
+                                                      self);
+                g_object_unref (priv->contact);
+                priv->contact = NULL;
+        }
+
+        if (resize)
+                resize_sender (priv);
+}
+
+static void
+contacts_removed (OssoABookRoster *roster,
+                  const gchar     **ids,
+                  gpointer         userdata)
+{
+        ELHomeApplet *self = EL_HOME_APPLET (userdata);
+        ELHomeAppletPrivate *priv = self->priv;
+
+        if (priv->contact) {
+                const gchar **contact_id;
+                const gchar *uid = osso_abook_contact_get_uid (priv->contact);
+
+                for (contact_id = ids; *contact_id; contact_id++) {
+                        if (strcmp (*contact_id, priv->contact_id) == 0) {
+                                reset_contact (self, TRUE);
+
+                                gtk_widget_queue_draw (GTK_WIDGET (self));
+                                return;
+                        }
+                        if (strcmp (*contact_id, uid) == 0) {
+                                reset_contact (self, TRUE);
+                                resolve_contact (self);
+                                gtk_widget_queue_draw (GTK_WIDGET (self));
+                                return;
+                        }
+                }
+        }
+}
+
+static void
+clean_contact (ELHomeApplet *self, gboolean resize)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+
+        reset_contact (self, resize);
+
+        if (priv->aggregator) {
+                if (priv->aggregator_ready_closure){
+                        osso_abook_waitable_cancel (OSSO_ABOOK_WAITABLE (priv->aggregator),
+                                                    priv->aggregator_ready_closure);
+                        priv->aggregator_ready_closure = NULL;
+                }
+                g_signal_handlers_disconnect_by_func (priv->aggregator,
+                                                      contacts_added,
+                                                      self);
+                g_signal_handlers_disconnect_by_func (priv->aggregator,
+                                                      contacts_removed,
+                                                      self);
+                osso_abook_roster_stop (priv->aggregator);
+                g_object_unref (priv->aggregator);
+                priv->aggregator = NULL;
+        }
+}
+
+static void
+clean_state (ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+
+        if (priv->message) {
+                g_free (priv->message);
+                priv->message = NULL;
+        }
+
+        if (priv->contact_id) {
+                g_free (priv->contact_id);
+                priv->contact_id = NULL;
+        }
+        if (priv->local_id) {
+                g_free (priv->local_id);
+                priv->local_id = NULL;
+        }
+        if (priv->remote_id) {
+                g_free (priv->remote_id);
+                priv->remote_id = NULL;
+        }
+        if (priv->group_uid) {
+                g_free (priv->group_uid);
+                priv->group_uid = NULL;
+        }
+}
+
+static void
 dispose (GObject *self)
 {
         ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv;
 
-        if (priv->idle_id){
+        if (priv->init_timer) {
+                g_source_remove (priv->init_timer);
+                priv->init_timer = 0;
+        }
+
+        stop_scroll_anim (priv);
+        if (priv->idle_id) {
                 g_source_remove (priv->idle_id);
                 priv->idle_id = 0;
         }
-        if (priv->eventlogger){
+        if (priv->eventlogger) {
                 g_object_unref (priv->eventlogger);
                 priv->eventlogger = NULL;
         }
+        if (priv->font_desc) {
+                pango_font_description_free (priv->font_desc);
+                priv->font_desc = NULL;
+        }
+
+        clean_state (EL_HOME_APPLET (self));
+        clean_contact (EL_HOME_APPLET (self), FALSE);
 
         G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self);
 }
@@ -235,26 +864,110 @@ finalize (GObject *self)
         G_OBJECT_CLASS (el_home_applet_parent_class)->finalize (self);
 }
 
+static void
+aggregator_ready_cb (OssoABookWaitable *waitable,
+                     const GError      *error,
+                     gpointer           userdata)
+{
+        ELHomeApplet *self = EL_HOME_APPLET (userdata);
+        ELHomeAppletPrivate *priv = self->priv;
+
+        priv->aggregator_ready_closure = NULL;
+
+        if (error) {
+                g_warning ("Failed to create aggregator: %s", error->message);
+                return;
+        }
+
+        g_signal_connect (priv->aggregator,
+                          "contacts-added",
+                          G_CALLBACK (contacts_added),
+                          self);
+        g_signal_connect (priv->aggregator,
+                          "contacts-removed",
+                          G_CALLBACK (contacts_removed),
+                          self);
+
+        resolve_contact (self);
+}
+
+static void
+start_aggregator (ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+        EBookQuery *query = NULL;
+        GError *error = NULL;
+
+        if (priv->local_id && priv->remote_id) {
+                const gchar *vcard = osso_abook_account_manager_get_vcard_field
+                        (NULL, priv->local_id);
+                if (vcard)
+                        query = e_book_query_vcard_field_test (vcard,
+                                                               E_BOOK_QUERY_IS,
+                                                               priv->remote_id);
+                else
+                        query = e_book_query_any_field_contains (priv->remote_id);
+        }
+
+        if (query) {
+                priv->aggregator = osso_abook_aggregator_new_with_query (NULL,
+                                                                         query,
+                                                                         NULL,
+                                                                         1,
+                                                                         &error);
+                e_book_query_unref (query);
+        }
+        if (error) {
+                g_warning ("Failed to create aggregator: %s", error->message);
+                g_error_free (error);
+                return;
+        }
+
+        if (priv->aggregator) {
+                priv->aggregator_ready_closure = osso_abook_waitable_call_when_ready
+                        (OSSO_ABOOK_WAITABLE (priv->aggregator),
+                         aggregator_ready_cb,
+                         self, NULL);
+
+                osso_abook_roster_start (priv->aggregator);
+        }
+}
+
 static gchar*
-format_time (time_t t)
+format_time (time_t t, gboolean time_fmt_24h)
 {
-        static const guint RESULT_SIZE = 32;
+        static const guint RESULT_SIZE = 64;
 
         time_t now;
         struct tm now_tm, t_tm;
-        const gchar *format = "%Y.%m.%d %T";
+        const gchar *time_format;
         gchar *result = g_malloc0 (RESULT_SIZE);
 
         now = time (NULL);
         localtime_r (&now, &now_tm);
         localtime_r (&t, &t_tm);
 
+        if (time_fmt_24h)
+                time_format = "wdgt_va_24h_time";
+        else
+                time_format = now_tm.tm_hour > 11 ?
+                        "wdgt_va_12h_time_pm":
+                        "wdgt_va_12h_time_am";
+
         if ((now_tm.tm_year == t_tm.tm_year) &&
             (now_tm.tm_mon  == t_tm.tm_mon) &&
             (now_tm.tm_mday == t_tm.tm_mday))
-                format = "%T";
-
-        strftime (result, RESULT_SIZE, format, &t_tm);
+                strftime (result,
+                          RESULT_SIZE,
+                          dgettext ("hildon-libs", time_format),
+                          &t_tm);
+        else {
+                gchar *full_format = g_strdup_printf ("%s %s",
+                                                      dgettext ("hildon-libs", "wdgt_va_date"),
+                                                      dgettext ("hildon-libs", time_format));
+                strftime (result, RESULT_SIZE, full_format, &t_tm);
+                g_free (full_format);
+        }
 
         return result;
 }
@@ -263,54 +976,57 @@ static void
 show_event (ELHomeApplet *self, RTComElIter *it)
 {
         ELHomeAppletPrivate *priv = self->priv;
-
-        gchar *message = NULL;
         gchar *remote = NULL;
         gchar *received = NULL;
-        const gchar *icon_name = NULL;
 
-        if (it && rtcom_el_iter_first (it)){
-                rtcom_el_iter_dup_string (it, "free-text", &message);
-                if (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-name", &remote))
-                                rtcom_el_iter_dup_string (it, "remote-id", &remote);
-                        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";
+        if (it && rtcom_el_iter_first (it)) {
+                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);
+
+                        if (priv->remote_id && !priv->remote_id[0]) {
+                                g_free (priv->remote_id);
+                                priv->remote_id = NULL;
+                        }
                 }
+                else
+                        priv->event_id = -1;
         }
-        else{
+        else
                 priv->event_id = -1;
-        }
 
-        gtk_label_set_text (GTK_LABEL (priv->message), message);
-        gtk_label_set_text (GTK_LABEL (priv->sender), remote);
+        if (priv->message)
+                gtk_widget_hide (priv->empty);
+        else
+                gtk_widget_show (priv->empty);
+
         gtk_label_set_text (GTK_LABEL (priv->received), received);
 
-        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);
-        }
+        if (remote && remote[0])
+                gtk_label_set_text (GTK_LABEL (priv->sender), remote);
         else
-                gtk_widget_hide (priv->icon);
+                gtk_label_set_text (GTK_LABEL (priv->sender), priv->remote_id);
+
+        stop_scroll_anim (priv);
+        priv->scroll_offset = 0;
+        if (priv->message_surface) {
+                cairo_surface_destroy (priv->message_surface);
+                priv->message_surface = NULL;
+        }
+
+        gtk_widget_hide (priv->cut_message);
+        gtk_widget_queue_draw (GTK_WIDGET (self));
 
-        g_free (message);
         g_free (remote);
 }
 
@@ -320,32 +1036,23 @@ make_query (RTComEl *el, gint event_id)
         RTComElQuery *query = NULL;
         RTComElIter *it = NULL;
 
-        static const gchar *services[] = {"RTCOM_EL_SERVICE_SMS",
-                                          "RTCOM_EL_SERVICE_CHAT",
-                                          NULL};
-        static const gchar *event_types[] = {"RTCOM_EL_EVENTTYPE_SMS_INBOUND",
-                                             "RTCOM_EL_EVENTTYPE_CHAT_INBOUND",
-                                             NULL};
-
         query = rtcom_el_query_new (el);
         rtcom_el_query_set_limit (query, 1);
-        if (event_id >= 0){
+        if (event_id >= 0) {
                 rtcom_el_query_prepare (query,
-                                        "is-read", FALSE, RTCOM_EL_OP_EQUAL,
                                         "id", event_id, RTCOM_EL_OP_EQUAL,
-                                        "service", services, RTCOM_EL_OP_IN_STRV,
-                                        "event-type", event_types, RTCOM_EL_OP_IN_STRV,
                                         NULL);
         }
-        else{
+        else {
                 rtcom_el_query_prepare (query,
                                         "is-read", FALSE, RTCOM_EL_OP_EQUAL,
-                                        "service", services, RTCOM_EL_OP_IN_STRV,
-                                        "event-type", event_types, RTCOM_EL_OP_IN_STRV,
+                                        "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);
         }
         it = rtcom_el_get_events (el, query);
-        g_object_unref(query);
+        g_object_unref (query);
 
         return it;
 }
@@ -354,11 +1061,18 @@ static void
 update_unread_label (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
-        gchar *text;
 
-        text = g_strdup_printf ("%d", priv->unread_count);
-        gtk_label_set_text (GTK_LABEL (priv->unread), text);
-        g_free (text);
+        if (priv->unread_count > 0) {
+                gchar *text;
+                text = g_strdup_printf
+                        ("%d<span foreground=\"red\" rise=\"5000\">*</span>",
+                         priv->unread_count);
+
+                gtk_label_set_markup (GTK_LABEL (priv->unread), text);
+                g_free (text);
+        }
+        else
+                gtk_label_set_text (GTK_LABEL (priv->unread), NULL);
 }
 
 static gint
@@ -375,17 +1089,17 @@ query_unread_events (RTComEl *el)
                                 "SELECT SUM(total_events)-SUM(read_events) FROM GroupCache;",
                                 -1,
                                 &stmt,
-                                NULL) != SQLITE_OK){
+                                NULL) != SQLITE_OK) {
                 g_error ("%s: can't compile SQL", G_STRFUNC);
                 return -1;
         }
 
         while (SQLITE_BUSY == (ret = sqlite3_step (stmt)));
 
-        if (ret == SQLITE_ROW){
+        if (ret == SQLITE_ROW) {
                 count = sqlite3_column_int (stmt, 0);
         }
-        else{
+        else {
                 g_error ("%s: error while executing SQL", G_STRFUNC);
         }
 
@@ -394,15 +1108,239 @@ query_unread_events (RTComEl *el)
         return count;
 }
 
+static gboolean
+query_read_events (RTComEl *el, const gchar *service, gint *events, gint *conversations)
+{
+        sqlite3 *db;
+        sqlite3_stmt *stmt;
+        int ret;
+        gboolean result = TRUE;
+
+        g_object_get (el, "db", &db, NULL);
+
+        if (sqlite3_prepare_v2 (db,
+                                "SELECT SUM(total_events), COUNT(group_uid) FROM GroupCache, Services "
+                                "WHERE GroupCache.service_id=Services.id AND Services.name=?;",
+                                -1,
+                                &stmt,
+                                NULL) != SQLITE_OK) {
+                g_error ("%s: can't compile SQL", G_STRFUNC);
+                return FALSE;
+        }
+        if (sqlite3_bind_text (stmt, 1, service, -1, SQLITE_STATIC) != SQLITE_OK)  {
+                g_error ("Failed to bind %s to SQL stmt", service);
+                result = FALSE;
+                goto DONE;
+        }
+
+        while (SQLITE_BUSY == (ret = sqlite3_step (stmt)));
+
+        if (ret == SQLITE_ROW) {
+                *events = sqlite3_column_int (stmt, 0);
+                *conversations = sqlite3_column_int (stmt, 1);
+        }
+        else {
+                g_error ("%s: error while executing SQL", G_STRFUNC);
+                result = FALSE;
+                goto DONE;
+        }
+
+ DONE:
+        sqlite3_finalize (stmt);
+
+        return result;
+}
+
+static void
+am_ready (OssoABookAccountManager *manager,
+          const GError            *error,
+          gpointer                 user_data)
+{
+        ELHomeApplet *self = EL_HOME_APPLET (user_data);
+        ELHomeAppletPrivate *priv = self->priv;
+
+        if (!error &&
+            priv->local_id &&
+            !GTK_WIDGET_VISIBLE (priv->icon)) {
+                McAccount *account;
+
+                account = osso_abook_account_manager_lookup_by_name (NULL,
+                                                                     priv->local_id);
+                if (account) {
+                        McProfile *profile = mc_profile_lookup (mc_account_compat_get_profile (account));
+                        const gchar *icon_name = mc_profile_get_icon_name (profile);
+                        if (icon_name) {
+                                gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
+                                                              icon_name,
+                                                              HILDON_ICON_SIZE_XSMALL);
+                                gtk_widget_show (priv->icon);
+                        }
+                }
+        }
+}
+
 static void
 read_event (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
         RTComElIter *it = NULL;
+        const gchar *icon_name = NULL;
+        gchar *remote_id;
+        gchar *local_id;
+
+        remote_id = g_strdup (priv->remote_id);
+        local_id = g_strdup (priv->local_id);
+
+        clean_state (self);
 
         it = make_query (priv->eventlogger, -1);
         show_event (self, it);
+
         if (it) g_object_unref (it);
+
+        if (priv->event_id >= 0) {
+                gboolean new_account = g_strcmp0 (priv->local_id, local_id);
+
+                if (g_strcmp0 (priv->remote_id, remote_id) ||
+                    new_account ||
+                    !priv->contact) {
+                        clean_contact (self, TRUE);
+                        start_aggregator (self);
+                }
+                else if (priv->contact) {
+                        show_contact (self);
+                }
+
+                if (new_account) {
+                        if (g_strcmp0 (priv->local_id, "ring/tel/ring") == 0) {
+                                icon_name = "general_sms";
+                        }
+                        else {
+                                McAccount *account;
+                                OssoABookAccountManager *am = osso_abook_account_manager_get_default ();
+                                if (!osso_abook_waitable_is_ready (OSSO_ABOOK_WAITABLE (am), NULL)) {
+                                        osso_abook_account_manager_call_when_ready  (am,
+                                                                                     am_ready,
+                                                                                     self,
+                                                                                     NULL);
+                                }
+                                else {
+                                        account = osso_abook_account_manager_lookup_by_name (NULL,
+                                                                                             priv->local_id);
+                                        if (account) {
+                                                McProfile *profile = mc_profile_lookup (mc_account_compat_get_profile (account));
+                                                icon_name = mc_profile_get_icon_name (profile);
+                                        }
+                                }
+                        }
+
+                        if (icon_name) {
+                                gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
+                                                              icon_name,
+                                                              HILDON_ICON_SIZE_XSMALL);
+                                gtk_widget_show (priv->icon);
+                        }
+                        else
+                                gtk_widget_hide (priv->icon);
+                }
+        }
+        else {
+                gchar *text;
+                gint n_sms_events = 0, n_sms_convs = 0;
+                gint n_chat_events = 0, n_chat_convs = 0;
+                const gchar *fmt = "%d <span size=\"small\">(%d)</span>";
+
+                query_read_events (priv->eventlogger,
+                                   "RTCOM_EL_SERVICE_SMS",
+                                   &n_sms_events, &n_sms_convs);
+                query_read_events (priv->eventlogger,
+                                   "RTCOM_EL_SERVICE_CHAT",
+                                   &n_chat_events, &n_chat_convs);
+
+                text = g_strdup_printf (fmt, n_sms_convs, n_sms_events);
+                gtk_label_set_markup (GTK_LABEL (priv->sms_total), text);
+                g_free (text);
+
+                text = g_strdup_printf (fmt, n_chat_convs, n_chat_events);
+                gtk_label_set_markup (GTK_LABEL (priv->chat_total), text);
+                g_free (text);
+
+                gtk_label_set_text (GTK_LABEL (priv->sender),
+                                    dgettext ("rtcom-messaging-ui",
+                                              "messaging_ap_conversations"));
+
+                clean_contact (self, TRUE);
+                gtk_widget_hide (priv->icon);
+        }
+
+        g_free (local_id);
+        g_free (remote_id);
+}
+
+static void
+remove_notification (ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+
+        DBusGConnection *conn;
+        GError *error;
+        DBusGProxy *proxy;
+        GPtrArray *conv_structs;
+        GType conv_structs_type;
+        GValueArray *account_info;
+        GValue value = {0, };
+        DBusGProxyCall *call;
+
+        if (!(priv->remote_id && priv->local_id))
+                return;
+
+        conn = hd_home_plugin_item_get_dbus_g_connection (HD_HOME_PLUGIN_ITEM (self),
+                                                          DBUS_BUS_SESSION,
+                                                          &error);
+        if (!conn) {
+                g_error ("Failed get dbus g connection %s", error->message);
+                g_error_free (error);
+                return;
+        }
+
+        proxy = dbus_g_proxy_new_for_name (conn,
+                                           NOTIFICATION_UI_DBUS_NAME,
+                                           NOTIFICATION_UI_DBUS_PATH,
+                                           NOTIFICATION_UI_DBUS_IFACE);
+
+        conv_structs = g_ptr_array_sized_new (1);
+        account_info = g_value_array_new (2);
+
+        g_value_init (&value, G_TYPE_STRING);
+        g_value_set_string (&value, priv->local_id);
+        g_value_array_append (account_info, &value);
+        g_value_unset (&value);
+
+        g_value_init (&value, G_TYPE_STRING);
+        g_value_set_string (&value, priv->remote_id);
+        g_value_array_append (account_info, &value);
+        g_value_unset (&value);
+
+        g_ptr_array_add (conv_structs, account_info);
+
+        conv_structs_type = dbus_g_type_get_collection
+                ("GPtrArray",
+                 dbus_g_type_get_struct ("GValueArray",
+                                         G_TYPE_STRING,
+                                         G_TYPE_STRING,
+                                         G_TYPE_INVALID));
+
+        call = dbus_g_proxy_begin_call (proxy,
+                                        "ClearConversationNotifications",
+                                        NULL, NULL, NULL,
+                                        conv_structs_type,
+                                        conv_structs,
+                                        G_TYPE_INVALID);
+
+        g_value_array_free (account_info);
+        g_ptr_array_free (conv_structs, TRUE);
+
+        g_object_unref (proxy);
 }
 
 static void
@@ -410,14 +1348,102 @@ mark_as_read (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
 
-        if (priv->event_id >= 0){
+        if (priv->event_id >= 0) {
                 rtcom_el_set_read_event (priv->eventlogger,
                                          priv->event_id,
                                          TRUE,
                                          NULL);
-                read_event (self);
-                priv->unread_count--;
-                update_unread_label (self);
+                remove_notification (self);
+        }
+}
+
+static void
+launch_conversations (ELHomeApplet *self)
+{
+        DBusConnection *conn;
+        DBusMessage *message;
+        DBusError error;
+
+        dbus_error_init (&error);
+        conn = hd_home_plugin_item_get_dbus_connection (HD_HOME_PLUGIN_ITEM (self),
+                                                        DBUS_BUS_SESSION,
+                                                        &error);
+        if (!conn) {
+                if (dbus_error_is_set (&error)) {
+                        g_error ("Failed to get dbus connection %s", error.message);
+                        dbus_error_free (&error);
+                }
+                return;
+        }
+
+        message = dbus_message_new_method_call (CONVERSATIONS_UI_DBUS_NAME,
+                                                CONVERSATIONS_UI_DBUS_PATH,
+                                                CONVERSATIONS_UI_DBUS_IFACE,
+                                                "top_application");
+        dbus_message_set_no_reply (message, TRUE);
+
+        if (dbus_connection_send (conn, message, NULL))
+                dbus_connection_flush (conn);
+        dbus_message_unref (message);
+
+        dbus_connection_close (conn);
+}
+
+static void
+open_conversation (ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+        McAccount *account;
+        const gchar *persistent_id = NULL;
+
+        if (!((priv->remote_id || priv->group_uid) && priv->local_id))
+                return;
+
+        account = osso_abook_account_manager_lookup_by_name (NULL,
+                                                             priv->local_id);
+        if (!account)
+                return;
+
+        if (priv->group_uid &&
+            g_str_has_prefix (priv->group_uid, "group:")) {
+                persistent_id = strchr (priv->group_uid, '-');
+                if (persistent_id)
+                        persistent_id++;
+        }
+
+        if (persistent_id && persistent_id[0] != '\0') {
+                GHashTable *properties = tp_asv_new
+                        (TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING,
+                         TP_IFACE_CHANNEL_TYPE_TEXT,
+                         TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT,
+                         TP_HANDLE_TYPE_NONE,
+                         RTCOM_TP_IFACE_CHANNEL_INTERFACE_PERSISTENT ".PersistentID",
+                         G_TYPE_STRING, persistent_id,
+                         NULL);
+
+                mc_account_channelrequest_ht (account,
+                                              properties,
+                                              time (NULL),
+                                              NULL,
+                                              MC_ACCOUNT_CR_FLAG_USE_EXISTING,
+                                              NULL, NULL, NULL, NULL);
+
+                g_hash_table_unref (properties);
+        }
+        else if (priv->remote_id) {
+                McAccountChannelrequestData request;
+
+                MC_ACCOUNT_CRD_INIT (&request);
+                MC_ACCOUNT_CRD_SET (&request, channel_type, TP_IFACE_QUARK_CHANNEL_TYPE_TEXT);
+                MC_ACCOUNT_CRD_SET (&request, target_handle_type, TP_HANDLE_TYPE_CONTACT);
+                MC_ACCOUNT_CRD_SET (&request, target_id, priv->remote_id);
+
+                mc_account_channelrequest (account,
+                                           &request,
+                                           time (NULL),
+                                           NULL,
+                                           MC_ACCOUNT_CR_FLAG_USE_EXISTING,
+                                           NULL, NULL, NULL, NULL);
         }
 }
 
@@ -426,18 +1452,15 @@ read_new_event (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
 
-        if (priv->new_event_id >= 0){
-                RTComElIter *it = NULL;
-                it = make_query (priv->eventlogger, priv->new_event_id);
-                if (it){
-                        if (rtcom_el_iter_first (it))
-                                show_event (self, it);
-                        g_object_unref (it);
-                }
+        read_event (self);
+
+        if (priv->event_id >= 0)
                 priv->unread_count = query_unread_events (priv->eventlogger);
-                update_unread_label (self);
-        }
-        priv->new_event_id = -1;
+        else
+                priv->unread_count = 0;
+
+        update_unread_label (self);
+
         priv->idle_id = 0;
 
         return FALSE;
@@ -464,28 +1487,62 @@ new_event_cb (RTComEl      *backend,
               const gchar  *service,
               ELHomeApplet *self)
 {
-        ELHomeAppletPrivate *priv = self->priv;
+        if (service && service[0] != '\0') {
+                const gchar** conv_service = conv_services;
+                do {
+                        if (!g_strcmp0 (*conv_service, service)) {
+                                add_new_idle (self);
+                                return;
+                        }
+                }
+                while(*++conv_service);
+        }
+        else
+                add_new_idle (self);
+}
 
-        priv->new_event_id = event_id;
+static void
+all_deleted_cb (RTComEl      *backend,
+                const gchar  *service,
+                ELHomeApplet *self)
+{
+        new_event_cb (backend,
+                      0,
+                      NULL,
+                      NULL,
+                      NULL,
+                      NULL,
+                      service,
+                      self);
+}
+
+static void
+refresh_hint_cb (RTComEl     *backend,
+                 ELHomeApplet *self)
+{
         add_new_idle (self);
 }
 
 static gboolean
-button_release_event_cb (GtkWidget      *widget,
-                         GdkEventButton *event,
-                         ELHomeApplet   *self)
+scroll_anim_cb (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
-
-        if (priv->active){
-                priv->active = FALSE;
-                gtk_widget_queue_draw (widget);
-#ifndef DEBUG_LAYOUT
-                mark_as_read (self);
-#endif
+        gboolean to_continue;
+
+        priv->scroll_offset += SCROLL_STEP;
+        gtk_widget_queue_draw_area (GTK_WIDGET (self),
+                                    3*CONTENT_OFFSET_X,
+                                    HEADER_HEIGHT + CONTENT_OFFSET_Y_TOP,
+                                    MESSAGE_WIDTH,
+                                    MESSAGE_HEIGHT);
+
+        to_continue = priv->scroll_offset <= priv->hidden_message_height;
+        if (!to_continue) {
+                priv->scroll_anim_id = 0;
+                gtk_widget_hide (priv->cut_message);
         }
 
-        return TRUE;
+        return to_continue;
 }
 
 static gboolean
@@ -495,10 +1552,131 @@ button_press_event_cb (GtkWidget      *widget,
 {
         ELHomeAppletPrivate *priv = self->priv;
 
-        if (priv->event_id > 0){
-                priv->active = TRUE;
-                gtk_widget_queue_draw (widget);
+        if (priv->event_id >= 0) {
+                if (event->y < CONTENT_OFFSET_Y_TOP + HEADER_HEIGHT) {
+                        if (priv->aggregator &&
+                            osso_abook_waitable_is_ready
+                            (OSSO_ABOOK_WAITABLE (priv->aggregator), NULL))
+                                priv->active = SELECTED_HEADER;
+                }
+                else if (event->y > (BOX_HEIGHT - CONTENT_OFFSET_Y_BOTTOM - FOOTER_HEIGHT_PRESS) &&
+                         event->x < FOOTER_WIDTH_PRESS)
+                        priv->active = SELECTED_FOOTER;
+                else
+                        priv->active = SELECTED_BODY;
         }
+        else {
+                priv->active = SELECTED_BODY;
+        }
+
+        gtk_widget_queue_draw (widget);
+
+        return TRUE;
+}
+
+static GtkWidget*
+create_contact_starter_dialog (OssoABookAggregator *aggregator, const gchar *contact_id)
+{
+        GtkWidget *dialog = NULL;
+        GList *contacts = osso_abook_aggregator_lookup (aggregator, contact_id);
+        if (contacts && contacts->data) {
+                GtkWidget *starter =
+                        osso_abook_touch_contact_starter_new_with_contact
+                        (NULL,
+                         OSSO_ABOOK_CONTACT (contacts->data));
+                dialog = osso_abook_touch_contact_starter_dialog_new
+                        (NULL,
+                         OSSO_ABOOK_TOUCH_CONTACT_STARTER (starter));
+                gtk_widget_show_all (starter);
+        }
+
+        g_list_free (contacts);
+
+        return dialog;
+}
+
+static GtkWidget*
+create_temporary_contact_dialog (const gchar *remote_id,
+                                 const gchar *account_id)
+{
+        GtkWidget *dialog = NULL;
+        const gchar *vcard = NULL;
+        McAccount *account = NULL;
+
+        if (account_id) {
+            vcard = osso_abook_account_manager_get_vcard_field (NULL, account_id);
+            account = osso_abook_account_manager_lookup_by_name (NULL, account_id);
+        }
+
+        if (vcard && account) {
+                EVCardAttribute *attribute = e_vcard_attribute_new (NULL, vcard);
+
+                e_vcard_attribute_add_value (attribute, remote_id);
+                dialog = osso_abook_temporary_contact_dialog_new
+                        (NULL,
+                         NULL, /*EBook            *book,*/
+                         attribute,
+                         account);
+                g_signal_connect (dialog,
+                                  "response",
+                                  G_CALLBACK (gtk_widget_destroy),
+                                  NULL);
+                e_vcard_attribute_free (attribute);
+        }
+
+        return dialog;
+}
+
+static gboolean
+button_release_event_cb (GtkWidget      *widget,
+                         GdkEventButton *event,
+                         ELHomeApplet   *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+
+        switch (priv->active) {
+        case SELECTED_BODY:
+                if (priv->event_id >= 0) {
+                        reset_scroll (self);
+                        open_conversation (self);
+                }
+                else
+                        launch_conversations (self);
+                break;
+        case SELECTED_HEADER: {
+                GtkWidget *dialog = NULL;
+
+                reset_scroll (self);
+
+                if (priv->aggregator && priv->contact_id)
+                        dialog = create_contact_starter_dialog
+                                (OSSO_ABOOK_AGGREGATOR (priv->aggregator),
+                                 priv->contact_id);
+                if (!dialog &&
+                    priv->remote_id &&
+                    priv->local_id)
+                        dialog = create_temporary_contact_dialog (priv->remote_id,
+                                                                  priv->local_id);
+
+                if (dialog)
+                        gtk_widget_show (dialog);
+        }
+                break;
+        case SELECTED_FOOTER:
+                if (priv->scroll_on_click) {
+                        priv->scroll_on_click = FALSE;
+                        priv->scroll_anim_id = g_timeout_add (SCROLL_PERIOD,
+                                                              (GSourceFunc)scroll_anim_cb,
+                                                              self);
+                }
+                else
+                        mark_as_read (self);
+                break;
+        default:;
+        }
+
+        priv->active = SELECTED_NONE;
+        gtk_widget_queue_draw (widget);
 
         return TRUE;
 }
@@ -510,11 +1688,79 @@ leave_notify_event_cb (GtkWidget        *widget,
 {
         ELHomeAppletPrivate *priv = self->priv;
 
-        if (priv->active){
-                priv->active = FALSE;
+        switch (priv->active) {
+        case SELECTED_FOOTER:
+                stop_scroll_anim (priv);
+                /* fall down */
+        case SELECTED_HEADER:
+        case SELECTED_BODY:
                 gtk_widget_queue_draw (widget);
+                break;
+        default:;
         }
 
+        priv->active = SELECTED_NONE;
+        return FALSE;
+}
+
+static gboolean
+init_eventlogger (ELHomeApplet *self)
+{
+        ELHomeAppletPrivate *priv = self->priv;
+
+        priv->eventlogger = rtcom_el_new ();
+
+        /* check that db is initialized */
+        gpointer *db = NULL;
+        g_object_get (priv->eventlogger, "db", &db, NULL);
+        if (!db) {
+                static int trial = 0;
+
+                g_object_unref (priv->eventlogger);
+                priv->eventlogger = NULL;
+
+                if (trial == 0) {
+                        trial++;
+                        priv->init_timer = g_timeout_add_seconds (5,
+                                                                  (GSourceFunc)init_eventlogger,
+                                                                  self);
+                        return TRUE; /* return value doesn't matter */
+                }
+                else if (trial < 5) {
+                        trial++;
+                        return TRUE;
+                }
+                else {
+                        g_error ("Failed to init eventlogger");
+                        return FALSE;
+                }
+        }
+
+        g_signal_connect (priv->eventlogger,
+                          "new-event",
+                          G_CALLBACK (new_event_cb),
+                          self);
+        g_signal_connect (priv->eventlogger,
+                          "event-updated",
+                          G_CALLBACK (new_event_cb),
+                          self);
+        g_signal_connect (priv->eventlogger,
+                          "event-deleted",
+                          G_CALLBACK (new_event_cb),
+                          self);
+        g_signal_connect (priv->eventlogger,
+                          "all-deleted",
+                          G_CALLBACK (all_deleted_cb),
+                          self);
+        g_signal_connect (priv->eventlogger,
+                          "refresh-hint",
+                          G_CALLBACK (refresh_hint_cb),
+                          self);
+
+        add_new_idle (self);
+
+        priv->init_timer = 0;
+
         return FALSE;
 }
 
@@ -523,73 +1769,96 @@ el_home_applet_init (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv;
         GtkWidget *event_box;
-        GtkWidget *hbox, *vbox, *align;
+        GtkWidget *hbox, *vbox, *align, *footer;
+        GtkWidget *w;
+        GConfClient *gconf;
 
         self->priv = EL_HOME_APPLET_GET_PRIVATE (self);
         priv = self->priv;
 
         gtk_widget_set_app_paintable (GTK_WIDGET (self), TRUE);
 
-        priv->unread = gtk_label_new ("12");
-        hildon_helper_set_logical_color (priv->unread,
-                                         GTK_RC_FG,
-                                         GTK_STATE_NORMAL,
-                                         "ActiveTextColor");
+        priv->unread = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (priv->unread),
-                                1.0f,
+                                0.0f,
                                 0.5f);
-        gtk_widget_set_size_request (priv->unread,
-                                     -1,
-                                     HEADER_HEIGHT);
+        hildon_helper_set_logical_font (priv->unread, "SmallSystemFont");
 
-        priv->icon = gtk_image_new_from_icon_name ("chat_unread_sms",
-                                                   HILDON_ICON_SIZE_FINGER);
+        priv->icon = gtk_image_new ();
         gtk_misc_set_alignment (GTK_MISC (priv->icon),
                                 0.5f,
                                 0.5f);
 
-        priv->sender = gtk_label_new ("asdf asdf asdf asdf asdf");
+        priv->sender = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (priv->sender),
                                 0.5f,
-                                0.5f);
+                                0.55f);
         gtk_label_set_ellipsize (GTK_LABEL (priv->sender),
                                  PANGO_ELLIPSIZE_END);
         gtk_widget_set_name (priv->sender, "hildon-shadow-label");
         hildon_helper_set_logical_font (priv->sender, "SystemFont");
-
-        priv->message = g_object_new (GTK_TYPE_LABEL,
-                                      "label", "asdf asdf adsf asdf asdf asdf asdf asdf",
-                                      "wrap", TRUE,
-                                      "wrap-mode", PANGO_WRAP_WORD_CHAR,
-                                      NULL);
-
-        gtk_misc_set_alignment (GTK_MISC (priv->message),
-                                0.0f,
-                                0.0f);
-        gtk_widget_set_size_request (priv->message,
-                                     MESSAGE_WIDTH,
-                                     MESSAGE_HEIGHT);
-        gtk_widget_set_name (priv->message, "hildon-shadow-label");
-
-        priv->received = gtk_label_new ("aewf aewf aewf awef");
+        gtk_widget_set_size_request (priv->sender,
+                                     C_WIDTH,
+                                     HILDON_ICON_PIXEL_SIZE_THUMB);
+
+        /* construt empty table */
+        priv->empty = gtk_fixed_new ();
+
+        w = gtk_image_new_from_icon_name ("general_sms", HILDON_ICON_SIZE_FINGER);
+        gtk_fixed_put (GTK_FIXED (priv->empty), w,
+                       4*HILDON_MARGIN_DOUBLE,
+                       2*HILDON_MARGIN_DOUBLE);
+
+        w = gtk_image_new_from_icon_name ("general_chat", HILDON_ICON_SIZE_FINGER);
+        gtk_fixed_put (GTK_FIXED (priv->empty), w,
+                       4*HILDON_MARGIN_DOUBLE,
+                       3*HILDON_MARGIN_DOUBLE + HILDON_ICON_PIXEL_SIZE_FINGER);
+
+        priv->sms_total = gtk_label_new (NULL);
+        gtk_widget_set_name (priv->sms_total, "hildon-shadow-label");
+        gtk_fixed_put (GTK_FIXED (priv->empty), priv->sms_total,
+                       5*HILDON_MARGIN_DOUBLE  + HILDON_ICON_PIXEL_SIZE_FINGER,
+                       2*HILDON_MARGIN_DOUBLE + HILDON_MARGIN_HALF);
+
+        priv->chat_total = gtk_label_new (NULL);
+        gtk_widget_set_name (priv->chat_total, "hildon-shadow-label");
+        gtk_fixed_put (GTK_FIXED (priv->empty), priv->chat_total,
+                       5*HILDON_MARGIN_DOUBLE  + HILDON_ICON_PIXEL_SIZE_FINGER,
+                       3*HILDON_MARGIN_DOUBLE + HILDON_MARGIN_HALF + HILDON_ICON_PIXEL_SIZE_FINGER);
+
+        gtk_widget_show_all (GTK_WIDGET (priv->empty));
+        gtk_widget_hide (GTK_WIDGET (priv->empty));
+        GTK_WIDGET_SET_FLAGS (priv->empty, GTK_NO_SHOW_ALL);
+
+        priv->received = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (priv->received),
                                 1.0f,
                                 0.5f);
-        gtk_widget_set_size_request (priv->received,
-                                     MESSAGE_WIDTH,
-                                     -1);
         hildon_helper_set_logical_font (priv->received, "SmallSystemFont");
         gtk_widget_set_name (priv->received, "hildon-shadow-label");
 
+
+        priv->cut_message = gtk_label_new ("...");
+        gtk_misc_set_alignment (GTK_MISC (priv->cut_message),
+                                0.5f,
+                                0.0f);
+        hildon_helper_set_logical_font (priv->cut_message, "SmallSystemFont");
+        gtk_widget_set_name (priv->cut_message, "hildon-shadow-label");
+        GTK_WIDGET_SET_FLAGS (priv->cut_message, GTK_NO_SHOW_ALL);
+
         hbox = gtk_hbox_new (FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (hbox), priv->unread, FALSE, FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (hbox), priv->icon, FALSE, FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (hbox), priv->sender, TRUE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (hbox), priv->sender, FALSE, FALSE, 0);
+
+        footer = gtk_hbox_new (FALSE, HILDON_MARGIN_DEFAULT);
+        gtk_box_pack_start (GTK_BOX (footer), priv->unread, FALSE, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (footer), priv->cut_message, TRUE, TRUE, 0);
+        gtk_box_pack_end (GTK_BOX (footer), priv->icon, FALSE, FALSE, 0);
+        gtk_box_pack_end (GTK_BOX (footer), priv->received, FALSE, FALSE, 0);
 
         vbox = gtk_vbox_new (FALSE, 0);
         gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-        gtk_box_pack_start (GTK_BOX (vbox), priv->message, TRUE, TRUE, 0);
-        gtk_box_pack_start (GTK_BOX (vbox), priv->received, FALSE, FALSE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), priv->empty, TRUE, TRUE, 0);
+        gtk_box_pack_end (GTK_BOX (vbox), footer, FALSE, FALSE, 0);
 
         align = gtk_alignment_new (0.5f, 0.0f, 1.0f, 1.0f);
         gtk_alignment_set_padding (GTK_ALIGNMENT (align),
@@ -605,30 +1874,40 @@ el_home_applet_init (ELHomeApplet *self)
         gtk_container_add (GTK_CONTAINER (event_box), align);
         gtk_container_add (GTK_CONTAINER (self), event_box);
 
-        g_signal_connect (event_box, "button-press-event",
-                G_CALLBACK (button_press_event_cb), self);
-        g_signal_connect (event_box, "button-release-event",
-                G_CALLBACK (button_release_event_cb), self);
-        g_signal_connect (event_box, "leave-notify-event",
-                G_CALLBACK (leave_notify_event_cb), self);
-
-        gtk_widget_show_all (GTK_WIDGET (event_box));
+        g_signal_connect (event_box,
+                          "button-press-event",
+                          G_CALLBACK (button_press_event_cb),
+                          self);
+        g_signal_connect (event_box,
+                          "button-release-event",
+                          G_CALLBACK (button_release_event_cb),
+                          self);
+        g_signal_connect (event_box,
+                          "leave-notify-event",
+                          G_CALLBACK (leave_notify_event_cb),
+                          self);
 
-#ifndef DEBUG_LAYOUT
-        priv->eventlogger = rtcom_el_new ();
-        g_signal_connect (priv->eventlogger,
-                          "new-event",
-                          G_CALLBACK (new_event_cb),
+        g_signal_connect (event_box,
+                          "style-set",
+                          G_CALLBACK (style_set_cb),
                           self);
-        g_signal_connect (priv->eventlogger,
-                          "event-updated",
-                          G_CALLBACK (new_event_cb),
+        g_signal_connect (self,
+                          "notify::is-on-current-desktop",
+                          G_CALLBACK (notify_on_current_desktop),
                           self);
 
-        read_event (self);
-        priv->unread_count = query_unread_events (priv->eventlogger);
-        update_unread_label (self);
-#endif
+        gtk_widget_show_all (GTK_WIDGET (event_box));
+
+
+        osso_abook_init_with_name (PACKAGE, NULL);
+
+        gconf = gconf_client_get_default ();
+        priv->time_fmt_24h = gconf_client_get_bool (gconf,
+                                                    "/apps/clock/time-format",
+                                                    NULL);
+        g_object_unref (gconf);
+
+        init_eventlogger (self);
 }
 
 static void
@@ -644,4 +1923,3 @@ el_home_applet_class_init (ELHomeAppletClass *klass)
 
         g_type_class_add_private (klass, sizeof (ELHomeAppletPrivate));
 }
-