#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-contact.h>
+#include <libosso-abook/osso-abook-presence.h>
+#include <libosso-abook/osso-abook-avatar.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>
#define MESSAGE_HEIGHT (C_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT)
#define MESSAGE_WIDTH (C_WIDTH - 2*HILDON_MARGIN_DEFAULT)
+#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 */
RTComEl *eventlogger;
GtkWidget *sender;
- /* GtkWidget *icon; */
+ GtkWidget *icon;
GtkWidget *unread;
GtkWidget *received;
GtkWidget *empty;
float green;
float blue;
} active_color;
- guint8 border_color[4];
PangoFontDescription *font_desc;
- GdkPixbuf *service_pixbuf;
+ GdkPixbuf *avatar_pixbuf;
+ GdkPixbuf *presence_pixbuf;
guint idle_id;
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;
}
}
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) {
- if (priv->service_pixbuf) {
- gdk_cairo_set_source_pixbuf (cr,
- priv->service_pixbuf,
- 0, 0);
- cairo_paint_with_alpha (cr, 0.5);
- }
/* draw footer unread part bg */
rounded_rectangle (cr,
return GTK_WIDGET_CLASS (el_home_applet_parent_class)->expose_event (self, event);
}
+static void
+update_presence_pixbuf (ELHomeApplet *self,
+ OssoABookPresence *presence)
+{
+ ELHomeAppletPrivate *priv = self->priv;
+ const gchar *icon_name = osso_abook_presence_get_icon_name (presence);
+
+ if (priv->presence_pixbuf) {
+ g_object_unref (priv->presence_pixbuf);
+ priv->presence_pixbuf = NULL;
+ }
+ g_warning ("presence %s", icon_name);
+ 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);
+
+ gtk_widget_queue_draw (GTK_WIDGET (self));
+}
static void
-clean_state (ELHomeApplet *self)
+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
+resolve_contact (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
+ GList *contacts = NULL;
- if (priv->service_pixbuf) {
- g_object_unref (priv->service_pixbuf);
- priv->service_pixbuf = 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));
+ gtk_label_set_text (GTK_LABEL (priv->sender),
+ osso_abook_contact_get_display_name (priv->contact));
+
+ 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);
+
+ g_warning ("HAVE avatar");
+ if (priv->avatar_pixbuf) {
+ gtk_widget_set_size_request (priv->sender,
+ C_WIDTH - AVATAR_SIZE - HILDON_MARGIN_DEFAULT,
+ HILDON_ICON_PIXEL_SIZE_THUMB);
+
+ }
+
+ update_presence_pixbuf (self,
+ OSSO_ABOOK_PRESENCE (priv->contact));
+ g_signal_connect (priv->contact,
+ "notify::presence-status",
+ G_CALLBACK (presence_updated),
+ self);
+ gtk_widget_queue_draw (GTK_WIDGET (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)
+{
+ ELHomeAppletPrivate *priv = self->priv;
+
+ gtk_widget_set_size_request (priv->sender,
+ C_WIDTH,
+ HILDON_ICON_PIXEL_SIZE_THUMB);
+
+ gtk_widget_hide (priv->icon);
+
+ 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;
+ }
+}
+
+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);
+
+ gtk_widget_queue_draw (GTK_WIDGET (self));
+ return;
+ }
+ if (strcmp (*contact_id, uid) == 0) {
+ reset_contact (self);
+ resolve_contact (self);
+ gtk_widget_queue_draw (GTK_WIDGET (self));
+ return;
+ }
+ }
+ }
+}
+
+static void
+clean_state (ELHomeApplet *self)
+{
+ ELHomeAppletPrivate *priv = self->priv;
+
+ reset_contact (self);
if (priv->message) {
g_free (priv->message);
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;
}
+ 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;
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;
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_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));
- }
+ resolve_contact (self);
}
static void
-resolve_contact (ELHomeApplet *self)
+start_aggregator (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
EBookQuery *query = NULL;
GError *error = NULL;
-
+ g_warning ("%s rid %s lid %s", G_STRFUNC, priv->remote_id, priv->local_id);
if (priv->local_id && priv->remote_id) {
const gchar *vcard = osso_abook_account_manager_get_vcard_field
(NULL, priv->local_id);
else
query = e_book_query_any_field_contains (priv->remote_id);
}
-
+ g_warning ("%s query %p", G_STRFUNC, query);
if (query) {
priv->aggregator = osso_abook_aggregator_new_with_query (NULL,
query,
}
if (priv->aggregator) {
+ g_warning ("%s start aggr", G_STRFUNC);
priv->aggregator_ready_closure = osso_abook_waitable_call_when_ready
(OSSO_ABOOK_WAITABLE (priv->aggregator),
aggregator_ready_cb,
show_event (ELHomeApplet *self, RTComElIter *it)
{
ELHomeAppletPrivate *priv = self->priv;
- gchar *remote = NULL;
+ const gchar *remote = NULL;
gchar *received = NULL;
- /* const gchar *icon_name = NULL; */
+ GValueArray *event = NULL;
if (it && rtcom_el_iter_first (it)) {
- rtcom_el_iter_dup_string (it, "free-text", &priv->message);
- if (priv->message) {
- /* const gchar *service; */
- time_t received_t;
- rtcom_el_iter_get_int (it, "id", &priv->event_id);
- if (rtcom_el_iter_get_int (it, "start-time", (gint*)&received_t))
- received = format_time (received_t);
-
- if (rtcom_el_iter_dup_string (it, "remote-uid", &priv->remote_id)) {
- if (priv->remote_id && priv->remote_id[0]) {
- if (!rtcom_el_iter_dup_string (it, "remote-name", &remote))
- remote = g_strdup (priv->remote_id);
-
- rtcom_el_iter_dup_string (it, "remote-ebook-uid", &priv->contact_id);
- rtcom_el_iter_dup_string (it, "local-uid", &priv->local_id);
- }
- else if (priv->remote_id) {
- g_free (priv->remote_id);
- priv->remote_id = NULL;
- }
+ event = rtcom_el_iter_get_valuearray (it,
+ "id",
+ "start-time",
+ "local-uid",
+ "remote-uid",
+ "remote-name",
+ "remote-ebook-uid",
+ "free-text",
+ "group-uid",
+ NULL);
+ if (event) {
+ time_t received_t;
+#define _VARR_DUP_STR(array, i) g_value_dup_string (g_value_array_get_nth ((array), (i)))
+
+ priv->event_id = g_value_get_int (g_value_array_get_nth (event, 0));
+ received_t = g_value_get_int (g_value_array_get_nth (event, 1));
+ received = format_time (received_t);
+ priv->local_id = _VARR_DUP_STR (event, 2);
+ priv->remote_id = _VARR_DUP_STR (event, 3);
+ if (priv->remote_id && priv->remote_id[0]) {
+ remote = g_value_get_string (g_value_array_get_nth (event, 4));
+ if (!remote)
+ remote = priv->remote_id;
+ priv->contact_id = _VARR_DUP_STR (event, 5);
}
- rtcom_el_iter_dup_string (it, "group-uid", &priv->group_uid);
-#if 0
- service = rtcom_el_iter_get_service (it);
- if (!g_strcmp0 (service, "RTCOM_EL_SERVICE_SMS"))
- icon_name = "chat_unread_sms";
- else if (!g_strcmp0 (service, "RTCOM_EL_SERVICE_CHAT"))
- icon_name = "chat_unread_chat";
-#endif
+ else if (priv->remote_id) {
+ g_free (priv->remote_id);
+ priv->remote_id = NULL;
+ }
+
+ priv->message = _VARR_DUP_STR (event, 6);
+ priv->group_uid = _VARR_DUP_STR (event, 7);
+
+#undef _VARR_DUP_STR
}
}
else {
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)
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;
priv->message_surface = NULL;
}
+ if (event)
+ g_value_array_free (event);
+
gtk_widget_hide (priv->cut_message);
gtk_widget_queue_draw (GTK_WIDGET (self));
}
rtcom_el_query_prepare (query,
"is-read", FALSE, RTCOM_EL_OP_EQUAL,
"service", conv_services, RTCOM_EL_OP_IN_STRV,
- "event-type", conv_event_types, RTCOM_EL_OP_IN_STRV,
+ /* "event-type", conv_event_types, RTCOM_EL_OP_IN_STRV, */
NULL);
}
it = rtcom_el_get_events (el, query);
{
ELHomeAppletPrivate *priv = self->priv;
RTComElIter *it = NULL;
+ const gchar *icon_name = NULL;
clean_state (self);
it = make_query (priv->eventlogger, -1);
show_event (self, it);
- resolve_contact (self);
+ start_aggregator (self);
- if (g_strcmp0 (priv->local_id, "ring/tel/ring" == 0)) {
+ if (g_strcmp0 (priv->local_id, "ring/tel/ring") == 0) {
+ icon_name = "general_sms";
+ }
+ else{
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,
- 128,
- 0, NULL);
- }
+ if (icon_name) {
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
+ icon_name,
+ HILDON_ICON_SIZE_XSMALL);
+ gtk_widget_show (priv->icon);
}
if (it) g_object_unref (it);
{
ELHomeAppletPrivate *priv = self->priv;
+ g_warning ("read_new_event");
+
read_event (self);
priv->unread_count = query_unread_events (priv->eventlogger);
update_unread_label (self);
add_new_idle (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
-
+ g_warning ("add_new_idle");
if (priv->idle_id)
g_source_remove (priv->idle_id);
priv->idle_id = g_idle_add ((GSourceFunc)read_new_event,
const gchar *service,
ELHomeApplet *self)
{
+ g_warning ("%s %s %s %s", local_uid, remote_uid, remote_ebook_uid, service);
+#if 0
const gchar** conv_service = conv_services;
-
+ g_warning ("%s", service);
do {
+ g_warning ("%s", *conv_service);
if (!g_strcmp0 (*conv_service, service)) {
add_new_idle (self);
return;
}
}
- while(++conv_service);
+ while(*++conv_service);
+#else
+ add_new_idle (self);
+#endif
}
static gboolean
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,
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");
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);
G_CALLBACK (new_event_cb),
self);
- read_new_event (self);
-
osso_abook_init_with_name (PACKAGE, NULL);
+
+ add_new_idle (self);
#endif
}
projects / conv-inbox / blobdiff