X-Git-Url: http://git.maemo.org/git/?p=conv-inbox;a=blobdiff_plain;f=src%2Fel-home-applet.c;h=77c3c4ca64b7cc3ee4f07acf500b07a4ec855225;hp=69185e36764efa8f3719978ee88908355cbe0819;hb=5aeb58c39c760fb481a7948879dc0de954f8f5b3;hpb=7e1f058a4c7bf0c02c575f4ae8d3f590003466e4 diff --git a/src/el-home-applet.c b/src/el-home-applet.c index 69185e3..77c3c4c 100644 --- a/src/el-home-applet.c +++ b/src/el-home-applet.c @@ -85,8 +85,8 @@ 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", +static const gchar *conv_event_types[] = {"RTCOM_EL_EVENTTYPE_SMS_MESSAGE", + "RTCOM_EL_EVENTTYPE_CHAT_MESSAGE", NULL}; typedef enum { @@ -146,6 +146,8 @@ struct _ELHomeAppletPrivate OssoABookContact *contact; gboolean time_fmt_24h; + + guint init_timer; }; HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM); @@ -648,6 +650,8 @@ 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); @@ -716,7 +720,7 @@ contacts_added (OssoABookRoster *roster, } static void -reset_contact (ELHomeApplet *self) +reset_contact (ELHomeApplet *self, gboolean resize) { ELHomeAppletPrivate *priv = self->priv; @@ -738,7 +742,8 @@ reset_contact (ELHomeApplet *self) priv->contact = NULL; } - resize_sender (priv); + if (resize) + resize_sender (priv); } static void @@ -755,13 +760,13 @@ contacts_removed (OssoABookRoster *roster, for (contact_id = ids; *contact_id; contact_id++) { if (strcmp (*contact_id, priv->contact_id) == 0) { - reset_contact (self); + reset_contact (self, TRUE); gtk_widget_queue_draw (GTK_WIDGET (self)); return; } if (strcmp (*contact_id, uid) == 0) { - reset_contact (self); + reset_contact (self, TRUE); resolve_contact (self); gtk_widget_queue_draw (GTK_WIDGET (self)); return; @@ -771,11 +776,11 @@ contacts_removed (OssoABookRoster *roster, } static void -clean_contact (ELHomeApplet *self) +clean_contact (ELHomeApplet *self, gboolean resize) { ELHomeAppletPrivate *priv = self->priv; - reset_contact (self); + reset_contact (self, resize); if (priv->aggregator) { if (priv->aggregator_ready_closure){ @@ -828,6 +833,11 @@ 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); @@ -843,7 +853,7 @@ dispose (GObject *self) } clean_state (EL_HOME_APPLET (self)); - clean_contact (EL_HOME_APPLET (self)); + clean_contact (EL_HOME_APPLET (self), FALSE); G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self); } @@ -966,62 +976,43 @@ static void show_event (ELHomeApplet *self, RTComElIter *it) { ELHomeAppletPrivate *priv = self->priv; - const gchar *remote = NULL; + gchar *remote = NULL; gchar *received = NULL; - 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; -#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)); + time_t received_t; + + if (rtcom_el_iter_get_values (it, + "id", &priv->event_id, + "start-time", &received_t, + "local-uid", &priv->local_id, + "remote-uid", &priv->remote_id, + "remote-name", &remote, + "remote-ebook-uid", &priv->contact_id, + "free-text", &priv->message, + "group-uid", &priv->group_uid, + NULL)) { received = format_time (received_t, priv->time_fmt_24h); - 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) { + + if (priv->remote_id && !priv->remote_id[0]) { 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 + priv->event_id = -1; } - else { + else priv->event_id = -1; - } - 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 (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); @@ -1033,11 +1024,10 @@ show_event (ELHomeApplet *self, RTComElIter *it) priv->message_surface = NULL; } - if (event) - g_value_array_free (event); - gtk_widget_hide (priv->cut_message); gtk_widget_queue_draw (GTK_WIDGET (self)); + + g_free (remote); } static RTComElIter* @@ -1056,6 +1046,7 @@ make_query (RTComEl *el, gint event_id) else { rtcom_el_query_prepare (query, "is-read", FALSE, RTCOM_EL_OP_EQUAL, + "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); @@ -1210,11 +1201,13 @@ read_event (ELHomeApplet *self) 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) { - clean_contact (self); + if (g_strcmp0 (priv->remote_id, remote_id) || + new_account || + !priv->contact) { + clean_contact (self, TRUE); start_aggregator (self); } - else { + else if (priv->contact) { show_contact (self); } @@ -1276,7 +1269,7 @@ read_event (ELHomeApplet *self) dgettext ("rtcom-messaging-ui", "messaging_ap_conversations")); - clean_contact (self); + clean_contact (self, TRUE); gtk_widget_hide (priv->icon); } @@ -1710,6 +1703,67 @@ 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) { @@ -1844,27 +1898,6 @@ el_home_applet_init (ELHomeApplet *self) gtk_widget_show_all (GTK_WIDGET (event_box)); - 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); - 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); osso_abook_init_with_name (PACKAGE, NULL); @@ -1874,7 +1907,7 @@ el_home_applet_init (ELHomeApplet *self) NULL); g_object_unref (gconf); - add_new_idle (self); + init_eventlogger (self); } static void