Changeset 2814
- Timestamp:
- 10/04/07 12:49:00
- Files:
-
- trunk/ChangeLog (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c (modified) (2 diffs)
- trunk/libtinymail-camel/camel-lite/camel/camel-mime-parser.c (modified) (5 diffs)
- trunk/libtinymail-camel/camel-lite/camel/camel-search-private.c (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/camel-search-private.h (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-message-cache.c (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-store.c (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/local/camel-maildir-folder.c (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-summary.c (modified) (1 diff)
- trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c (modified) (2 diffs)
- trunk/libtinymail-camel/camel-lite/iconv-detect.c (modified) (4 diffs)
- trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c (modified) (2 diffs)
- trunk/libtinymail-gnome-desktop/tny-gnome-device.c (modified) (1 diff)
- trunk/m4/ticonv.m4 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ChangeLog
r2813 r2814 1 2007-10-04 Philip Van Hoof <pvanhoof@gnome.org> 2 3 - -Wall warnings 4 1 5 2007-10-03 Jose Dapena Paz <jdapena@igalia.com> 2 6 trunk/libtinymail-camel/camel-lite/camel/camel-folder-summary.c
r2774 r2814 2027 2027 const char *received; 2028 2028 guchar digest[16]; 2029 char *msgid , *r=NULL;2029 char *msgid = NULL; 2030 2030 char *subject, *from, *to, *cc; 2031 2031 CamelContentType *ct = NULL; … … 2033 2033 const char *prio = NULL; 2034 2034 const char *attach = NULL; 2035 int tzone = 0;2036 2035 2037 2036 mi = (CamelMessageInfoBase *)camel_message_info_new(s); trunk/libtinymail-camel/camel-lite/camel/camel-mime-parser.c
r2519 r2814 1574 1574 h = s->parts; 1575 1575 do { 1576 hb = folder_scan_content(s, &state, databuffer, datalength);1576 hb = (struct _header_scan_stack **)folder_scan_content(s, &state, databuffer, datalength); 1577 1577 if (s->scan_pre_from && *datalength > 0) { 1578 1578 d(printf("got pre-from content %d bytes\n", *datalength)); 1579 1579 return; 1580 1580 } 1581 } while (hb ==h&& *datalength>0);1582 1583 if (*datalength==0 && hb== h) {1581 } while (hb == ((struct _header_scan_stack **)h) && *datalength>0); 1582 1583 if (*datalength==0 && hb== ((struct _header_scan_stack **)h)) { 1584 1584 d(printf("found 'From '\n")); 1585 1585 s->start_of_from = folder_tell(s); … … 1664 1664 1665 1665 do { 1666 hb = folder_scan_content (s, &state, databuffer, datalength);1666 hb = (struct _header_scan_stack **) folder_scan_content (s, &state, databuffer, datalength); 1667 1667 1668 1668 d(printf ("\n\nOriginal content: '")); … … 1681 1681 return; 1682 1682 } 1683 } while (hb == h&& *datalength > 0);1683 } while (hb == ((struct _header_scan_stack **)h) && *datalength > 0); 1684 1684 1685 1685 /* check for any filter completion data */ … … 1708 1708 do { 1709 1709 do { 1710 hb = folder_scan_content(s, &state, databuffer, datalength);1710 hb = (struct _header_scan_stack **) folder_scan_content(s, &state, databuffer, datalength); 1711 1711 if (*datalength>0) { 1712 1712 /* instead of a new state, we'll just store it locally and provide … … 1724 1724 } 1725 1725 } 1726 } while (hb== h&& *datalength>0);1726 } while (hb== ((struct _header_scan_stack **)h) && *datalength>0); 1727 1727 h->prestage++; 1728 if (*datalength==0 && hb== h&& !seenlast) {1728 if (*datalength==0 && hb== ((struct _header_scan_stack **)h) && !seenlast) { 1729 1729 d(printf("got boundary: %s last=%d\n", hb->boundary, state)); 1730 1730 s->start_of_boundary = folder_tell(s); trunk/libtinymail-camel/camel-lite/camel/camel-search-private.c
r1943 r2814 95 95 int 96 96 camel_search_build_match_regex (regex_t *pattern, camel_search_flags_t type, int argc, 97 struct _ESExpResult **argv, CamelException *ex) 98 { 97 void *argv_in, CamelException *ex) 98 { 99 struct _ESExpResult **argv = argv_in; 99 100 GString *match = g_string_new(""); 100 101 int c, i, count=0, err; trunk/libtinymail-camel/camel-lite/camel/camel-search-private.h
r1943 r2814 56 56 57 57 /* builds a regex that represents a string search */ 58 int camel_search_build_match_regex(regex_t *pattern, camel_search_flags_t type, int argc, struct _ESExpResult **argv, CamelException *ex);58 int camel_search_build_match_regex(regex_t *pattern, camel_search_flags_t type, int argc, void *argv, CamelException *ex); 59 59 gboolean camel_search_message_body_contains(CamelDataWrapper *object, regex_t *pattern); 60 60 trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-message-cache.c
r2367 r2814 551 551 } 552 552 553 char *strcasestr(const char *haystack, const char *needle); 553 554 554 555 static int trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c
r2807 r2814 1224 1224 { 1225 1225 const char *ssl_mode, *idle_sleep, *getsrv_sleep; 1226 struct addrinfo hints , *ai;1226 struct addrinfo hints; 1227 1227 int mode = -1, ret, i, must_tls = 0; 1228 1228 char *serv; trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-store.c
r2804 r2814 394 394 { 395 395 char *path = CAMEL_LOCAL_STORE (store)->toplevel_dir; 396 CamelLocalFolder *folder = NULL;397 char *newibex = g_strdup_printf("%s%s.ibex", path, new);398 char *oldibex = g_strdup_printf("%s%s.ibex", path, old);399 396 CamelException nex = CAMEL_EXCEPTION_INITIALISER; 400 397 … … 433 430 /* The (f)utility of this recovery effort is quesitonable */ 434 431 435 base_failed:436 432 xrename(new, old, path, ".cmeta", TRUE, ex); 437 438 cmeta_failed:439 433 xrename(new, old, path, ".ev-summary.mmap", TRUE, ex); 440 434 441 summary_failed:442 435 443 436 #if 0 trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-local-summary.c
r2720 r2814 156 156 camel_local_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex) 157 157 { 158 struct stat st;159 CamelFolderSummary *s = (CamelFolderSummary *)cls;160 161 158 d(printf("Loading summary ...\n")); 162 159 trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-folder.c
r2777 r2814 292 292 char *name = NULL; 293 293 CamelStream *output_stream = NULL; 294 295 CamelMessageInfo *mi;296 CamelMaildirMessageInfo *mdi;297 294 char *dest = NULL; 298 295 trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-summary.c
r2810 r2814 536 536 } 537 537 538 static int539 sort_receive_cmp(const void *ap, const void *bp)540 {541 const CamelMaildirMessageInfo542 *a = *((CamelMaildirMessageInfo **)ap),543 *b = *((CamelMaildirMessageInfo **)bp);544 545 if (a->info.info.date_received < b->info.info.date_received)546 return -1;547 else if (a->info.info.date_received > b->info.info.date_received)548 return 1;549 550 return 0;551 }552 538 553 539 static int trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c
r2754 r2814 675 675 676 676 if (camel_disco_store_status (CAMEL_DISCO_STORE (pop3_store)) == CAMEL_DISCO_STORE_OFFLINE) 677 return ;677 return -1; 678 678 679 679 g_static_rec_mutex_lock (pop3_store->eng_lock); … … 683 683 if (camel_exception_is_set (ex)) { 684 684 g_static_rec_mutex_unlock (pop3_store->eng_lock); 685 return ;685 return -1; 686 686 } 687 687 } trunk/libtinymail-camel/camel-lite/iconv-detect.c
r1018 r2814 23 23 #include <stdio.h> 24 24 #include <iconv.h> 25 #include <unistd.h> 25 26 26 27 enum { … … 92 93 int main (int argc, char **argv) 93 94 { 94 unsigned int bits,iso8859, iso2022, iso10646;95 unsigned int iso8859, iso2022, iso10646; 95 96 CharInfo *info; 96 97 iconv_t cd; … … 100 101 fp = fopen ("iconv-detect.h", "w"); 101 102 if (fp == NULL) 102 exit(255);103 return (255); 103 104 104 105 fprintf (fp, "/* This is an auto-generated header, DO NOT EDIT! */\n\n"); … … 182 183 fclose (fp); 183 184 184 exit(0);185 return (0); 185 186 } trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c
r2536 r2814 448 448 449 449 */ 450 450 #if 0 451 451 static void 452 452 tny_gnome_account_store_add_account (TnyAccountStore *self, TnyAccount *account, const gchar *type) … … 484 484 return; 485 485 } 486 #endif 486 487 487 488 trunk/libtinymail-gnome-desktop/tny-gnome-device.c
r2553 r2814 21 21 22 22 #include <glib/gi18n-lib.h> 23 #include <gtk/gtk.h> 23 24 24 25 #include <tny-gnome-device.h> trunk/m4/ticonv.m4
r1147 r2814 46 46 const char *from = "Some Text \xA4"; 47 47 const char *utf8 = "Some Text \xC2\xA4"; 48 char *transbuf = malloc (20), *trans = transbuf;48 char *transbuf = (char *) malloc (20), *trans = transbuf; 49 49 iconv_t cd; 50 50 size_t from_len = strlen (from), utf8_len = 20; … … 54 54 /* glibc 2.1.2's iconv is broken in hard to test ways. */ 55 55 if (!strcmp (gnu_get_libc_version (), "2.1.2")) 56 exit(1);56 return (1); 57 57 #endif 58 58 59 59 cd = iconv_open ("UTF-8", "ISO-8859-1"); 60 60 if (cd == (iconv_t) -1) 61 exit(1);61 return (1); 62 62 if (iconv (cd, &from, &from_len, &trans, &utf8_len) == -1 || from_len != 0) 63 exit(1);63 return (1); 64 64 if (memcmp (utf8, transbuf, utf8_real_len) != 0) 65 exit(1);65 return (1); 66 66 67 exit(0);67 return (0); 68 68 }]])],[ac_cv_libiconv_utf8=yes],[ac_cv_libiconv_utf8=no; have_iconv=no],[ac_cv_libiconv_utf8=no; have_iconv=no])) 69 69 fi
