Don't resize sender name from dispose

[conv-inbox] / src / el-home-applet.c

diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index 69185e3..930b474 100644 (file)
--- a/src/el-home-applet.c
+++ b/src/el-home-applet.c
@@ -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);
 }
@@ -1210,11 +1220,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 +1288,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 +1722,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 +1917,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 +1926,7 @@ el_home_applet_init (ELHomeApplet *self)
                                                     NULL);
         g_object_unref (gconf);
 
-        add_new_idle (self);
+        init_eventlogger (self);
 }
 
 static void