X-Git-Url: http://git.maemo.org/git/?p=conv-inbox;a=blobdiff_plain;f=src%2Fel-home-applet.c;h=39fa0616bdcec66df73ee92aaa28c81972907ac5;hp=3e6c0e32227e75ff41c135767f9536e7062b671f;hb=HEAD;hpb=7b5d6ebb40d378a5e8ebd95e011112c8002c21d2 diff --git a/src/el-home-applet.c b/src/el-home-applet.c index 3e6c0e3..39fa061 100644 --- a/src/el-home-applet.c +++ b/src/el-home-applet.c @@ -22,21 +22,25 @@ #include "config.h" #include "el-home-applet.h" - +#include #include #include +#include #include #include +#include #include #include #include #include -#include +#include #include #include #include #include +#include +#include #define EL_HOME_APPLET_GET_PRIVATE(obj) ( \ G_TYPE_INSTANCE_GET_PRIVATE (obj, \ @@ -53,13 +57,19 @@ #define HEADER_HEIGHT 48 #define FOOTER_HEIGHT 24 -#define FOOTER_HEIGHT_PRESS 48 /* approx, used only for checking clicks, bigger than controls */ -#define FOOTER_WIDTH C_WIDTH/5 +#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 */ @@ -69,6 +79,17 @@ #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, @@ -81,12 +102,15 @@ struct _ELHomeAppletPrivate RTComEl *eventlogger; GtkWidget *sender; - /* GtkWidget *icon; */ + GtkWidget *icon; GtkWidget *unread; GtkWidget *received; - GtkWidget *empty; GtkWidget *cut_message; - GtkWidget *avatar; + + /* empty view*/ + GtkWidget *empty; + GtkWidget *sms_total; + GtkWidget *chat_total; gchar *message; gint event_id; @@ -100,9 +124,11 @@ struct _ELHomeAppletPrivate float green; float blue; } active_color; - guint8 border_color[4]; PangoFontDescription *font_desc; + GdkPixbuf *avatar_pixbuf; + GdkPixbuf *presence_pixbuf; + guint idle_id; cairo_surface_t *message_surface; @@ -117,7 +143,13 @@ struct _ELHomeAppletPrivate gchar *contact_id; gchar *remote_id; gchar *local_id; + gchar *channel; + int flags; OssoABookContact *contact; + + gboolean time_fmt_24h; + + guint init_timer; }; HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM); @@ -126,8 +158,8 @@ const gchar* g_module_check_init (GModule *module); const gchar* g_module_check_init (GModule *module) { - g_module_make_resident (module); - return NULL; + g_module_make_resident (module); + return NULL; } static void @@ -150,34 +182,79 @@ 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) + double x, + double y, + double w, + double h, + double r, + guint round_corners) { - 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); + 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* @@ -271,11 +348,6 @@ style_set_cb (GtkWidget *widget, 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; - - priv->border_color[0] = color.red; - priv->border_color[1] = color.green; - priv->border_color[2] = color.blue; - priv->border_color[3] = 255; } } @@ -328,7 +400,8 @@ expose_event (GtkWidget *self, GdkEventExpose *event) CONTENT_OFFSET_Y_TOP, BOX_WIDTH - 2*CONTENT_OFFSET_X, BOX_HEIGHT - (CONTENT_OFFSET_Y_TOP + CONTENT_OFFSET_Y_BOTTOM), - BOX_RADIOUS); + BOX_RADIOUS, + ROUND_CORNER_ALL); cairo_close_path (cr); cairo_stroke (cr); @@ -337,14 +410,11 @@ expose_event (GtkWidget *self, GdkEventExpose *event) cairo_set_line_width (cr, 1.0f); cairo_translate (cr, CONTENT_OFFSET_X, CONTENT_OFFSET_Y_TOP); - 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); - + rounded_rectangle (cr, + 0, 0, + C_WIDTH, HEADER_HEIGHT, + BOX_RADIOUS, + ROUND_CORNER_TL | ROUND_CORNER_TR); cairo_close_path (cr); switch (priv->active) { @@ -372,13 +442,11 @@ expose_event (GtkWidget *self, GdkEventExpose *event) /* draw body */ if (!priv->message) { - 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); + rounded_rectangle (cr, + 0, HEADER_HEIGHT, + C_WIDTH, C_HEIGHT - HEADER_HEIGHT, + BOX_RADIOUS, + ROUND_CORNER_BL | ROUND_CORNER_BR); cairo_close_path (cr); } else @@ -416,14 +484,50 @@ expose_event (GtkWidget *self, GdkEventExpose *event) 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 */ - cairo_move_to (cr, 0, C_HEIGHT - FOOTER_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, FOOTER_WIDTH, C_HEIGHT); - cairo_line_to (cr, FOOTER_WIDTH, C_HEIGHT - FOOTER_HEIGHT); - cairo_line_to (cr, 0, C_HEIGHT - FOOTER_HEIGHT); + 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 */ @@ -441,12 +545,11 @@ expose_event (GtkWidget *self, GdkEventExpose *event) cairo_fill (cr); /* draw footer received part bg */ - cairo_move_to (cr, FOOTER_WIDTH, C_HEIGHT - FOOTER_HEIGHT); - cairo_rel_line_to (cr, 0, FOOTER_HEIGHT); - cairo_rel_line_to (cr, C_WIDTH - FOOTER_WIDTH - BOX_RADIOUS, 0); - cairo_rel_curve_to (cr, BOX_RADIOUS, 0, BOX_RADIOUS, 0, BOX_RADIOUS, -BOX_RADIOUS); - cairo_rel_line_to (cr, 0, -(FOOTER_HEIGHT - BOX_RADIOUS)); - cairo_rel_line_to (cr, -(C_WIDTH - FOOTER_WIDTH), 0); + 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); @@ -488,40 +591,211 @@ expose_event (GtkWidget *self, GdkEventExpose *event) return GTK_WIDGET_CLASS (el_home_applet_parent_class)->expose_event (self, 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 -clean_state (ELHomeApplet *self) +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->message) { - g_free (priv->message); - priv->message = NULL; + 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) { - g_free (priv->contact_id); - priv->contact_id = NULL; + contacts = osso_abook_aggregator_lookup + (OSSO_ABOOK_AGGREGATOR (priv->aggregator), + priv->contact_id); } - if (priv->local_id) { - g_free (priv->local_id); - priv->local_id = NULL; + 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 (priv->remote_id) { - g_free (priv->remote_id); - priv->remote_id = NULL; + + 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; @@ -529,10 +803,43 @@ clean_state (ELHomeApplet *self) } 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->channel) { + g_free (priv->channel); + priv->channel = NULL; + } +} + +static void dispose (GObject *self) { ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv; + 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); @@ -548,6 +855,7 @@ dispose (GObject *self) } clean_state (EL_HOME_APPLET (self)); + clean_contact (EL_HOME_APPLET (self), FALSE); G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self); } @@ -563,9 +871,8 @@ aggregator_ready_cb (OssoABookWaitable *waitable, const GError *error, gpointer userdata) { - ELHomeApplet *self = EL_HOME_APPLET(userdata); + ELHomeApplet *self = EL_HOME_APPLET (userdata); ELHomeAppletPrivate *priv = self->priv; - GList *contacts = NULL; priv->aggregator_ready_closure = NULL; @@ -574,59 +881,20 @@ aggregator_ready_cb (OssoABookWaitable *waitable, return; } - 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) { - GdkPixbuf *avatar_image; - - priv->contact = g_object_ref (OSSO_ABOOK_CONTACT (contacts->data)); - gtk_label_set_text (GTK_LABEL (priv->sender), - osso_abook_contact_get_display_name (priv->contact)); + g_signal_connect (priv->aggregator, + "contacts-added", + G_CALLBACK (contacts_added), + self); + g_signal_connect (priv->aggregator, + "contacts-removed", + G_CALLBACK (contacts_removed), + self); - avatar_image = osso_abook_avatar_get_image_rounded - (OSSO_ABOOK_AVATAR (priv->contact), - HILDON_ICON_PIXEL_SIZE_THUMB, - HILDON_ICON_PIXEL_SIZE_THUMB, - TRUE, - -1, - priv->border_color); - - if (avatar_image) { - gtk_image_set_from_pixbuf (GTK_IMAGE (priv->avatar), - avatar_image); - gtk_widget_show (priv->avatar); - g_object_unref (avatar_image); - } - gtk_widget_queue_draw (GTK_WIDGET (self)); - } + resolve_contact (self); } static void -resolve_contact (ELHomeApplet *self) +start_aggregator (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; EBookQuery *query = NULL; @@ -668,25 +936,40 @@ resolve_contact (ELHomeApplet *self) } 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 = "%x %X"; + 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 = "%X"; - - 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; } @@ -697,77 +980,45 @@ show_event (ELHomeApplet *self, RTComElIter *it) ELHomeAppletPrivate *priv = self->priv; 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", &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; - } + 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, + "channel", &priv->channel, + "flags", &priv->flags, + 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; } -#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 + priv->event_id = -1; } - else { + else priv->event_id = -1; - } - - gtk_widget_hide (priv->avatar); - 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 0 - gtk_widget_hide (priv->avatar); - if (icon_name) { - const gchar *current_icon_name; - gtk_image_get_icon_name (GTK_IMAGE (priv->icon), - ¤t_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) + 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); - g_free (remote); stop_scroll_anim (priv); priv->scroll_offset = 0; @@ -778,6 +1029,8 @@ show_event (ELHomeApplet *self, RTComElIter *it) gtk_widget_hide (priv->cut_message); gtk_widget_queue_draw (GTK_WIDGET (self)); + + g_free (remote); } static RTComElIter* @@ -786,28 +1039,19 @@ 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) { 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 { 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); @@ -867,18 +1111,173 @@ 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); - resolve_contact (self); + 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 (%d)"; + + 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 @@ -886,7 +1285,7 @@ remove_notification (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - DBusGConnection* conn; + DBusGConnection *conn; GError *error; DBusGProxy *proxy; GPtrArray *conv_structs; @@ -962,13 +1361,44 @@ mark_as_read (ELHomeApplet *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; - McAccountChannelrequestData request; - if (!(priv->remote_id && priv->local_id)) + if (!((priv->remote_id || priv->channel) && priv->local_id)) return; account = osso_abook_account_manager_lookup_by_name (NULL, @@ -976,18 +1406,54 @@ open_conversation (ELHomeApplet *self) if (!account) return; - 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, /* handler */ - MC_ACCOUNT_CR_FLAG_USE_EXISTING, - NULL, NULL, NULL, NULL); + if ((priv->flags & RTCOM_EL_FLAG_CHAT_GROUP) && + (priv->flags & RTCOM_EL_FLAG_CHAT_OPAQUE)) { + if (!priv->channel) + return; + + 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, priv->channel, + 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 { + McAccountChannelrequestData request; + + MC_ACCOUNT_CRD_INIT (&request); + MC_ACCOUNT_CRD_SET (&request, channel_type, TP_IFACE_QUARK_CHANNEL_TYPE_TEXT); + + if ((priv->flags & RTCOM_EL_FLAG_CHAT_ROOM) && + priv->channel) { + MC_ACCOUNT_CRD_SET (&request, target_handle_type, TP_HANDLE_TYPE_ROOM); + MC_ACCOUNT_CRD_SET (&request, target_id, priv->channel); + } + else if (priv->remote_id) { + MC_ACCOUNT_CRD_SET (&request, target_handle_type, TP_HANDLE_TYPE_CONTACT); + MC_ACCOUNT_CRD_SET (&request, target_id, priv->remote_id); + } + else + return; + + mc_account_channelrequest (account, + &request, + time (NULL), + NULL, + MC_ACCOUNT_CR_FLAG_USE_EXISTING, + NULL, NULL, NULL, NULL); + } } static gboolean @@ -996,7 +1462,12 @@ read_new_event (ELHomeApplet *self) ELHomeAppletPrivate *priv = self->priv; read_event (self); - priv->unread_count = query_unread_events (priv->eventlogger); + + if (priv->event_id >= 0) + priv->unread_count = query_unread_events (priv->eventlogger); + else + priv->unread_count = 0; + update_unread_label (self); priv->idle_id = 0; @@ -1025,7 +1496,39 @@ new_event_cb (RTComEl *backend, const gchar *service, ELHomeApplet *self) { - /* TODO: avoid updating if not related */ + 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); +} + +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); } @@ -1040,7 +1543,7 @@ scroll_anim_cb (ELHomeApplet *self) 3*CONTENT_OFFSET_X, HEADER_HEIGHT + CONTENT_OFFSET_Y_TOP, MESSAGE_WIDTH, - C_HEIGHT - priv->received->allocation.height - HEADER_HEIGHT); + MESSAGE_HEIGHT); to_continue = priv->scroll_offset <= priv->hidden_message_height; if (!to_continue) { @@ -1058,7 +1561,7 @@ button_press_event_cb (GtkWidget *widget, { ELHomeAppletPrivate *priv = self->priv; - if (priv->event_id > 0) { + if (priv->event_id >= 0) { if (event->y < CONTENT_OFFSET_Y_TOP + HEADER_HEIGHT) { if (priv->aggregator && osso_abook_waitable_is_ready @@ -1066,13 +1569,16 @@ button_press_event_cb (GtkWidget *widget, priv->active = SELECTED_HEADER; } else if (event->y > (BOX_HEIGHT - CONTENT_OFFSET_Y_BOTTOM - FOOTER_HEIGHT_PRESS) && - event->x < FOOTER_WIDTH) + event->x < FOOTER_WIDTH_PRESS) priv->active = SELECTED_FOOTER; else priv->active = SELECTED_BODY; - - gtk_widget_queue_draw (widget); } + else { + priv->active = SELECTED_BODY; + } + + gtk_widget_queue_draw (widget); return TRUE; } @@ -1139,8 +1645,12 @@ button_release_event_cb (GtkWidget *widget, switch (priv->active) { case SELECTED_BODY: - reset_scroll (self); - open_conversation (self); + if (priv->event_id >= 0) { + reset_scroll (self); + open_conversation (self); + } + else + launch_conversations (self); break; case SELECTED_HEADER: { GtkWidget *dialog = NULL; @@ -1169,9 +1679,7 @@ button_release_event_cb (GtkWidget *widget, self); } else -#ifndef DEBUG_LAYOUT mark_as_read (self); -#endif break; default:; } @@ -1204,39 +1712,93 @@ leave_notify_event_cb (GtkWidget *widget, 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; +} + static void el_home_applet_init (ELHomeApplet *self) { ELHomeAppletPrivate *priv; GtkWidget *event_box; 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"); + priv->unread = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (priv->unread), 0.0f, 0.5f); hildon_helper_set_logical_font (priv->unread, "SmallSystemFont"); - /* gtk_widget_set_size_request (priv->unread, */ - /* -1, */ - /* HEADER_HEIGHT); */ -#if 0 - 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); -#endif - priv->avatar = gtk_image_new (); - gtk_misc_set_alignment (GTK_MISC (priv->avatar), - 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.55f); @@ -1245,17 +1807,39 @@ el_home_applet_init (ELHomeApplet *self) gtk_widget_set_name (priv->sender, "hildon-shadow-label"); hildon_helper_set_logical_font (priv->sender, "SystemFont"); gtk_widget_set_size_request (priv->sender, - -1, + C_WIDTH, HILDON_ICON_PIXEL_SIZE_THUMB); - priv->message = g_strdup ("One two three four five six seven eight nine ten"); - - /* TODO: l10n */ - priv->empty = gtk_label_new ("No new messages"); - gtk_widget_set_name (priv->empty, "hildon-shadow-label"); + /* 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 ("aewf aewf aewf awef"); + priv->received = gtk_label_new (NULL); gtk_misc_set_alignment (GTK_MISC (priv->received), 1.0f, 0.5f); @@ -1272,13 +1856,12 @@ el_home_applet_init (ELHomeApplet *self) 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->icon, FALSE, FALSE, 0); */ - gtk_box_pack_start (GTK_BOX (hbox), priv->sender, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), priv->avatar, FALSE, FALSE, 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); @@ -1324,21 +1907,16 @@ el_home_applet_init (ELHomeApplet *self) gtk_widget_show_all (GTK_WIDGET (event_box)); -#ifndef DEBUG_LAYOUT - priv->eventlogger = rtcom_el_new (); - 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); - - read_new_event (self); osso_abook_init_with_name (PACKAGE, NULL); -#endif + + 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 @@ -1354,4 +1932,3 @@ el_home_applet_class_init (ELHomeAppletClass *klass) g_type_class_add_private (klass, sizeof (ELHomeAppletPrivate)); } -