cc = tny_header_get_cc (header);
bcc = tny_header_get_bcc (header);
subject = tny_header_get_subject (header);
- priority_flags = tny_header_get_flags (header) & TNY_HEADER_FLAG_PRIORITY;
+ priority_flags = tny_header_get_priority (header);
if (to)
modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field), to);
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (window);
parent_priv = MODEST_WINDOW_GET_PRIVATE (window);
- priority_flags = priority_flags & (TNY_HEADER_FLAG_PRIORITY);
if (priv->priority_flags != priority_flags) {
GtkAction *priority_action = NULL;
hildon_window_set_menu (HILDON_WINDOW(obj), GTK_MENU(parent_priv->menubar));
gtk_widget_show (GTK_WIDGET(parent_priv->menubar));
+#ifdef MODEST_USE_MOZEMBED
+ priv->main_scroll = priv->msg_view;
+ gtk_widget_set_size_request (priv->msg_view, -1, 1600);
+#else
priv->main_scroll = gtk_scrolled_window_new (NULL, NULL);
+ gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view);
+#endif
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->main_scroll), GTK_SHADOW_NONE);
modest_maemo_set_thumbable_scrollbar (GTK_SCROLLED_WINDOW(priv->main_scroll), TRUE);
-#ifdef MODEST_USE_MOZEMBED
- gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (priv->main_scroll), priv->msg_view);
-#else
- gtk_container_add (GTK_CONTAINER (priv->main_scroll), priv->msg_view);
-#endif
gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_scroll, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
sort_key = hildon_sort_dialog_add_sort_key (dialog, _("mcen_li_sort_priority"));
sort_model_ids[sort_key] = TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN;
- sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY;
+ sort_ids[sort_key] = TNY_HEADER_FLAG_PRIORITY_MASK;
priority_sort_id = sort_key;
sortable = GTK_TREE_SORTABLE (gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (GTK_TREE_VIEW (header_view)))));
if (current_sort_colid == TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN) {
gpointer flags_sort_type_pointer;
flags_sort_type_pointer = g_object_get_data (G_OBJECT (cols->data), MODEST_HEADER_VIEW_FLAG_SORT);
- if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY)
+ if (GPOINTER_TO_INT (flags_sort_type_pointer) == TNY_HEADER_FLAG_PRIORITY_MASK)
hildon_sort_dialog_set_sort_key (dialog, priority_sort_id);
else
hildon_sort_dialog_set_sort_key (dialog, attachments_sort_id);
iter = tny_list_create_iterator (headers);
while (!tny_iterator_is_done (iter)) {
header = TNY_HEADER (tny_iterator_get_current (iter));
- if (header) {
- tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
- tny_header_set_flags (header, TNY_HEADER_FLAG_SUSPENDED_PRIORITY);
+ if (header) {
+ tny_header_set_flags (header, TNY_HEADER_FLAG_SUSPENDED);
tny_iterator_next (iter);
g_object_unref (header);
}
case MODEST_TNY_SEND_QUEUE_UNKNOWN:
case MODEST_TNY_SEND_QUEUE_SUSPENDED:
case MODEST_TNY_SEND_QUEUE_FAILED:
- if (status != MODEST_TNY_SEND_QUEUE_SUSPENDED)
- tny_header_unset_flags (header, TNY_HEADER_FLAG_PRIORITY);
-
+
/* Check if it already exists on queue */
existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_uid);
if(existing != NULL)
/* link click management */
gchar *last_url;
-
- TnyHeaderFlags priority_flags;
};
#define MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE(obj);
priv->current_zoom = 1.0;
- priv->priority_flags = 0;
priv->hadj = NULL;
priv->vadj = NULL;
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
- return priv->priority_flags;
+ return modest_mail_header_view_get_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view));
}
static void
g_return_if_fail (MODEST_IS_GTKHTML_MSG_VIEW (self));
priv = MODEST_GTKHTML_MSG_VIEW_GET_PRIVATE (self);
- priv->priority_flags = flags & (TNY_HEADER_FLAG_HIGH_PRIORITY);
-
modest_mail_header_view_set_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), flags);
}
if (G_UNLIKELY(!low_pixbuf))
low_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_LOW);
return low_pixbuf;
+ case TNY_HEADER_FLAG_NORMAL_PRIORITY:
+ return NULL;
default:
if (G_UNLIKELY(!unread_pixbuf))
unread_pixbuf = modest_platform_get_icon (MODEST_HEADER_ICON_UNREAD);
/* printf ("DEBUG: %s: tree_model gtype=%s\n", __FUNCTION__, G_OBJECT_TYPE_NAME (tree_model)); */
TnyHeaderFlags flags = 0;
- TnyHeaderFlags prior_flags = 0;
gchar *address = NULL;
gchar *subject = NULL;
gchar *header = NULL;
*recipient_box, *subject_box = NULL;
TnyHeader *msg_header = NULL;
gchar *display_date = NULL, *tmp_date = NULL;
+ TnyHeaderFlags prio = 0;
recipient_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "recpt-box-renderer"));
subject_box = GTK_CELL_RENDERER (g_object_get_data (G_OBJECT (renderer), "subject-box-renderer"));
-1);
/* flags */
/* FIXME: we might gain something by doing all the g_object_set's at once */
- prior_flags = flags & TNY_HEADER_FLAG_PRIORITY;
if (flags & TNY_HEADER_FLAG_ATTACHMENTS)
g_object_set (G_OBJECT (attach_cell), "pixbuf",
get_pixbuf_for_flag (TNY_HEADER_FLAG_ATTACHMENTS),
else
g_object_set (G_OBJECT (attach_cell), "pixbuf",
NULL, NULL);
- if (flags & TNY_HEADER_FLAG_PRIORITY)
- g_object_set (G_OBJECT (priority_cell), "pixbuf",
- get_pixbuf_for_flag (prior_flags),
-/* get_pixbuf_for_flag (flags & TNY_HEADER_FLAG_PRIORITY), */
- NULL);
- else
- g_object_set (G_OBJECT (priority_cell), "pixbuf",
- NULL, NULL);
+ if (msg_header)
+ prio = tny_header_get_priority (msg_header);
+ g_object_set (G_OBJECT (priority_cell), "pixbuf",
+ get_pixbuf_for_flag (prio),
+ NULL);
if (subject && strlen (subject)) {
gchar* escaped_subject = g_markup_escape_text (subject, -1);
if (msg_header != NULL) {
status = get_status_of_uid (msg_header);
if (status == MODEST_TNY_SEND_QUEUE_SUSPENDED) {
- tny_header_unset_flags (msg_header, TNY_HEADER_FLAG_PRIORITY);
- tny_header_set_flags (msg_header, TNY_HEADER_FLAG_SUSPENDED_PRIORITY);
+ tny_header_set_flags (msg_header, TNY_HEADER_FLAG_SUSPENDED);
}
}
GtkTreeModel *tree_model, GtkTreeIter *iter,
gpointer user_data)
{
- TnyHeaderFlags flags, prior_flags;
+ TnyHeaderFlags flags;
//guint status;
gchar *status_str;
gtk_tree_model_get (tree_model, iter,
TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &flags,
-1);
-
- prior_flags = flags & TNY_HEADER_FLAG_PRIORITY;
- if (prior_flags == TNY_HEADER_FLAG_SUSPENDED_PRIORITY)
+
+ if (flags & TNY_HEADER_FLAG_SUSPENDED)
status_str = g_strdup(_("mcen_li_outbox_suspended"));
else
status_str = g_strdup(_("mcen_li_outbox_waiting"));
static gint compare_priorities (TnyHeaderFlags p1, TnyHeaderFlags p2)
{
- p1 = p1 & TNY_HEADER_FLAG_PRIORITY;
- p2 = p2 & TNY_HEADER_FLAG_PRIORITY;
- if (p1 == 0)
- p1 = TNY_HEADER_FLAG_LOW_PRIORITY + 1;
- if (p2 == 0)
- p2 = TNY_HEADER_FLAG_LOW_PRIORITY + 1;
- return p1 - p2;
+
+ /* HH, LL, NN */
+ if (p1 == p2)
+ return 0;
+
+ /* HL HN */
+ if (p1 == TNY_HEADER_FLAG_HIGH_PRIORITY)
+ return 1;
+
+ /* LH LN */
+ if (p1 == TNY_HEADER_FLAG_LOW_PRIORITY)
+ return -1;
+
+ /* NH */
+ if ((p1 == TNY_HEADER_FLAG_NORMAL_PRIORITY) && (p2 == TNY_HEADER_FLAG_HIGH_PRIORITY))
+ return -1;
+
+ /* NL */
+ return 1;
+
}
static gint
return cmp ? cmp : t1 - t2;
- case TNY_HEADER_FLAG_PRIORITY:
- gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val1,
+ case TNY_HEADER_FLAG_PRIORITY_MASK: {
+ TnyHeader *header1 = NULL, *header2 = NULL;
+
+ gtk_tree_model_get (tree_model, iter1, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header1,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t1,-1);
- gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, &val2,
+ gtk_tree_model_get (tree_model, iter2, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header2,
TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, &t2,-1);
/* This is for making priority values respect the intuitive sort relationship
- * as HIGH is 11, LOW is 01, and we put NORMAL AS 10 (2) */
- cmp = compare_priorities (val1, val2);
+ * as HIGH is 01, LOW is 10, and NORMAL is 00 */
- return cmp ? cmp : t1 - t2;
+ if (header1 && header2) {
+ cmp = compare_priorities (tny_header_get_priority (header1),
+ tny_header_get_priority (header2));
+ g_object_unref (header1);
+ g_object_unref (header2);
+ return cmp ? cmp : t1 - t2;
+ }
+
+ return t1 - t2;
+ }
default:
return &iter1 - &iter2; /* oughhhh */
}
gtk_misc_set_alignment (GTK_MISC (subject_label), 0.0, 0.0);
/* TODO: code disabled until we can get real priority information from message */
-/* if (tny_header_get_flags (header) & TNY_HEADER_FLAG_PRIORITY) { */
+/* if (tny_header_get_priority (header)) { */
/* GtkWidget *priority_icon = gtk_image_new_from_icon_name ("qgn_list_messaging_high", GTK_ICON_SIZE_MENU); */
/* gtk_box_pack_start (GTK_BOX (subject_box), priority_icon, FALSE, FALSE, 0); */
/* } */
g_return_if_fail (MODEST_IS_MAIL_HEADER_VIEW (headers_view));
priv = MODEST_MAIL_HEADER_VIEW_GET_PRIVATE (headers_view);
- priv->priority_flags = flags & (TNY_HEADER_FLAG_PRIORITY);
+ priv->priority_flags = flags & TNY_HEADER_FLAG_PRIORITY_MASK ;
if (priv->priority_flags == TNY_HEADER_FLAG_NORMAL_PRIORITY) {
if (priv->priority_icon != NULL) {
typedef struct _ModestMozembedMimePartViewPrivate ModestMozembedMimePartViewPrivate;
struct _ModestMozembedMimePartViewPrivate {
gdouble current_zoom;
+ gchar *last_search;
};
#define MODEST_MOZEMBED_MIME_PART_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
ModestMozembedMimePartViewPrivate *priv = MODEST_MOZEMBED_MIME_PART_VIEW_GET_PRIVATE (self);
priv->current_zoom = 1.0;
+ priv->last_search = NULL;
}
static void
modest_mozembed_mime_part_view_finalize (GObject *obj)
{
+ ModestMozembedMimePartViewPrivate *priv = MODEST_MOZEMBED_MIME_PART_VIEW_GET_PRIVATE (obj);
+
+ g_free (priv->last_search);
+ priv->last_search = NULL;
+
G_OBJECT_CLASS (parent_class)->finalize (obj);
}
search (ModestMozembedMimePartView *self,
const gchar *string)
{
- /* TODO: Implement incremental search */
- return FALSE;
+ ModestMozembedMimePartViewPrivate *priv = MODEST_MOZEMBED_MIME_PART_VIEW_GET_PRIVATE (self);
+ if (priv->last_search != NULL) {
+ g_free (priv->last_search);
+ }
+ priv->last_search = g_strdup (string);
+
+ return gtk_moz_embed_find_text (GTK_MOZ_EMBED (self), string, FALSE, FALSE,
+ FALSE, TRUE, 0);
}
static gboolean
search_next (ModestMozembedMimePartView *self)
{
- /* TODO: Implement incremental search */
- return FALSE;
+ ModestMozembedMimePartViewPrivate *priv = MODEST_MOZEMBED_MIME_PART_VIEW_GET_PRIVATE (self);
+ return gtk_moz_embed_find_text (GTK_MOZ_EMBED (self), priv->last_search, FALSE, FALSE,
+ FALSE, FALSE, 0);
}
static gboolean
/* link click management */
gchar *last_url;
- TnyHeaderFlags priority_flags;
};
#define MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
GtkWidget *separator;
GtkWidget *main_vbox;
GtkWidget *scroll_area;
- GtkWidget *viewport;
GtkWidget *body_box;
priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE(obj);
priv->current_zoom = 1.0;
- priv->priority_flags = 0;
priv->body_view = GTK_WIDGET (g_object_new (MODEST_TYPE_MOZEMBED_MIME_PART_VIEW, NULL));
priv->mail_header_view = GTK_WIDGET(modest_mail_header_view_new (TRUE));
gtk_box_pack_start (GTK_BOX (main_vbox), body_box, TRUE, TRUE, 0);
if (priv->body_view) {
-/* viewport = gtk_viewport_new (NULL, NULL); */
-/* gtk_widget_set_size_request (priv->body_view, -1, 300); */
-/* gtk_container_add (GTK_CONTAINER (viewport), priv->body_view); */
-/* gtk_widget_show_all (viewport); */
-/* scroll_area = modest_scroll_area_new (GTK_WIDGET (obj), viewport); */
-/* gtk_container_add (GTK_CONTAINER (frame), scroll_area); */
+ gtk_widget_set_size_request (priv->body_view, -1, 1000);
+ scroll_area = modest_scroll_area_new (GTK_WIDGET (obj), priv->body_view);
+ gtk_container_add (GTK_CONTAINER (body_box), scroll_area);
- gtk_container_add (GTK_CONTAINER (body_box), priv->body_view);
- scroll_area = NULL;
- viewport = NULL;
+/* gtk_container_add (GTK_CONTAINER (body_box), priv->body_view); */
+/* scroll_area = NULL; */
+
+/* scroll_area = gtk_scrolled_window_new (NULL, NULL); */
+/* gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_area), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); */
+/* gtk_container_add (GTK_CONTAINER (scroll_area), priv->body_view); */
+/* gtk_container_add (GTK_CONTAINER (body_box), scroll_area); */
#ifdef MAEMO_CHANGES
gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->body_view), NULL, NULL, 0);
priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE (self);
- return priv->priority_flags;
+ return modest_mail_header_view_get_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view));
}
static void
g_return_if_fail (MODEST_IS_MOZEMBED_MSG_VIEW (self));
priv = MODEST_MOZEMBED_MSG_VIEW_GET_PRIVATE (self);
- priv->priority_flags = flags & (TNY_HEADER_FLAG_HIGH_PRIORITY);
-
modest_mail_header_view_set_priority (MODEST_MAIL_HEADER_VIEW (priv->mail_header_view), flags);
}
projects / modest / commitdiff