* modest-tny-account-store.c:

  - remove some annoying g_message's
* modest-tny-msg-view.c:
  - fix gtk warnings, crash when clicked on empty
* modest-tny-stream-gtkhtml.c:
  - remove annoying warning

pmo-trunk-r101

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 8e8f4dd..5373c30 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -221,8 +221,6 @@ get_password (TnyAccountIface *account, const gchar *prompt)
        ModestTnyAccountStorePrivate *priv;
        gchar *val;
 
-        g_message (__FUNCTION__);
-
        g_return_val_if_fail (account, NULL);
 
        key = tny_account_iface_get_id (account);
@@ -429,12 +427,9 @@ modest_tny_account_store_get_store_accounts  (TnyAccountStoreIface *iface)
                                                         MODEST_PROTO_TYPE_STORE,
                                                         NULL, FALSE);
 
-       g_message ("accounts: %d", g_slist_length (accounts));
        tny_accounts = tny_accounts_from_server_accounts (self, accounts, TRUE);
        g_slist_free (accounts);
-       g_message ("store accounts: %d", g_list_length (tny_accounts));
-
-
+       
        /*
         * FIXME: after gconf notification support is added,
         * we can simply return priv->store_account
@@ -502,9 +497,6 @@ tny_account_store_get_session (TnyAccountStore *self)
 
        priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(self);
 
-       g_message ("returning tny session camel %p",
-                  priv->tny_session_camel);
-
        return priv->tny_session_camel;
 }
 

diff --git a/src/modest-tny-msg-view.c b/src/modest-tny-msg-view.c
index b70bd79..2741c5c 100644 (file)
--- a/src/modest-tny-msg-view.c
+++ b/src/modest-tny-msg-view.c
@@ -17,7 +17,7 @@ static void     modest_tny_msg_view_finalize     (GObject *obj);
 
 
 static GSList*  get_url_matches (GString *txt);
-
+static gboolean fill_gtkhtml_with_txt (GtkHTML* gtkhtml, const gchar* txt);
 
 /*
  * we need these regexps to find URLs in plain text e-mails
@@ -104,21 +104,14 @@ modest_tny_msg_view_init (ModestTnyMsgView *obj)
 {
        ModestTnyMsgViewPrivate *priv;
        
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(obj),
-                                      GTK_POLICY_AUTOMATIC,
-                                      GTK_POLICY_AUTOMATIC);
-       
-
        priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE(obj);
+
        priv->gtkhtml = gtk_html_new();
        gtk_html_set_editable        (GTK_HTML(priv->gtkhtml), FALSE);
         gtk_html_allow_selection     (GTK_HTML(priv->gtkhtml), TRUE);
-        gtk_html_set_caret_mode      (GTK_HTML(priv->gtkhtml), TRUE);
+        gtk_html_set_caret_mode      (GTK_HTML(priv->gtkhtml), FALSE);
         gtk_html_set_blocking        (GTK_HTML(priv->gtkhtml), FALSE);
         gtk_html_set_images_blocking (GTK_HTML(priv->gtkhtml), FALSE);
-
-       gtk_widget_show              (priv->gtkhtml);
-       gtk_container_add (GTK_CONTAINER(obj), priv->gtkhtml);  
 }
        
 
@@ -137,9 +130,18 @@ modest_tny_msg_view_new (TnyMsgIface *msg)
 {
        GObject *obj;
        ModestTnyMsgView* self;
-
+       ModestTnyMsgViewPrivate *priv;
+       
        obj  = G_OBJECT(g_object_new(MODEST_TYPE_TNY_MSG_VIEW, NULL));
        self = MODEST_TNY_MSG_VIEW(obj);
+       priv = MODEST_TNY_MSG_VIEW_GET_PRIVATE (self);
+
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(self),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
+
+       if (priv->gtkhtml) 
+               gtk_container_add (GTK_CONTAINER(obj), priv->gtkhtml);  
        
        if (msg)
                modest_tny_msg_view_set_message (self, msg);

diff --git a/src/modest-tny-stream-gtkhtml.c b/src/modest-tny-stream-gtkhtml.c
index 3f67145..a771083 100644 (file)
--- a/src/modest-tny-stream-gtkhtml.c
+++ b/src/modest-tny-stream-gtkhtml.c
@@ -112,6 +112,7 @@ modest_tny_stream_gtkhtml_new (GtkHTML *gtkhtml)
        priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(obj);
 
        priv->gtkhtml = gtkhtml;
+
        return obj;
 }
 
@@ -122,7 +123,6 @@ modest_tny_stream_gtkhtml_new (GtkHTML *gtkhtml)
 static ssize_t
 gtkhtml_read (TnyStreamIface *self, char *buffer, size_t n)
 {
-       g_warning (__FUNCTION__);
        return -1; /* we cannot read */
 }