Changeset 1419

Timestamp:

01/16/07 12:44:20

Author:

pvanhoof

Message:

Ahum, bugfix

Files:

• trunk/libtinymail-camel/camel-lite/camel/camel-filter-driver.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-filter-search.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-search.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (5 diffs)
• trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.h (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-summary.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/nntp/camel-nntp-summary.c (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (3 diffs)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.h (modified) (1 diff)
• trunk/tinymail/tny-demoui-summary-view.c (modified) (1 diff)

trunk/libtinymail-camel/camel-lite/camel/camel-filter-driver.c

@@ -1191 +1191 @@
-                
-                info = camel_message_info_new_from_header(NULL, ((CamelMimePart *)msg)->headers);
-guint16) ((camel_mime_parser_tell(mp) - last) / 1024
+(camel_mime_parser_tell(mp) - last)
-
-                last = camel_mime_parser_tell(mp);

trunk/libtinymail-camel/camel-lite/camel/camel-filter-search.c

@@ -508 +508 @@
-        r = e_sexp_result_new(f, ESEXP_RES_INT);
-
-
-
-
-
-
+
-
-        return r;

trunk/libtinymail-camel/camel-lite/camel/camel-folder-search.c

@@ -1378 +1378 @@
-        if (s->current) {
-                r = e_sexp_result_new (f, ESEXP_RES_INT);
-#ifdef NON_TINYMAIL_FEATURES
-                r->value.number = camel_message_info_size(s->current) / 1024;
-#else
-                r->value.number = 0;
-#endif
-        } else {
-                r = e_sexp_result_new (f, ESEXP_RES_ARRAY_PTR);

trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c

@@ -1111 +1111 @@
-
-                CAMEL_SUMMARY_UNLOCK(s, filter_lock);
-guint16) ( (camel_mime_parser_tell(mp) - start) / 1024
+ (camel_mime_parser_tell(mp) - start)
-        }
-        return info;
@@ -1905 +1905 @@
-        gchar *theuid;
-        gboolean uidmf = FALSE;
-        guint32 tempor;
-
-        io(printf("Loading message info\n"));
@@ -1950 +1949 @@
-        }
-
-
-
-
-
-
-
-
+
+
+
-
-        mi->flags &= ~CAMEL_MESSAGE_INFO_NEEDS_FREE;
@@ -2089 +2084 @@
-        camel_file_util_encode_uint32(out, mi->flags);
-
- * 1024
+
-
-        camel_file_util_encode_time_t(out, mi->date_sent);
@@ -3316 +3311 @@
-info_set_flags(CamelMessageInfo *info, guint32 flags, guint32 set)
-{
-32
+16
-        CamelMessageInfoBase *mi = (CamelMessageInfoBase *)info;
-

trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.h

@@ -174 +174 @@
-        CamelSummaryMessageID message_id;
-
-16
-16
+32
+32
-
-        time_t date_sent;
@@ -403 +403 @@
-
-#define camel_message_info_flags(mi) camel_message_info_uint32((const CamelMessageInfo *)mi, CAMEL_MESSAGE_INFO_FLAGS)
- * 1024
+
-
-#define camel_message_info_date_sent(mi) camel_message_info_time((const CamelMessageInfo *)mi, CAMEL_MESSAGE_INFO_DATE_SENT)

trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-summary.c

@@ -456 +456 @@
-
-                        camel_data_wrapper_write_to_stream((CamelDataWrapper *)msg, (CamelStream *)sn);
-guint16) (sn->written / 1024
+sn->written
-                        camel_object_unref((CamelObject *)sn);
-                }

trunk/libtinymail-camel/camel-lite/camel/providers/nntp/camel-nntp-summary.c

@@ -290 +290 @@
-                                mi = (CamelMessageInfoBase *)camel_folder_summary_add_from_header(s, headers);
-                                if (mi) {
-guint16) (size / 1024
+size
-                                        cns->high = n;
-                                        camel_folder_change_info_add_uid(changes, camel_message_info_uid(mi));

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c

@@ -326 +326 @@
-                                mi = (CamelMessageInfoBase*) camel_folder_summary_uid (folder->summary, fi->uid);
-                                if (mi) {
-guint16) (fi->size / 1024
+fi->size
-                                    camel_message_info_free (mi);
-                                }

trunk/libtinymail-camel/tny-session-camel.c

@@ -276 +276 @@
-                }
-                
+                /* TODO: fix this in camel-lite !
+
-                if (!g_ascii_strncasecmp (tny_account_get_proto (account), "pop", 3))
-                {
-                        if (flags & CAMEL_SESSION_PASSWORD_REPROMPT)
-                                tny_session_camel_forget_password (session, service, domain, item, ex);
-
-
+
-
-

trunk/libtinymailui-gtk/tny-gtk-header-list-model.c

@@ -155 +155 @@
-                case TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN:
-                case TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN:
+                case TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN:
-                case TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN:
-                        retval = G_TYPE_INT;
@@ -364 +365 @@
-                                         tny_header_get_date_received (header));
-                        break;
+
+                case TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN:
+                        g_value_init (value, G_TYPE_INT);
+                        g_value_set_int (value, tny_header_get_message_size(header));
+                        break;                  
-                case TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN:
-                        g_value_init (value, G_TYPE_OBJECT);
@@ -1073 +1079 @@
-      { TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN, "TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN", "date_received_t" },
-      { TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN, "TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN", "date_sent_t" },
+      { TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, "TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN", "message_size"},
-      { TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN, "TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN", "date_received" },
-      { TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, "TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN", "instance" },

trunk/libtinymailui-gtk/tny-gtk-header-list-model.h

@@ -53 +53 @@
-        TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN,
-        TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN,
+        TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN,
-        TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
-        TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN,

trunk/tinymail/tny-demoui-summary-view.c

@@ -803 +803 @@
-
-
+        renderer = gtk_cell_renderer_text_new ();
+        column = gtk_tree_view_column_new_with_attributes (_("Flags"), renderer,
+                "text", TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN, NULL);
+        gtk_tree_view_column_set_sort_column_id (column, TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN);
+        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
+        gtk_tree_view_column_set_fixed_width (column, 100);
+        gtk_tree_view_append_column (GTK_TREE_VIEW(priv->header_view), column);
+
+
+        renderer = gtk_cell_renderer_text_new ();
+        column = gtk_tree_view_column_new_with_attributes (_("Size"), renderer,
+                "text", TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN, NULL);
+        gtk_tree_view_column_set_sort_column_id (column, TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN);
+        gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED);
+        gtk_tree_view_column_set_fixed_width (column, 100);
+        gtk_tree_view_append_column (GTK_TREE_VIEW(priv->header_view), column);
+
-        select = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->mailbox_view));
-        gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);