Remove debug warnings

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

diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index 0e683f9..ab65dbc 100644 (file)
--- a/src/el-home-applet.c
+++ b/src/el-home-applet.c
@@ -614,7 +614,6 @@ update_presence_pixbuf (ELHomeApplet *self,
                 g_object_unref (priv->presence_pixbuf);
                 priv->presence_pixbuf = NULL;
         }
-        g_warning ("presence %s", icon_name);
 
         if (icon_name)
                 priv->presence_pixbuf = gtk_icon_theme_load_icon
@@ -885,7 +884,7 @@ start_aggregator (ELHomeApplet *self)
         ELHomeAppletPrivate *priv = self->priv;
         EBookQuery *query = NULL;
         GError *error = NULL;
-        g_warning ("%s rid %s lid %s", G_STRFUNC, priv->remote_id, priv->local_id);
+
         if (priv->local_id && priv->remote_id) {
                 const gchar *vcard = osso_abook_account_manager_get_vcard_field
                         (NULL, priv->local_id);
@@ -896,7 +895,7 @@ start_aggregator (ELHomeApplet *self)
                 else
                         query = e_book_query_any_field_contains (priv->remote_id);
         }
-        g_warning ("%s query %p", G_STRFUNC, query);
+
         if (query) {
                 priv->aggregator = osso_abook_aggregator_new_with_query (NULL,
                                                                          query,
@@ -912,7 +911,6 @@ start_aggregator (ELHomeApplet *self)
         }
 
         if (priv->aggregator) {
-                g_warning ("%s start aggr", G_STRFUNC);
                 priv->aggregator_ready_closure = osso_abook_waitable_call_when_ready
                         (OSSO_ABOOK_WAITABLE (priv->aggregator),
                          aggregator_ready_cb,
@@ -1145,6 +1143,34 @@ query_read_events (RTComEl *el, const gchar *service, gint *events, gint *conver
 }
 
 static void
+am_ready (OssoABookAccountManager *manager,
+          const GError            *error,
+          gpointer                 user_data)
+{
+        ELHomeApplet *self = EL_HOME_APPLET (user_data);
+        ELHomeAppletPrivate *priv = self->priv;
+
+        if (!error &&
+            priv->local_id &&
+            !GTK_WIDGET_VISIBLE (priv->icon)) {
+                McAccount *account;
+
+                account = osso_abook_account_manager_lookup_by_name (NULL,
+                                                                     priv->local_id);
+                if (account) {
+                        McProfile *profile = mc_profile_lookup (mc_account_compat_get_profile (account));
+                        const gchar *icon_name = mc_profile_get_icon_name (profile);
+                        if (icon_name) {
+                                gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
+                                                              icon_name,
+                                                              HILDON_ICON_SIZE_XSMALL);
+                                gtk_widget_show (priv->icon);
+                        }
+                }
+        }
+}
+
+static void
 read_event (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
@@ -1175,17 +1201,25 @@ read_event (ELHomeApplet *self)
                 }
 
                 if (new_account) {
-                        g_warning ("Update service icon");
                         if (g_strcmp0 (priv->local_id, "ring/tel/ring") == 0) {
                                 icon_name = "general_sms";
                         }
-                        else{
+                        else {
                                 McAccount *account;
-                                account = osso_abook_account_manager_lookup_by_name (NULL,
-                                                                                     priv->local_id);
-                                if (account) {
-                                        McProfile *profile = mc_profile_lookup (mc_account_compat_get_profile (account));
-                                        icon_name = mc_profile_get_icon_name (profile);
+                                OssoABookAccountManager *am = osso_abook_account_manager_get_default ();
+                                if (!osso_abook_waitable_is_ready (OSSO_ABOOK_WAITABLE (am), NULL)) {
+                                        osso_abook_account_manager_call_when_ready  (am,
+                                                                                     am_ready,
+                                                                                     self,
+                                                                                     NULL);
+                                }
+                                else {
+                                        account = osso_abook_account_manager_lookup_by_name (NULL,
+                                                                                             priv->local_id);
+                                        if (account) {
+                                                McProfile *profile = mc_profile_lookup (mc_account_compat_get_profile (account));
+                                                icon_name = mc_profile_get_icon_name (profile);
+                                        }
                                 }
                         }
 
@@ -1407,8 +1441,6 @@ read_new_event (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
 
-        g_warning ("read_new_event");
-
         read_event (self);
         priv->unread_count = query_unread_events (priv->eventlogger);
         update_unread_label (self);
@@ -1422,7 +1454,7 @@ static void
 add_new_idle (ELHomeApplet *self)
 {
         ELHomeAppletPrivate *priv = self->priv;
-        g_warning ("add_new_idle");
+
         if (priv->idle_id)
                 g_source_remove (priv->idle_id);
         priv->idle_id = g_idle_add ((GSourceFunc)read_new_event,
@@ -1439,13 +1471,9 @@ new_event_cb (RTComEl      *backend,
               const gchar  *service,
               ELHomeApplet *self)
 {
-        g_warning ("%s %s %s %s", local_uid, remote_uid, remote_ebook_uid, service);
-
         if (service && service[0] != '\0') {
                 const gchar** conv_service = conv_services;
-                g_warning ("%s", service);
                 do {
-                        g_warning ("%s", *conv_service);
                         if (!g_strcmp0 (*conv_service, service)) {
                                 add_new_idle (self);
                                 return;