projects
/
conv-inbox
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
da2ffc2
)
Simplify and make more robust updating events
author
Artem Garmash
<artemgarmash@gmail.com>
Sat, 24 Oct 2009 21:04:23 +0000
(
00:04
+0300)
committer
Artem Garmash
<artem.garmash@nokia.com>
Sun, 27 Jun 2010 19:13:39 +0000
(22:13 +0300)
src/el-home-applet.c
patch
|
blob
|
history
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 *icon;
GtkWidget *unread;
GtkWidget *received;
+ GtkWidget *empty;
gint event_id;
gint event_id;
@@
-65,10
+66,6
@@
struct _ELHomeAppletPrivate
const gchar *current_font;
guint idle_id;
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);
};
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;
{
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;
priv->idle_id = 0;
return FALSE;
@@
-496,9
+485,6
@@
new_event_cb (RTComEl *backend,
const gchar *service,
ELHomeApplet *self)
{
const gchar *service,
ELHomeApplet *self)
{
- ELHomeAppletPrivate *priv = self->priv;
-
- priv->new_event_id = event_id;
add_new_idle (self);
}
add_new_idle (self);
}
@@
-663,9
+649,7
@@
el_home_applet_init (ELHomeApplet *self)
G_CALLBACK (new_event_cb),
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
}
#endif
}