Changeset 1920

Show
Ignore:
Timestamp:
05/08/07 19:18:01
Author:
pvanhoof
Message:

-Wall warnings fixed

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r1914 r1920  
     12007-05-08  Philip Van Hoof  <pvanhoof@gnome.org> 
     2 
     3        * -Wall warnings fixed 
     4 
    152007-05-08  Murray Cumming  <murrayc@murrayc.com 
    26 

  • trunk/libtinymail-camel/camel-lite/camel/camel-data-cache.c

    r1406 r1920  
    232232{ 
    233233        char mystring [512]; 
    234         gchar *mpath; char *dir; 
    235234        guint32 hash; 
    236235        hash = g_str_hash(mi->uid); 
    …… 
    280279{ 
    281280        int fd; char *dir; 
    282         gboolean retval = FALSE; 
    283281        gchar *mpath; 
    284282        guint32 hash; 

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

    r1807 r1920  
    12371237        char *buffer; 
    12381238        size_t len; 
    1239         struct _CamelFolderSummaryPrivate *p = _PRIVATE(s); 
    12401239        off_t start; 
    12411240 
    …… 
    12661265{ 
    12671266        CamelMessageInfo *info; 
    1268         struct _CamelFolderSummaryPrivate *p; 
    12691267 
    12701268        if (s != NULL) 
    …… 
    19551953        const char *received; 
    19561954        guchar digest[16]; 
    1957         struct _camel_header_references *refs, *irt, *scan; 
    19581955        char *msgid, *r=NULL; 
    1959         int count; 
    19601956        char *subject, *from, *to, *cc; 
    19611957        CamelContentType *ct = NULL; 
    …… 
    22342230{ 
    22352231        guint32 count; 
     2232#ifdef NON_TINYMAIL_FEATURES 
    22362233        CamelFlag *flag; 
    22372234        CamelTag *tag; 
    22382235        int i; 
     2236#endif 
    22392237        CamelMessageInfoBase *mi = (CamelMessageInfoBase *)info; 
    22402238 
    …… 
    25222520        CamelContentType *ct; 
    25232521        int enc_id = -1, chr_id = -1, html_id = -1, idx_id = -1; 
    2524         struct _CamelFolderSummaryPrivate *p = _PRIVATE(s); 
    2525         CamelMimeFilterCharset *mfc; 
    25262522        CamelMessageContentInfo *part; 
    25272523 
    …… 
    31903186{ 
    31913187        CamelMessageInfoBase *to, *from = (CamelMessageInfoBase *)mi; 
     3188#ifdef NON_TINYMAIL_FEATURES 
    31923189        CamelFlag *flag; 
    31933190        CamelTag *tag; 
    3194  
     3191#endif 
    31953192        to = (CamelMessageInfoBase *)camel_message_info_new(s); 
    31963193 

  • trunk/libtinymail-camel/camel-lite/camel/camel-folder-thread.c

    r1050 r1920  
    5757} 
    5858 
     59#if 0 
    5960static void 
    6061container_parent_child(CamelFolderThreadNode *parent, CamelFolderThreadNode *child) 
    …… 
    9899        printf("DAMN, we shouldn't  be here!\n"); 
    99100} 
     101#endif 
     102 
    100103 
    101104static void 

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

    r1845 r1920  
    318318        int i; 
    319319        guint32 tag; 
    320         int unread = -1, deleted = 0, junked = 0, visible = 0, count = -1; 
     320        int unread = -1, deleted = 0, count = -1; 
    321321 
    322322        for (i=0; i < args->argc; i++)  
    …… 
    16421642}; 
    16431643 
     1644#if 0 
    16441645static void 
    16451646filter_filter(CamelSession *session, CamelSessionThreadMsg *tmsg) 
    …… 
    17491750        camel_object_unref(m->folder); 
    17501751} 
    1751  
    1752 static CamelSessionThreadOps filter_ops = { 
    1753         filter_filter, 
    1754         filter_free, 
    1755 }; 
     1752#endif 
     1753 
    17561754 
    17571755/* Event hooks that block emission when frozen */ 

  • trunk/libtinymail-camel/camel-lite/camel/camel-search-private.c

    r1027 r1920  
    382382           otherwise not */ 
    383383        p = (const unsigned char *)match; 
    384         while (c = camel_utf8_getc(&p)) { 
     384 
     385        c = camel_utf8_getc (&p); 
     386        while (c)  
     387        { 
    385388                if (g_unichar_isupper(c)) { 
    386389                        switch (how) { 
    …… 
    398401                        return FALSE; 
    399402                } 
    400         } 
    401          
     403                c = camel_utf8_getc (&p); 
     404        } 
     405 
    402406        switch (how) { 
    403407        case CAMEL_SEARCH_MATCH_EXACT: 

  • trunk/libtinymail-camel/camel-lite/camel/camel-tcp-stream-ssl.c

    r1663 r1920  
    344344        PRPollDesc pollfds[2]; 
    345345        gboolean nonblock; 
    346         int error; 
    347346 
    348347        /* get O_NONBLOCK options */ 
    …… 
    788787                 
    789788                if (nread != st.st_size) { 
    790                         g_warning ("cert size read truncated %s: %u != %ld", path, nread, st.st_size); 
     789                        /* g_warning ("cert size read truncated %s: %u != %ld", path, nread, st.st_size); */ 
    791790                        g_byte_array_free(ccert->rawcert, TRUE); 
    792791                        ccert->rawcert = NULL; 

  • trunk/libtinymail-camel/camel-lite/camel/camel-url-scanner.c

    r1319 r1920  
    182182 
    183183        if (open_brace != NULL) 
    184                 *open_brace == '\0'; 
     184                *open_brace = '\0'; 
    185185 
    186186        if (so > 0) { 

  • trunk/libtinymail-camel/camel-lite/camel/camel-vtrash-folder.c

    r1706 r1920  
    114114        int i; 
    115115        guint32 tag; 
    116         int unread = -1, deleted = 0, junked = 0, visible = 0, count = -1; 
     116        int unread = -1, deleted = 0, count = -1; 
    117117 
    118118        for (i=0;i<args->argc;i++) { 

  • trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-command.c

    r1843 r1920  
    189189                    const char *cmd, CamelException *ex) 
    190190{ 
    191         GThread *thread; 
    192191        ssize_t nwritten; 
    193192        gchar *resp = NULL; 

  • trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c

    r1906 r1920  
    3535 
    3636#include <config.h>  
     37#include <string.h> 
    3738 
    3839#include <stdlib.h> 
    …… 
    628629                camel_imap_folder_changed (folder, exists, NULL, ex); 
    629630 
    630         if (highestmodseq != NULL & suc && needtoput) 
     631        if (highestmodseq != NULL && suc && needtoput) 
    631632                put_highestmodseq (imap_folder, (const char *) highestmodseq); 
    632          
     633 
    633634        if (highestmodseq != NULL) 
    634635                g_free (highestmodseq); 
    …… 
    817818} 
    818819 
     820#if 0 
    819821static void 
    820822flags_to_label(CamelFolder *folder, CamelImapMessageInfo *mi) 
    …… 
    852854} 
    853855 
     856#endif 
     857 
    854858static gboolean  
    855859imap_rescan_condstore (CamelFolder *folder, int exists, const char *highestmodseq, CamelException *ex) 
    …… 
    865869        CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder); 
    866870        CamelImapStore *store = CAMEL_IMAP_STORE (folder->parent_store); 
    867         struct { 
    868                 char *uid; 
    869                 guint32 flags; 
    870         } *new; 
    871871        char *resp; 
    872872        CamelImapResponseType type; 
    873         int i, summary_len, summary_got; 
     873        int summary_len, summary_got; 
    874874        CamelMessageInfo *info; 
    875875        CamelImapMessageInfo *iinfo; 
    …… 
    883883                if (exists) 
    884884                        camel_imap_folder_changed (folder, exists, NULL, ex); 
    885                 return; 
     885                return TRUE; 
    886886        } 
    887887 
    …… 
    20342034                      gboolean delete_originals, CamelException *ex) 
    20352035{ 
    2036         CamelImapStore *store = CAMEL_IMAP_STORE (source->parent_store); 
    20372036        int count; 
    2038  
    20392037        /* Sync message flags if needed. */ 
    20402038        imap_sync_online (source, ex); 
    …… 
    28252823} 
    28262824 
     2825#if 0 
    28272826static void 
    28282827add_message_from_data (CamelFolder *folder, GPtrArray *messages, 
    …… 
    28662865} 
    28672866 
     2867#endif 
     2868 
    28682869/* #define CAMEL_MESSAGE_INFO_HEADERS "DATE FROM TO CC SUBJECT REFERENCES IN-REPLY-TO MESSAGE-ID MIME-VERSION CONTENT-TYPE " */ 
    28692870 
    …… 
    28862887        char *resp = NULL; 
    28872888        CamelImapResponseType type; 
    2888         guint32 cnt = 0, slen; 
    2889         CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder); 
     2889        guint32 cnt = 0; 
    28902890        gchar *uid, *str; 
    28912891 
    …… 
    29442944   GData *data; 
    29452945   gboolean more = TRUE, oosync = FALSE, oldrescval = imap_folder->need_rescan; 
    2946    unsigned int nextn, cnt=0, tcnt=0, ucnt=0, rec=0, ineed = 0, allhdrs = 0; 
     2946   unsigned int nextn, cnt=0, tcnt=0, ucnt=0, ineed = 0, allhdrs = 0; 
    29472947 
    29482948   if (!store->ostream || !store->istream) 
    …… 
    32643264process_idle_response (IdleResponse *idle_resp) 
    32653265{ 
    3266         CamelImapStore *store; 
    3267         char *resp = NULL; 
    3268         const char *header_spec; 
    32693266        CamelException ex = CAMEL_EXCEPTION_INITIALISER; 
    3270         CamelImapResponseType type; 
    3271         CamelImapMessageInfo *mi, *info; 
    32723267 
    32733268        if (!idle_resp) 
    …… 
    34283423        if (store->current_folder) 
    34293424        { 
    3430                 GArray *expunged = NULL; 
    34313425                resp = NULL; 
    34323426                while (camel_imap_store_readline_nb (store, &resp, &ex) > 0) 
    …… 
    35143508        CamelImapStore *store; 
    35153509        IdleResponse *idle_resp = NULL; 
    3516         GSource *src; 
    35173510        gboolean had_err = FALSE; 
    35183511        CamelException ex = CAMEL_EXCEPTION_INITIALISER; 
    …… 
    35783571        /* printf ("idle\n"); */ 
    35793572 
    3580         if (!folder || ((CamelObject *)data)->ref_count <= 0 && !CAMEL_IS_IMAP_FOLDER (folder)) 
     3573        if ((!folder) || ((((CamelObject *)data)->ref_count <= 0) && (!CAMEL_IS_IMAP_FOLDER (folder)))) 
    35813574                return FALSE; 
    35823575 
    …… 
    38393832        CamelStream *stream = NULL; 
    38403833        gboolean connected = FALSE, idle_rt = FALSE; 
    3841         CamelException  tex = CAMEL_EXCEPTION_INITIALISER,  
    3842                         myex = CAMEL_EXCEPTION_INITIALISER, 
    3843                         cex = CAMEL_EXCEPTION_INITIALISER; 
     3834        CamelException  tex = CAMEL_EXCEPTION_INITIALISER; 
    38443835        ssize_t nread = 0; gboolean amcon = FALSE; 
    3845         gchar *a_resp = NULL; 
    38463836 
    38473837        CAMEL_IMAP_FOLDER_REC_LOCK (imap_folder, cache_lock); 
    …… 
    39373927                        ssize_t hread = 1; 
    39383928                        gint length=0, rec=0; 
    3939                         long seq; 
    39403929                        char *pos, *ppos; 
    39413930 
    …… 
    40374026                } else  
    40384027                { 
    4039                         gboolean first = TRUE, err=FALSE; 
     4028                        gboolean err=FALSE; 
    40404029                        gchar line [MAX_LINE_LEN]; 
    40414030                        guint linenum = 0; 
    …… 
    40684057 
    40694058                        if (server_stream)  
    4070                           while (nread = camel_stream_buffer_gets (server_stream, line, MAX_LINE_LEN) > 0) 
     4059                          while ((nread = camel_stream_buffer_gets (server_stream, line, MAX_LINE_LEN) > 0)) 
    40714060                          { 
    40724061                                gint llen = 0; 
    …… 
    41274116                                memset (line, 0, MAX_LINE_LEN); 
    41284117                          } 
    4129 merrorhandler: 
     4118 
    41304119                        g_mutex_unlock (store->stream_lock); 
    41314120                        CAMEL_SERVICE_REC_UNLOCK (store, connect_lock); 
    …… 
    41614150                for (t=0; t < 2; t++) 
    41624151                { 
    4163                         gboolean first = TRUE, err=FALSE; 
     4152                        gboolean err=FALSE; 
    41644153                        gchar line[MAX_LINE_LEN]; 
    41654154                        guint linenum = 0;  
    …… 
    42054194 
    42064195                        if (server_stream)  
    4207                           while (nread = camel_stream_buffer_gets (server_stream, line, MAX_LINE_LEN) > 0) 
     4196                          while ((nread = camel_stream_buffer_gets (server_stream, line, MAX_LINE_LEN) > 0)) 
    42084197                          { 
    42094198                                gint llen = 0; 

  • trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-store.c

    r1850 r1920  
    19991999        if (file != NULL) 
    20002000        { 
    2001                 fprintf (file, "%#d %#d %#d", messages, unseen, uidnext); 
     2001                fprintf (file, "%d %d %d", messages, unseen, uidnext); 
    20022002                fclose (file); 
    20032003        } 
    …… 
    31043104 
    31053105static void 
    3106 get_some_numbers (CamelStore *store, CamelFolderInfo *fi) 
    3107 { 
    3108 } 
    3109  
    3110 static void 
    31113106fill_fi(CamelStore *store, CamelFolderInfo *fi, guint32 flags) 
    31123107{ 

  • trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-summary.c

    r1667 r1920  
    3232#include <stdlib.h> 
    3333 
     34#include "camel-imap-message-cache.h" 
    3435#include "camel-imap-summary.h" 
    3536#include "camel-imap-utils.h" 
    …… 
    290291{ 
    291292        CamelImapMessageInfo *mi; 
     293#ifdef NON_TINYMAIL_FEATURES 
    292294        const CamelFlag *flag; 
    293295        const CamelTag *tag; 
     296#endif 
    294297 
    295298        /* Create summary entry */ 

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

    r1706 r1920  
    478478{ 
    479479        GString *out = g_string_new(""); 
     480 
     481#ifdef NON_TINYMAIL_FEATURES 
    480482        struct _camel_header_param *params = NULL; 
    481483        GString *val = g_string_new(""); 
    482 #ifdef NON_TINYMAIL_FEATURES 
    483484        CamelFlag *flag = mi->info.user_flags; 
    484485        CamelTag *tag = mi->info.user_tags; 
    …… 
    636637{ 
    637638        CamelLocalMessageInfo *mi; 
    638         CamelLocalSummary *cls = (CamelLocalSummary *)s; 
    639639 
    640640        mi = (CamelLocalMessageInfo *)((CamelFolderSummaryClass *)camel_local_summary_parent)->message_info_new_from_header(s, h); 

  • trunk/libtinymail-camel/camel-lite/camel/providers/local/camel-maildir-folder.c

    r1585 r1920  
    160160maildir_append_message (CamelFolder *folder, CamelMimeMessage *message, const CamelMessageInfo *info, char **appended_uid, CamelException *ex) 
    161161{ 
    162         CamelMaildirFolder *maildir_folder = (CamelMaildirFolder *)folder; 
    163162        CamelLocalFolder *lf = (CamelLocalFolder *)folder; 
    164163        CamelStream *output_stream; 

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

    r1462 r1920  
    163163{ 
    164164        CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s); 
    165         unsigned char *ptrchr = s->filepos; 
    166165 
    167166        if (((CamelFolderSummaryClass *)camel_nntp_summary_parent)->summary_header_load(s) == -1) 

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

    r1894 r1920  
    2828#endif 
    2929 
     30#include <string.h> 
     31 
    3032#include <errno.h> 
    3133 
    …… 
    522524        camel_operation_end(NULL); 
    523525 
    524         camel_pop3_store_expunge (pop3_store, ex); 
     526        /* camel_pop3_store_expunge (pop3_store, ex); */ 
    525527 
    526528        return 0; 
    …… 
    583585        unsigned char *buffer; 
    584586        int w = 0, n; 
    585         CamelMimeParser *mp; 
    586         struct _camel_header_raw *h; 
    587587        gchar *boundary = NULL; 
    588588        gboolean occurred = FALSE, theend = FALSE; 
    …… 
    596596        while (!theend && camel_pop3_stream_line (stream, &buffer, &len) > 0) 
    597597        { 
    598                 char *p = NULL; 
    599  
    600598                if (!buffer) 
    601599                        continue; 
    …… 
    674672        fi->stream = NULL; 
    675673 
    676 ending: 
    677674        if (boundary) 
    678675                g_free (boundary); 

  • trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c

    r1687 r1920  
    201201pop3_build_folder_info(CamelPOP3Store *store, const char *folder_name) 
    202202{ 
    203         CamelURL *url; 
    204203        const char *name; 
    205204        CamelFolderInfo *fi; 
    206         guint msize; 
     205        gint msize; 
    207206        gchar *folder_dir = store->storage_path; 
    208207        gchar *spath; 
    …… 
    239238        }  
    240239 
    241         fi->local_size = msize; 
     240        fi->local_size = (guint) msize; 
    242241 
    243242        fi->uri = g_strdup (""); 
    …… 
    793792{ 
    794793        CamelPOP3Store *pop3_store = CAMEL_POP3_STORE (service); 
    795         CamelStore *store = CAMEL_STORE (service); 
    796794        CamelDiscoStore *disco_store = CAMEL_DISCO_STORE (service); 
    797         char *tmp, *path; 
    798         CamelURL *summary_url; 
     795        char *path; 
    799796 
    800797        CAMEL_SERVICE_CLASS (parent_class)->construct (service, session, provider, url, ex); 

  • trunk/libtinymail-camel/tny-camel-folder.c

    r1913 r1920  
    155155        CamelFolderSummary *summary; 
    156156        gboolean old = priv->dont_fkill; 
    157         gboolean need_unread_sync; 
    158157 
    159158        g_static_rec_mutex_lock (priv->folder_lock); 
    …… 
    246245                if (CAMEL_IS_OBJECT (priv->folder)) 
    247246                { 
    248                         g_critical ("Killing invalid CamelObject (should be a Camelfolder) at 0x%x\n", priv->folder); 
     247                        g_critical ("Killing invalid CamelObject (should be a Camelfolder)\n"); 
    249248                        while (((CamelObject*)priv->folder)->ref_count >= 1) 
    250249                                camel_object_unref (CAMEL_OBJECT (priv->folder)); 
    251250                } else 
    252                         g_critical ("Corrupted CamelFolder instance at 0x%x (I can't recover from this state, therefore I will leak)\n", priv->folder); 
     251                        g_critical ("Corrupted CamelFolder instance at (I can't recover from this state, therefore I will leak)\n"); 
    253252        } 
    254253 
    …… 
    770769        RefreshFolderInfo *oinfo = thr_user_data; 
    771770        TnyProgressInfo *info = NULL; 
    772         TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (oinfo->self); 
    773771 
    774772        info = tny_progress_info_new (G_OBJECT (oinfo->self), oinfo->status_callback,  
    …… 
    10191017        TnyCamelFolderPriv *priv = ptr->priv; 
    10201018        TnyList *headers = ptr->headers; 
    1021         CamelFolder *cfol = _tny_camel_folder_get_camel_folder (TNY_CAMEL_FOLDER (self)); 
    1022         CamelMessageFlags flags = camel_message_info_flags (mi); 
    10231019 
    10241020        /* TODO: Proxy instantiation (happens a lot, could use a pool) */ 
    …… 
    11721168        GetMsgInfo *oinfo = thr_user_data; 
    11731169        TnyProgressInfo *info = NULL; 
    1174         TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (oinfo->self); 
    11751170 
    11761171        info = tny_progress_info_new (G_OBJECT (oinfo->self), oinfo->status_callback,  
    …… 
    13531348        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), err,  
    13541349                        TNY_FOLDER_ERROR, TNY_FOLDER_ERROR_GET_MSG)) 
    1355                 return; 
     1350                return NULL; 
    13561351 
    13571352        g_assert (TNY_IS_HEADER (header)); 
    …… 
    14091404        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), err,  
    14101405                        TNY_FOLDER_ERROR, TNY_FOLDER_ERROR_GET_MSG)) 
    1411                 return; 
     1406                return NULL; 
    14121407 
    14131408        if (!priv->receive_strat) { 
    …… 
    15291524        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), err,  
    15301525                        TNY_FOLDER_ERROR, TNY_FOLDER_ERROR_COPY)) 
    1531                 return; 
     1526                return NULL; 
    15321527 
    15331528        g_assert (TNY_IS_CAMEL_FOLDER (into) || TNY_IS_CAMEL_STORE_ACCOUNT (into)); 
    …… 
    15691564                                camel_object_unref (CAMEL_OBJECT (tostore)); 
    15701565                        _tny_session_stop_operation (TNY_FOLDER_PRIV_GET_SESSION (priv)); 
    1571                         return; 
     1566                        return NULL; 
    15721567                } 
    15731568        } 
    …… 
    19691964        if (!priv_src->folder || !priv_src->loaded || !CAMEL_IS_FOLDER (priv_src->folder)) 
    19701965                if (!load_folder_no_lock (priv_src))  
    1971                         return; 
     1966                        return NULL; 
    19721967 
    19731968        if (!priv_dst->folder || !priv_dst->loaded || !CAMEL_IS_FOLDER (priv_dst->folder)) 
    19741969                if (!load_folder_no_lock (priv_dst))  
    1975                         return; 
     1970                        return NULL; 
    19761971 
    19771972        transfer_msgs_thread_clean (info->self, info->header_list, info->folder_dst,  
    …… 
    21522147{ 
    21532148        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    2154         gchar *full_name; 
    21552149        CamelFolder *cfolder; 
    21562150        CamelFolderInfo *parent_info; 
    …… 
    24862480{ 
    24872481        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    2488         TnyCamelStoreAccountPriv *apriv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (priv->account);   
    2489          
    24902482        CamelException ex = CAMEL_EXCEPTION_INITIALISER; 
    24912483        CamelStore *store; gchar *folname; 
    …… 
    24962488        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), err,  
    24972489                        TNY_FOLDER_STORE_ERROR, TNY_FOLDER_STORE_ERROR_CREATE_FOLDER)) 
    2498                 return; 
     2490                return NULL; 
    24992491 
    25002492        if (!name || strlen (name) <= 0) 
    …… 
    26212613{ 
    26222614        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    2623         TnyCamelStoreAccountPriv *apriv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (priv->account); 
    26242615        CamelFolderInfo *iter; 
    26252616 
    …… 
    29052896tny_camel_folder_poke_status_default (TnyFolder *self) 
    29062897{ 
    2907         TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self); 
    29082898        GObject *info = g_object_ref (G_OBJECT (self)); 
    29092899 

  • trunk/libtinymail-camel/tny-camel-full-msg-receive-strategy.c

    r1700 r1920  
    4343#include "tny-camel-folder-priv.h" 
    4444#include "tny-camel-msg-header-priv.h" 
     45#include "tny-camel-msg-priv.h" 
     46#include "tny-camel-mime-part-priv.h" 
    4547 
    4648static GObjectClass *parent_class = NULL; 

  • trunk/libtinymail-camel/tny-camel-header.c

    r1884 r1920  
    7676tny_camel_header_get_replyto (TnyHeader *self) 
    7777{ 
    78         TnyCamelHeader *me = TNY_CAMEL_HEADER (self); 
    79         const gchar *retval = NULL; 
    80  
    81         return retval; 
     78        return NULL; 
    8279} 
    8380 

  • trunk/libtinymail-camel/tny-camel-mime-part.c

    r1866 r1920  
    3737#include "tny-camel-mime-part-priv.h" 
    3838#include "tny-camel-msg-header-priv.h" 
     39#include "tny-camel-msg-priv.h" 
    3940 
    4041#include <camel/camel-url.h> 

  • trunk/libtinymail-camel/tny-camel-msg-header.c

    r1866 r1920  
    328328tny_camel_msg_header_finalize (GObject *object) 
    329329{ 
    330         TnyCamelMsgHeader *self = (TnyCamelMsgHeader*) object; 
    331  
    332         /* Read _tny_camel_msg_header_new too! */ 
    333  
    334330        (*parent_class->finalize) (object); 
    335331 

  • trunk/libtinymail-camel/tny-camel-msg-remove-strategy.c

    r1858 r1920  
    7171        const gchar *id; 
    7272        CamelFolder *cfolder; 
    73         TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (folder); 
    7473 
    7574        g_assert (TNY_IS_CAMEL_FOLDER (folder)); 

  • trunk/libtinymail-camel/tny-camel-msg.c

    r1866 r1920  
    221221        TnyCamelMsg *self = (TnyCamelMsg*) object; 
    222222        TnyCamelMsgPriv *priv = TNY_CAMEL_MSG_GET_PRIVATE (self); 
    223         TnyCamelMimePartPriv *ppriv = TNY_CAMEL_MIME_PART_GET_PRIVATE (self); 
    224223 
    225224        g_mutex_lock (priv->message_lock); 

  • trunk/libtinymail-camel/tny-camel-partial-msg-receive-strategy.c

    r1700 r1920  
    4343#include "tny-camel-folder-priv.h" 
    4444#include "tny-camel-msg-header-priv.h" 
     45#include "tny-camel-msg-priv.h" 
    4546 
    4647static GObjectClass *parent_class = NULL; 

  • trunk/libtinymail-camel/tny-camel-store-account.c

    r1919 r1920  
    142142        if (apriv->session) 
    143143        { 
    144                 CamelService *oservice = apriv->service; 
    145  
    146144                if (camel_exception_is_set (apriv->ex)) 
    147145                        camel_exception_clear (apriv->ex); 
    …… 
    915913        TnyFolder *retval = NULL; 
    916914        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self); 
    917         TnyCamelStoreAccountPriv *priv = TNY_CAMEL_STORE_ACCOUNT_GET_PRIVATE (self);     
    918915        CamelException ex = CAMEL_EXCEPTION_INITIALISER;     
    919916        CamelFolderInfo *iter; guint32 flags; CamelStore *store; 

  • trunk/libtinymail-camel/tny-camel-stream.c

    r1866 r1920  
    149149} 
    150150 
    151 static void 
    152 tny_camel_stream_set_stream (TnyCamelStream *self, CamelStream *stream) 
    153 { 
    154         TnyCamelStreamPriv *priv = TNY_CAMEL_STREAM_GET_PRIVATE (self); 
    155  
    156         if (priv->stream) 
    157                 camel_object_unref (CAMEL_OBJECT (priv->stream)); 
    158  
    159         priv->stream = stream; 
    160  
    161         return; 
    162 } 
    163151 
    164152/** 

  • trunk/libtinymail-camel/tny-camel-transport-account.c

    r1866 r1920  
    122122        if (apriv->session) 
    123123        { 
    124                 CamelService *oservice = apriv->service; 
    125  
    126124                if (camel_exception_is_set (apriv->ex)) 
    127125                        camel_exception_clear (apriv->ex); 
    …… 
    151149{ 
    152150        TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (self); 
    153         CamelException ex = CAMEL_EXCEPTION_INITIALISER; 
    154151 
    155152        if (!apriv->url_string || !apriv->service || !CAMEL_IS_SERVICE (apriv->service))