Put "no new messages" label back to the center

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

diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index b42ccd4..f61840b 100644 (file)
--- a/src/el-home-applet.c
+++ b/src/el-home-applet.c
@@ -55,6 +55,7 @@ struct _ELHomeAppletPrivate
         GtkWidget *icon;
         GtkWidget *unread;
         GtkWidget *received;
+        GtkWidget *empty;
 
         gint       event_id;
 
@@ -65,8 +66,6 @@ struct _ELHomeAppletPrivate
         const gchar *current_font;
 
         guint idle_id;
-        /* new or updated event id */
-        gint  new_event_id;
 };
 
 HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM);
@@ -309,7 +308,16 @@ show_event (ELHomeApplet *self, RTComElIter *it)
                 priv->event_id = -1;
         }
 
-        gtk_label_set_text (GTK_LABEL (priv->message), message);
+        if (message){
+                if (!GTK_WIDGET_VISIBLE (priv->message))
+                        gtk_widget_show (priv->message);
+                gtk_label_set_text (GTK_LABEL (priv->message), message);
+        }
+        else{
+                gtk_widget_hide (priv->message);
+                gtk_widget_show (priv->empty);
+        }
+
         gtk_label_set_text (GTK_LABEL (priv->sender), remote);
         gtk_label_set_text (GTK_LABEL (priv->received), received);
 
@@ -373,9 +381,13 @@ update_unread_label (ELHomeApplet *self)
         ELHomeAppletPrivate *priv = self->priv;
         gchar *text;
 
-        text = g_strdup_printf ("%d", priv->unread_count);
-        gtk_label_set_text (GTK_LABEL (priv->unread), text);
-        g_free (text);
+        if (priv->unread_count > 0){
+                text = g_strdup_printf ("%d", priv->unread_count);
+                gtk_label_set_text (GTK_LABEL (priv->unread), text);
+                g_free (text);
+        }
+        else
+                gtk_label_set_text (GTK_LABEL (priv->unread), NULL);
 }
 
 static gint
@@ -443,18 +455,10 @@ read_new_event (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
 
-        if (priv->new_event_id >= 0){
-                RTComElIter *it = NULL;
-                it = make_query (priv->eventlogger, priv->new_event_id);
-                if (it){
-                        if (rtcom_el_iter_first (it))
-                                show_event (self, it);
-                        g_object_unref (it);
-                }
-                priv->unread_count = query_unread_events (priv->eventlogger);
-                update_unread_label (self);
-        }
-        priv->new_event_id = -1;
+        read_event (self);
+        priv->unread_count = query_unread_events (priv->eventlogger);
+        update_unread_label (self);
+
         priv->idle_id = 0;
 
         return FALSE;
@@ -481,9 +485,6 @@ new_event_cb (RTComEl      *backend,
               const gchar  *service,
               ELHomeApplet *self)
 {
-        ELHomeAppletPrivate *priv = self->priv;
-
-        priv->new_event_id = event_id;
         add_new_idle (self);
 }
 
@@ -588,6 +589,11 @@ el_home_applet_init (ELHomeApplet *self)
                                      MESSAGE_HEIGHT);
         gtk_widget_set_name (priv->message, "hildon-shadow-label");
 
+        /* TODO: l10n */
+        priv->empty = gtk_label_new ("No new messages");
+        gtk_widget_set_name (priv->empty, "hildon-shadow-label");
+        GTK_WIDGET_SET_FLAGS (priv->empty, GTK_NO_SHOW_ALL);
+
         priv->received = gtk_label_new ("aewf aewf aewf awef");
         gtk_misc_set_alignment (GTK_MISC (priv->received),
                                 1.0f,
@@ -606,6 +612,7 @@ el_home_applet_init (ELHomeApplet *self)
         vbox = gtk_vbox_new (FALSE, 0);
         gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
         gtk_box_pack_start (GTK_BOX (vbox), priv->message, TRUE, TRUE, 0);
+        gtk_box_pack_start (GTK_BOX (vbox), priv->empty, TRUE, TRUE, 0);
         gtk_box_pack_start (GTK_BOX (vbox), priv->received, FALSE, FALSE, 0);
 
         align = gtk_alignment_new (0.5f, 0.0f, 1.0f, 1.0f);
@@ -642,9 +649,7 @@ el_home_applet_init (ELHomeApplet *self)
                           G_CALLBACK (new_event_cb),
                           self);
 
-        read_event (self);
-        priv->unread_count = query_unread_events (priv->eventlogger);
-        update_unread_label (self);
+        read_new_event (self);
 #endif
 }