- 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
ModestTnyAccountStorePrivate *priv;
gchar *val;
ModestTnyAccountStorePrivate *priv;
gchar *val;
- g_message (__FUNCTION__);
-
g_return_val_if_fail (account, NULL);
key = tny_account_iface_get_id (account);
g_return_val_if_fail (account, NULL);
key = tny_account_iface_get_id (account);
MODEST_PROTO_TYPE_STORE,
NULL, FALSE);
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);
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
/*
* FIXME: after gconf notification support is added,
* we can simply return priv->store_account
priv = MODEST_TNY_ACCOUNT_STORE_GET_PRIVATE(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;
}
return priv->tny_session_camel;
}
static GSList* get_url_matches (GString *txt);
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
/*
* we need these regexps to find URLs in plain text e-mails
{
ModestTnyMsgViewPrivate *priv;
{
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 = 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);
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_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);
{
GObject *obj;
ModestTnyMsgView* self;
{
GObject *obj;
ModestTnyMsgView* self;
+ ModestTnyMsgViewPrivate *priv;
+
obj = G_OBJECT(g_object_new(MODEST_TYPE_TNY_MSG_VIEW, NULL));
self = MODEST_TNY_MSG_VIEW(obj);
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);
if (msg)
modest_tny_msg_view_set_message (self, msg);
priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(obj);
priv->gtkhtml = gtkhtml;
priv = MODEST_TNY_STREAM_GTKHTML_GET_PRIVATE(obj);
priv->gtkhtml = gtkhtml;
static ssize_t
gtkhtml_read (TnyStreamIface *self, char *buffer, size_t n)
{
static ssize_t
gtkhtml_read (TnyStreamIface *self, char *buffer, size_t n)
{
- g_warning (__FUNCTION__);
return -1; /* we cannot read */
}
return -1; /* we cannot read */
}