Remove debug strings and label values

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

diff --git a/src/el-home-applet.c b/src/el-home-applet.c
index c21f681..d605662 100644 (file)
--- a/src/el-home-applet.c
+++ b/src/el-home-applet.c
@@ -151,8 +151,8 @@ const gchar* g_module_check_init (GModule *module);
 const gchar*
 g_module_check_init (GModule *module)
 {
-       g_module_make_resident (module);
-       return NULL;
+        g_module_make_resident (module);
+        return NULL;
 }
 
 static void
@@ -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,
@@ -1041,7 +1039,7 @@ make_query (RTComEl *el, gint event_id)
                 rtcom_el_query_prepare (query,
                                         "is-read", FALSE, RTCOM_EL_OP_EQUAL,
                                         "service", conv_services, RTCOM_EL_OP_IN_STRV,
-                                        /* "event-type", conv_event_types, RTCOM_EL_OP_IN_STRV, */
+                                        "event-type", conv_event_types, RTCOM_EL_OP_IN_STRV,
                                         NULL);
         }
         it = rtcom_el_get_events (el, query);
@@ -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,21 +1471,18 @@ 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 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;
+        if (service && service[0] != '\0') {
+                const gchar** conv_service = conv_services;
+                do {
+                        if (!g_strcmp0 (*conv_service, service)) {
+                                add_new_idle (self);
+                                return;
+                        }
                 }
+                while(*++conv_service);
         }
-        while(*++conv_service);
-#else
-        add_new_idle (self);
-#endif
+        else
+                add_new_idle (self);
 }
 
 static gboolean
@@ -1603,9 +1632,7 @@ button_release_event_cb (GtkWidget      *widget,
                                                               self);
                 }
                 else
-#ifndef DEBUG_LAYOUT
                         mark_as_read (self);
-#endif
                 break;
         default:;
         }
@@ -1651,7 +1678,7 @@ el_home_applet_init (ELHomeApplet *self)
 
         gtk_widget_set_app_paintable (GTK_WIDGET (self), TRUE);
 
-        priv->unread = gtk_label_new ("12");
+        priv->unread = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (priv->unread),
                                 0.0f,
                                 0.5f);
@@ -1662,7 +1689,7 @@ el_home_applet_init (ELHomeApplet *self)
                                 0.5f,
                                 0.5f);
 
-        priv->sender = gtk_label_new ("asdf asdf asdf asdf asdf");
+        priv->sender = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (priv->sender),
                                 0.5f,
                                 0.55f);
@@ -1674,8 +1701,6 @@ el_home_applet_init (ELHomeApplet *self)
                                      C_WIDTH,
                                      HILDON_ICON_PIXEL_SIZE_THUMB);
 
-        priv->message = g_strdup ("One two three four five six seven eight nine ten");
-
         /* construt empty table */
         priv->empty = gtk_fixed_new ();
 
@@ -1705,7 +1730,7 @@ el_home_applet_init (ELHomeApplet *self)
         gtk_widget_hide (GTK_WIDGET (priv->empty));
         GTK_WIDGET_SET_FLAGS (priv->empty, GTK_NO_SHOW_ALL);
 
-        priv->received = gtk_label_new ("aewf aewf aewf awef");
+        priv->received = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (priv->received),
                                 1.0f,
                                 0.5f);
@@ -1773,7 +1798,6 @@ el_home_applet_init (ELHomeApplet *self)
 
         gtk_widget_show_all (GTK_WIDGET (event_box));
 
-#ifndef DEBUG_LAYOUT
         priv->eventlogger = rtcom_el_new ();
         g_signal_connect (priv->eventlogger,
                           "new-event",
@@ -1787,7 +1811,6 @@ el_home_applet_init (ELHomeApplet *self)
         osso_abook_init_with_name (PACKAGE, NULL);
 
         add_new_idle (self);
-#endif
 }
 
 static void
@@ -1803,4 +1826,3 @@ el_home_applet_class_init (ELHomeAppletClass *klass)
 
         g_type_class_add_private (klass, sizeof (ELHomeAppletPrivate));
 }
-