Changeset 3553

Show
Ignore:
Timestamp:
04/07/08 13:35:14
Author:
djcb
Message:
  • libtinymail-camel:

- fix some compiler warnings (return in void functions)
- move declarations to start of block
- fix CAMEL_POP3_CAP_LOGIN_DELAY (copy-paste bug where to
enum items had same value)
- some g_error => g_warning
- DELE %u => DELE %s

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ChangeLog

    r3551 r3553  
     12008-04-07 Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com> 
     2        * libtinymail-camel: 
     3                - fix some compiler warnings (return in void functions) 
     4                - move declarations to start of block 
     5                - fix CAMEL_POP3_CAP_LOGIN_DELAY (copy-paste bug where to 
     6                enum items had same value) 
     7                - some g_error => g_warning 
     8                - DELE %u => DELE %s 
     9 
    1102008-04-07  Sergio Villar Senin  <svillar@igalia.com> 
    211 

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

    r3263 r3553  
    388388                astring = imap_parse_astring (&word, &len); 
    389389 
    390                 if (!astring && strlen (astring) == 0) 
     390                if (!astring || strlen (astring) == 0) 
    391391                        return FALSE; 
    392392 

  • trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-engine.h

    r3005 r3553  
    6969        CAMEL_POP3_CAP_PIPE = 1<<4, 
    7070        CAMEL_POP3_CAP_STLS = 1<<5, 
    71         CAMEL_POP3_CAP_LOGIN_DELAY = 1<<5 
     71        CAMEL_POP3_CAP_LOGIN_DELAY = 1<<6 
    7272}; 
    7373 

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

    r3540 r3553  
    621621 
    622622                        g_unlink (expunged_path); 
    623                         cmd = camel_pop3_engine_command_new(pop3_store->engine, 0, NULL, NULL, "DELE %u\r\n", info->uid); 
     623                        cmd = camel_pop3_engine_command_new(pop3_store->engine, 0, NULL, NULL, "DELE %s\r\n", info->uid); 
    624624                        while (camel_pop3_engine_iterate(pop3_store->engine, cmd) > 0); 
    625625                        if (pop3_store->cache && info->uid) 

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

    r3415 r3553  
    680680tny_camel_bs_mime_part_set_transfer_encoding (TnyMimePart *self, const gchar *transfer_encoding) 
    681681{ 
    682         return TNY_CAMEL_BS_MIME_PART_GET_CLASS (self)->set_transfer_encoding(self, transfer_encoding); 
     682        TNY_CAMEL_BS_MIME_PART_GET_CLASS (self)->set_transfer_encoding(self, transfer_encoding); 
    683683} 
    684684 

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

    r3550 r3553  
    49354935tny_camel_folder_create_folder_async (TnyFolderStore *self, const gchar *name, TnyCreateFolderCallback callback, TnyStatusCallback status_callback, gpointer user_data) 
    49364936{ 
    4937         return TNY_CAMEL_FOLDER_GET_CLASS (self)->create_folder_async(self, name, callback, status_callback, user_data); 
     4937        TNY_CAMEL_FOLDER_GET_CLASS (self)->create_folder_async(self, name, callback, status_callback, user_data); 
    49384938} 
    49394939 
    …… 
    56695669                TnyCamelAccountPriv *apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (priv->account); 
    56705670                if (apriv->service) { 
     5671                        const char *foln; 
    56715672                        char *urls = camel_service_get_url (apriv->service); 
    56725673                        if (!priv->folder) 
    56735674                                load_folder_no_lock (priv); 
    5674                         const char *foln = camel_folder_get_full_name (priv->folder); 
     5675                        foln = camel_folder_get_full_name (priv->folder); 
    56755676                        retval = g_strdup_printf ("%s/%s", urls, foln); 
    56765677                        g_free (urls); 

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

    r3526 r3553  
    666666 
    667667        if (!wrapper) { 
    668                 g_error (_("Mime part does not yet have a source stream, use " 
    669                         "tny_mime_part_construct first")); 
     668                g_warning (_("Mime part does not yet have a source stream, use " 
     669                             "tny_mime_part_construct first")); 
    670670                camel_object_unref (cstream); 
    671671                g_set_error (err, TNY_MIME_ERROR,  
    …… 
    760760        CamelMedium *medium; 
    761761        CamelStream *cstream; 
     762        gssize bytes = -1; 
    762763 
    763764        g_assert (TNY_IS_STREAM (stream)); 
    …… 
    773774 
    774775        if (G_UNLIKELY (!wrapper)) { 
    775                 g_error (_("Mime part does not yet have a source stream, use " 
    776                         "tny_mime_part_construct first")); 
     776                g_warning (_("Mime part does not yet have a source stream, use " 
     777                             "tny_mime_part_construct first")); 
    777778                camel_object_unref (CAMEL_OBJECT (cstream)); 
    778779                return -1; 
    779780        } 
    780  
    781         gssize bytes = -1; 
    782781         
    783782        if (camel_content_type_is (wrapper->mime_type, "text", "*"))