#include <libosso-abook/osso-abook-waitable.h>
#include <libosso-abook/osso-abook-contact.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 EL_HOME_APPLET_GET_PRIVATE(obj) ( \
G_TYPE_INSTANCE_GET_PRIVATE (obj, \
OssoABookRoster *aggregator;
OssoABookWaitableClosure *aggregator_ready_closure;
gchar *contact_id;
+ gchar *remote_id;
+ gchar *local_id;
+ OssoABookContact *contact;
};
HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM);
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->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->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)
{
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;
}
- 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_object_unref (priv->aggregator);
- priv->aggregator = NULL;
- }
+ clean_state (EL_HOME_APPLET (self));
G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self);
}
}
static void
-resolve_contact (ELHomeApplet *self)
+aggregator_ready_cb (OssoABookWaitable *waitable,
+ const GError *error,
+ gpointer userdata)
{
+ g_warning (G_STRFUNC);
+ ELHomeApplet *self = EL_HOME_APPLET(userdata);
ELHomeAppletPrivate *priv = self->priv;
+ GList *contacts = NULL;
- g_warning ("%s %s", G_STRFUNC, priv->contact_id);
+ priv->aggregator_ready_closure = NULL;
+
+ if (error) {
+ g_warning ("Failed to create aggregator: %s", error->message);
+ return;
+ }
if (priv->contact_id) {
- GList *contacts = osso_abook_aggregator_lookup (OSSO_ABOOK_AGGREGATOR (priv->aggregator),
- priv->contact_id);
- if (contacts && contacts->data) {
- OssoABookContact *contact = OSSO_ABOOK_CONTACT (contacts->data);
- gtk_label_set_text (GTK_LABEL (priv->sender),
- osso_abook_contact_get_display_name (contact));
- GdkPixbuf *avatar_image = osso_abook_avatar_get_image_rounded
- (OSSO_ABOOK_AVATAR (contact),
- HILDON_ICON_PIXEL_SIZE_THUMB,
- HILDON_ICON_PIXEL_SIZE_THUMB,
- TRUE,
- -1,
- priv->border_color);
- g_warning ("%s av_img %p", G_STRFUNC, avatar_image);
- if (avatar_image) {
- g_warning ("SHOE AVATAR");
- /* gtk_widget_hide (priv->icon); */
- /* gtk_widget_show (priv->avatar); */
- gtk_image_set_from_pixbuf (GTK_IMAGE (priv->avatar),
- avatar_image);
- g_object_unref (avatar_image);
+ 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_rounded
+ (OSSO_ABOOK_AVATAR (priv->contact),
+ HILDON_ICON_PIXEL_SIZE_THUMB,
+ HILDON_ICON_PIXEL_SIZE_THUMB,
+ TRUE,
+ -1,
+ priv->border_color);
+
+ g_warning ("contact's name %s\nid=%s\npid=%s",
+ osso_abook_contact_get_display_name (priv->contact),
+ osso_abook_contact_get_uid (priv->contact),
+ osso_abook_contact_get_persistent_uid (priv->contact));
+
+
+ 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;
+
+ g_warning ("%s %s %s %s", G_STRFUNC, priv->contact_id, priv->local_id, priv->remote_id);
+
+ 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);
+ g_warning ("AGG STARTED");
+ }
}
static gchar*
show_event (ELHomeApplet *self, RTComElIter *it)
{
ELHomeAppletPrivate *priv = self->priv;
-
+ g_warning (G_STRFUNC);
gchar *remote = NULL;
gchar *received = NULL;
const gchar *icon_name = 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 (it && rtcom_el_iter_first (it)) {
rtcom_el_iter_dup_string (it, "free-text", &priv->message);
if (priv->message) {
if (rtcom_el_iter_get_int (it, "start-time", (gint*)&received_t))
received = format_time (received_t);
+ rtcom_el_iter_dup_string (it, "remote-uid", &priv->remote_id);
if (!rtcom_el_iter_dup_string (it, "remote-name", &remote))
- rtcom_el_iter_dup_string (it, "remote-id", &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);
g_warning ("abook uid %s", priv->contact_id);
service = rtcom_el_iter_get_service (it);
if (!g_strcmp0 (service, "RTCOM_EL_SERVICE_SMS"))
priv->event_id = -1;
}
+ g_warning ("event_id=%d\nremote-uid=%s\nremote_name=%s",
+ priv->event_id,
+ priv->remote_id,
+ remote);
+
+ gtk_widget_hide (priv->avatar);
+
if (priv->message) {
gtk_widget_hide (priv->empty);
+ /* TODO: don's show avatar at all, fix layout */
gtk_widget_show (priv->avatar);
gtk_image_set_from_icon_name (GTK_IMAGE (priv->avatar),
"general_default_avatar",
}
else {
gtk_widget_show (priv->empty);
- gtk_widget_hide (priv->avatar);
}
gtk_label_set_text (GTK_LABEL (priv->received), received);
gtk_widget_hide (priv->icon);
#endif
- if (priv->contact_id &&
- priv->aggregator &&
- !priv->aggregator_ready_closure) {
- resolve_contact (self);
- }
- else {
+ 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);
static void
read_event (ELHomeApplet *self)
{
+ g_warning (G_STRFUNC);
ELHomeAppletPrivate *priv = self->priv;
RTComElIter *it = NULL;
+ clean_state (self);
+
it = make_query (priv->eventlogger, -1);
show_event (self, it);
+ resolve_contact (self);
if (it) g_object_unref (it);
}
mark_as_read (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
-
+ g_warning (G_STRFUNC);
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);
}
}
read_new_event (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
-
+ g_warning (G_STRFUNC);
read_event (self);
priv->unread_count = query_unread_events (priv->eventlogger);
update_unread_label (self);
const gchar *service,
ELHomeApplet *self)
{
+ /* TODO: avoid updating if not related */
add_new_idle (self);
}
GdkEventButton *event,
ELHomeApplet *self)
{
+ g_warning (G_STRFUNC);
ELHomeAppletPrivate *priv = self->priv;
if (priv->event_id > 0) {
- if (event->y < C_Y + HEADER_HEIGHT)
- priv->active_header = TRUE;
+ if (event->y < C_Y + HEADER_HEIGHT) {
+ if (priv->aggregator &&
+ osso_abook_waitable_is_ready
+ (OSSO_ABOOK_WAITABLE (priv->aggregator), NULL))
+ priv->active_header = TRUE;
+ }
else
priv->active_body = TRUE;
gtk_widget_queue_draw (widget);
return TRUE;
}
-static gboolean
-start_starter (OssoABookAggregator *aggregator, const gchar *contact_id)
+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));
- GtkWidget *dlg = osso_abook_touch_contact_starter_dialog_new
+ dialog = osso_abook_touch_contact_starter_dialog_new
(NULL,
OSSO_ABOOK_TOUCH_CONTACT_STARTER (starter));
gtk_widget_show_all (starter);
- gtk_widget_show (dlg);
+ }
- return TRUE;
+ 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;
+
+ if (account_id) {
+ vcard = osso_abook_account_manager_get_vcard_field (NULL, account_id);
}
- return FALSE;
+
+ if (vcard) {
+ 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,
+ NULL /*McAccount *account*/);
+ g_signal_connect (dialog,
+ "response",
+ G_CALLBACK (gtk_widget_destroy),
+ NULL);
+ e_vcard_attribute_free (attribute);
+ }
+
+ return dialog;
}
+
static gboolean
button_release_event_cb (GtkWidget *widget,
GdkEventButton *event,
ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
+ g_warning (G_STRFUNC);
if (priv->active_body) {
priv->active_body = FALSE;
gtk_widget_queue_draw (widget);
}
if (priv->active_header) {
+ GtkWidget *dialog = NULL;
priv->active_header = FALSE;
- if (!start_starter (OSSO_ABOOK_AGGREGATOR (priv->aggregator),
- priv->contact_id)) {
- /* TODO: start temp contact dlg */
- }
+
+ 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);
+
gtk_widget_queue_draw (widget);
}
}
static void
-aggregator_ready_cb (OssoABookWaitable *waitable,
- const GError *error,
- gpointer userdata)
-{
- g_warning (G_STRFUNC);
- ELHomeApplet *self = EL_HOME_APPLET(userdata);
-
- self->priv->aggregator_ready_closure = NULL;
-
- if (!error) {
- resolve_contact (self);
- }
-}
-
-static void
el_home_applet_init (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv;
read_new_event (self);
osso_abook_init_with_name (PACKAGE, NULL);
-
- priv->aggregator = osso_abook_aggregator_get_default (NULL);
- priv->aggregator_ready_closure = osso_abook_waitable_call_when_ready
- (OSSO_ABOOK_WAITABLE (priv->aggregator),
- aggregator_ready_cb,
- self, NULL);
#endif
}
projects / conv-inbox / blobdiff