X-Git-Url: http://git.maemo.org/git/?p=conv-inbox;a=blobdiff_plain;f=src%2Fel-home-applet.c;h=cf732618cee99050c69ece60c4a633759df3cd83;hp=c5853908fe8c29381f60e18aba09920f11732e56;hb=def5b5d43a785171d7072fc093b0aaa0a7c633d3;hpb=4d28752276d910690f1e41116af7f1573aaae84b diff --git a/src/el-home-applet.c b/src/el-home-applet.c index c585390..cf73261 100644 --- a/src/el-home-applet.c +++ b/src/el-home-applet.c @@ -27,58 +27,119 @@ #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, \ EL_TYPE_HOME_APPLET, ELHomeAppletPrivate)) #define BOX_WIDTH 352 -#define BOX_HEIGHT 256 +#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 SERVICE_ICON_SIZE 64 + +#define BOX_RADIOUS 20 + +#define SCROLL_PERIOD 100 /* ms */ +#define SCROLL_STEP 1 /* pixel */ +#define TEXT_Y_OFFSET (HEADER_HEIGHT + HILDON_MARGIN_HALF) -#define DEBUG_LAYOUT +#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" + +static const gchar *conv_services[] = {"RTCOM_EL_SERVICE_SMS", + "RTCOM_EL_SERVICE_CHAT", + NULL}; +static const gchar *conv_event_types[] = {"RTCOM_EL_EVENTTYPE_SMS_INBOUND", + "RTCOM_EL_EVENTTYPE_CHAT_INBOUND", + NULL}; + +typedef enum { + SELECTED_NONE, + SELECTED_HEADER, + SELECTED_BODY, + SELECTED_FOOTER +} WidgetActiveSelection; struct _ELHomeAppletPrivate { RTComEl *eventlogger; GtkWidget *sender; - GtkWidget *icon; + /* GtkWidget *icon; */ GtkWidget *unread; GtkWidget *received; GtkWidget *empty; + GtkWidget *cut_message; + GtkWidget *avatar; 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; + guint8 border_color[4]; + PangoFontDescription *font_desc; + + GdkPixbuf *service_pixbuf; guint idle_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; }; 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; @@ -104,100 +165,204 @@ 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 gboolean -draw_text (cairo_t *cr, - const gchar *text, - double x, - double y, - int width, - int height, - int offset) +static cairo_surface_t* +draw_text (cairo_t *cr, + PangoFontDescription *desc, + const gchar *text, + gint width, + gint *height) { PangoLayout *layout; - PangoFontDescription *desc; - gboolean result; PangoRectangle extent; - cairo_save (cr); - cairo_rectangle (cr, - x, y, width, height); - cairo_clip (cr); + 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); - desc = pango_font_description_from_string ("Sans 17"); pango_layout_set_font_description (layout, desc); - pango_font_description_free (desc); pango_layout_set_wrap (layout, PANGO_WRAP_WORD_CHAR); - if (!offset) - pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END); pango_layout_set_width (layout, PANGO_SCALE*width); - pango_layout_set_height (layout, PANGO_SCALE*height); + 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 (cr, x + 1, y + 1 - offset); - cairo_set_source_rgba (cr, 0.2, 0.2, 0.2, 0.8); - pango_cairo_show_layout (cr, layout); + 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 (cr, x, y - offset); - cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 1.0); - pango_cairo_show_layout (cr, layout); - - pango_layout_get_pixel_extents (layout, NULL, &extent); - if (offset) - result = height < (extent.height - offset); - else - result = pango_layout_is_ellipsized (layout); + 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); - cairo_restore (cr); - return result; + return result_surface; } -static void +static gboolean stop_scroll_anim (ELHomeAppletPrivate *priv) { - priv->scroll_on_click = FALSE; - priv->scroll_offset = 0; - if (priv->scroll_anim_id > 0) { + gboolean result = priv->scroll_anim_id > 0; + + 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; + 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; + + priv->border_color[0] = color.red; + priv->border_color[1] = color.green; + priv->border_color[2] = color.blue; + priv->border_color[3] = 255; + } +} + +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)); } } @@ -205,139 +370,257 @@ static gboolean expose_event (GtkWidget *self, GdkEventExpose *event) { ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv; - cairo_t *cr; - GdkColor color; - float red, green, blue; - int message_height; - - message_height = C_HEIGHT - priv->received->allocation.height - HEADER_HEIGHT; - - /* 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; + cairo_pattern_t *grad; cr = gdk_cairo_create (self->window); gdk_cairo_region (cr, event->region); cairo_clip (cr); - /* draw bound box */ 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_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_close_path(cr); + cairo_fill (cr); - 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_move_to (cr, 0, HEADER_HEIGHT); + cairo_line_to (cr, C_WIDTH, HEADER_HEIGHT); + cairo_set_source_rgba (cr, + priv->active_color.red, + priv->active_color.green, + priv->active_color.blue, + 1.0f); cairo_stroke (cr); /* draw body */ - 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); + 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_rectangle (cr, 0, HEADER_HEIGHT, + C_WIDTH, MESSAGE_HEIGHT); /* draw body filling depending on (in)active state */ - cairo_pattern_t *grad; - grad = cairo_pattern_create_linear(0, HEADER_HEIGHT, - 0, C_HEIGHT); - - if (priv->active){ - cairo_pattern_add_color_stop_rgba (grad, 0.5f, - red, green, blue, 0.8f); - cairo_pattern_add_color_stop_rgba (grad, 1.0f, - red/2, green/2, blue/2, 0.8f); - } - else { + 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); */ - - /* draw message */ - gboolean ellipsized; - ellipsized = draw_text (cr, priv->message, - 2*C_X, HEADER_HEIGHT, - MESSAGE_WIDTH, - message_height, - priv->scroll_offset); - if (!priv->scroll_offset && !priv->active) - priv->scroll_on_click = ellipsized; - cairo_pattern_destroy (grad); - cairo_destroy (cr); - if (!priv->scroll_on_click && !ellipsized && priv->scroll_offset) - stop_scroll_anim (priv); + if (priv->message) { + if (priv->service_pixbuf) { + cairo_set_operator (cr, CAIRO_OPERATOR_OVER); + gdk_cairo_set_source_pixbuf (cr, + priv->service_pixbuf, + C_WIDTH - SERVICE_ICON_SIZE, + C_HEIGHT - FOOTER_HEIGHT - SERVICE_ICON_SIZE); + cairo_paint_with_alpha (cr, 0.3); + } + + /* 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); return GTK_WIDGET_CLASS (el_home_applet_parent_class)->expose_event (self, event); } + +static void +clean_state (ELHomeApplet *self) +{ + ELHomeAppletPrivate *priv = self->priv; + + if (priv->service_pixbuf) { + g_object_unref (priv->service_pixbuf); + priv->service_pixbuf = NULL; + } + + 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; + } + + if (priv->contact) { + g_object_unref (priv->contact); + priv->contact = NULL; + } + 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; + } + osso_abook_roster_stop (priv->aggregator); + g_object_unref (priv->aggregator); + priv->aggregator = NULL; + } +} + static void dispose (GObject *self) { ELHomeAppletPrivate *priv = EL_HOME_APPLET(self)->priv; stop_scroll_anim (priv); - if (priv->idle_id){ + 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->message){ - g_free (priv->message); - priv->message = NULL; + if (priv->font_desc) { + pango_font_description_free (priv->font_desc); + priv->font_desc = NULL; } + clean_state (EL_HOME_APPLET (self)); + G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self); } @@ -347,6 +630,115 @@ 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; + GList *contacts = NULL; + + priv->aggregator_ready_closure = NULL; + + if (error) { + g_warning ("Failed to create aggregator: %s", error->message); + 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)); + + avatar_image = osso_abook_avatar_get_image_scaled /*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)); + } +} + +static void +resolve_contact (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) { @@ -354,7 +746,7 @@ format_time (time_t t) time_t now; struct tm now_tm, t_tm; - const gchar *format = "%Y.%m.%d %T"; + const gchar *format = "%x %X"; gchar *result = g_malloc0 (RESULT_SIZE); now = time (NULL); @@ -364,7 +756,7 @@ format_time (time_t t) 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"; + format = "%X"; strftime (result, RESULT_SIZE, format, &t_tm); @@ -375,63 +767,79 @@ static void show_event (ELHomeApplet *self, RTComElIter *it) { ELHomeAppletPrivate *priv = self->priv; - - gchar *remote = NULL; + const gchar *remote = NULL; gchar *received = NULL; - const gchar *icon_name = NULL; - - if (priv->message) { - g_free (priv->message); - priv->message = NULL; - } - - if (it && rtcom_el_iter_first (it)){ - rtcom_el_iter_dup_string (it, "free-text", &priv->message); - if (priv->message){ - const gchar *service; + GValueArray *event = NULL; + + if (it && rtcom_el_iter_first (it)) { + + event = rtcom_el_iter_get_valuearray (it, + "id", + "start-time", + "local-uid", + "remote-uid", + "remote-name", + "remote-ebook-uid", + "free-text", + "group-uid", + NULL); + if (event) { time_t received_t; - - 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"; +#define _VARR_DUP_STR(array, i) g_value_dup_string (g_value_array_get_nth ((array), (i))) + + priv->event_id = g_value_get_int (g_value_array_get_nth (event, 0)); + received_t = g_value_get_int (g_value_array_get_nth (event, 1)); + received = format_time (received_t); + priv->local_id = _VARR_DUP_STR (event, 2); + priv->remote_id = _VARR_DUP_STR (event, 3); + if (priv->remote_id && priv->remote_id[0]) { + remote = g_value_get_string (g_value_array_get_nth (event, 4)); + if (!remote) + remote = priv->remote_id; + priv->contact_id = _VARR_DUP_STR (event, 5); + } + else if (priv->remote_id) { + g_free (priv->remote_id); + priv->remote_id = NULL; + } + + priv->message = _VARR_DUP_STR (event, 6); + priv->group_uid = _VARR_DUP_STR (event, 7); + +#undef _VARR_DUP_STR } } - else{ + else { priv->event_id = -1; } - if (priv->message) + gtk_widget_hide (priv->avatar); + + if (priv->message) { gtk_widget_hide (priv->empty); - else + } + else { gtk_widget_show (priv->empty); + } - gtk_label_set_text (GTK_LABEL (priv->sender), remote); 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), - ¤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); - } + if (remote) + 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); - g_free (remote); + stop_scroll_anim (priv); + priv->scroll_offset = 0; + if (priv->message_surface) { + cairo_surface_destroy (priv->message_surface); + priv->message_surface = NULL; + } + if (event) + g_value_array_free (event); + + gtk_widget_hide (priv->cut_message); gtk_widget_queue_draw (GTK_WIDGET (self)); } @@ -441,32 +849,22 @@ 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, + "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; } @@ -475,11 +873,14 @@ static void update_unread_label (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; - gchar *text; - if (priv->unread_count > 0){ - text = g_strdup_printf ("%d", priv->unread_count); - gtk_label_set_text (GTK_LABEL (priv->unread), text); + if (priv->unread_count > 0) { + gchar *text; + text = g_strdup_printf + ("%d*", + priv->unread_count); + + gtk_label_set_markup (GTK_LABEL (priv->unread), text); g_free (text); } else @@ -500,17 +901,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); } @@ -525,24 +926,173 @@ read_event (ELHomeApplet *self) ELHomeAppletPrivate *priv = self->priv; RTComElIter *it = NULL; + clean_state (self); + it = make_query (priv->eventlogger, -1); show_event (self, it); + resolve_contact (self); + + if (g_strcmp0 (priv->local_id, "ring/tel/ring" == 0)) { + McAccount *account; + const gchar *icon_name = NULL; + 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) { + GdkScreen *screen; + GtkIconTheme *icon_theme; + + screen = gtk_widget_get_screen (GTK_WIDGET (self)); + icon_theme = gtk_icon_theme_get_for_screen (screen); + + priv->service_pixbuf = gtk_icon_theme_load_icon (icon_theme, + icon_name, + SERVICE_ICON_SIZE, + 0, NULL); + } + } + if (it) g_object_unref (it); } 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 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 +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); } } @@ -581,18 +1131,37 @@ new_event_cb (RTComEl *backend, const gchar *service, ELHomeApplet *self) { - add_new_idle (self); + const gchar** conv_service = conv_services; + + do { + if (!g_strcmp0 (*conv_service, service)) { + add_new_idle (self); + return; + } + } + while(++conv_service); } static gboolean scroll_anim_cb (ELHomeApplet *self) { ELHomeAppletPrivate *priv = self->priv; + gboolean to_continue; - priv->scroll_offset += 1; - gtk_widget_queue_draw (self); + 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); - return TRUE; + to_continue = priv->scroll_offset <= priv->hidden_message_height; + if (!to_continue) { + priv->scroll_anim_id = 0; + gtk_widget_hide (priv->cut_message); + } + + return to_continue; } static gboolean @@ -602,22 +1171,78 @@ button_press_event_cb (GtkWidget *widget, { ELHomeAppletPrivate *priv = self->priv; - if (priv->event_id > 0){ - priv->active = TRUE; + 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; + gtk_widget_queue_draw (widget); } - priv->active = TRUE; - if (priv->scroll_on_click) { - stop_scroll_anim (priv); - priv->scroll_anim_id = g_timeout_add (100, - scroll_anim_cb, - self); - } - 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, @@ -625,15 +1250,48 @@ button_release_event_cb (GtkWidget *widget, { ELHomeAppletPrivate *priv = self->priv; - if (priv->active){ - priv->active = FALSE; - /* stop_scroll_anim (priv); */ + switch (priv->active) { + case SELECTED_BODY: + reset_scroll (self); + open_conversation (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 #ifndef DEBUG_LAYOUT - mark_as_read (self); + mark_as_read (self); #endif - gtk_widget_queue_draw (widget); + break; + default:; } + priv->active = SELECTED_NONE; + gtk_widget_queue_draw (widget); + return TRUE; } @@ -644,12 +1302,18 @@ 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; } @@ -658,7 +1322,7 @@ el_home_applet_init (ELHomeApplet *self) { ELHomeAppletPrivate *priv; GtkWidget *event_box; - GtkWidget *hbox, *vbox, *align; + GtkWidget *hbox, *vbox, *align, *footer; self->priv = EL_HOME_APPLET_GET_PRIVATE (self); priv = self->priv; @@ -666,38 +1330,38 @@ el_home_applet_init (ELHomeApplet *self) 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"); 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"); + /* 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); 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"); 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"); + gtk_widget_set_size_request (priv->sender, + -1, + HILDON_ICON_PIXEL_SIZE_THUMB); - priv->message = g_strdup ("One two three four five six seven eight nine ten" - "one two three four five six seven eight nine ten" - "one two three four five six seven eight nine ten" - "one two three four five six seven eight nine ten" - "one two three four five six seven eight nine ten" - "one two three four five six seven eight nine ten"); + priv->message = g_strdup ("One two three four five six seven eight nine ten"); /* TODO: l10n */ priv->empty = gtk_label_new ("No new messages"); @@ -708,21 +1372,32 @@ el_home_applet_init (ELHomeApplet *self) 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->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); + + 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->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->empty, TRUE, TRUE, 0); - gtk_box_pack_end (GTK_BOX (vbox), priv->received, FALSE, FALSE, 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), @@ -738,12 +1413,27 @@ 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); + 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); + + g_signal_connect (event_box, + "style-set", + G_CALLBACK (style_set_cb), + self); + g_signal_connect (self, + "notify::is-on-current-desktop", + G_CALLBACK (notify_on_current_desktop), + self); gtk_widget_show_all (GTK_WIDGET (event_box)); @@ -759,6 +1449,8 @@ el_home_applet_init (ELHomeApplet *self) self); read_new_event (self); + + osso_abook_init_with_name (PACKAGE, NULL); #endif }