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 {
OssoABookContact *contact;
gboolean time_fmt_24h;
+
+ guint init_timer;
};
HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM);
}
static void
-reset_contact (ELHomeApplet *self)
+reset_contact (ELHomeApplet *self, gboolean resize)
{
ELHomeAppletPrivate *priv = self->priv;
priv->contact = NULL;
}
- resize_sender (priv);
+ if (resize)
+ resize_sender (priv);
}
static void
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;
}
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){
{
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);
}
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);
}
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);
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*
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);
if (g_strcmp0 (priv->remote_id, remote_id) ||
new_account ||
!priv->contact) {
- clean_contact (self);
+ clean_contact (self, TRUE);
start_aggregator (self);
}
else if (priv->contact) {
dgettext ("rtcom-messaging-ui",
"messaging_ap_conversations"));
- clean_contact (self);
+ clean_contact (self, TRUE);
gtk_widget_hide (priv->icon);
}
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)
{
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);
NULL);
g_object_unref (gconf);
- add_new_idle (self);
+ init_eventlogger (self);
}
static void
projects / conv-inbox / blobdiff