Simplify and make more robust updating events

diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index 3b7ba5e..74267db 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,10 +66,6 @@ struct _ELHomeAppletPrivate
         const gchar *current_font;
 
         guint idle_id;
-        /* new or updated event id */
-        gint  new_event_id;
-
-        GtkWidget *empty;
 };
 
 HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM);
@@ -458,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;
@@ -496,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);
 }
 
@@ -663,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
 }