← Back to branch summary

~ubuntu-branches/ubuntu/maverick/evolution-data-server/maverick-proposed

« back to all changes in this revision

Viewing changes to camel/providers/pop3/camel-pop3-engine.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-17 17:02:06 UTC
  • mfrom: (1.1.79 upstream) (1.6.12 experimental)
  • Revision ID: james.westby@ubuntu.com-20100517170206-4ufr52vwrhh26yh0
Tags: 2.30.1-1ubuntu1
https://launchpad.net/bugs/42199
https://launchpad.net/bugs/229669
https://launchpad.net/bugs/173703
https://launchpad.net/bugs/360344
https://launchpad.net/bugs/508494
* Merge from debian experimental. Remaining change:
  (LP: #42199, #229669, #173703, #360344, #508494)
  + debian/control:
    - add Vcs-Bzr tag
    - don't use libgnome
    - Use Breaks instead of Conflicts against evolution 2.25 and earlier.
  + debian/evolution-data-server.install,
    debian/patches/45_libcamel_providers_version.patch:
    - use the upstream versioning, not a Debian-specific one 
  + debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
    debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
    - install html documentation
  + debian/rules:
    - don't build documentation it's shipped with the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/providers/pop3/camel-pop3-engine.c
132
132
 * Returns a NULL stream.  A null stream is always at eof, and
133
133
 * always returns success for all reads and writes.
134
134
 *
135
 
 * Return value: the stream
 
135
 * Returns: the stream
136
136
 **/
137
137
CamelPOP3Engine *
138
138
camel_pop3_engine_new(CamelStream *source, guint32 flags)
213
213
                                        tok = next;
214
214
                                }
215
215
                        } else {
216
 
                                for (i=0;i<sizeof(capa)/sizeof(capa[0]);i++) {
 
216
                                for (i = 0; i < G_N_ELEMENTS (capa); i++) {
217
217
                                        if (strcmp((gchar *) capa[i].cap, (gchar *) line) == 0)
218
218
                                                pe->capa |= capa[i].flag;
219
219
                                }
364
364
        return pe->current==NULL?0:1;
365
365
ioerror:
366
366
        /* we assume all outstanding commands are gunna fail now */
367
 
        while ( (pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->active)) ) {
 
367
        while ((pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->active))) {
368
368
                pw->state = CAMEL_POP3_COMMAND_ERR;
369
369
                camel_dlist_addtail(&pe->done, (CamelDListNode *)pw);
370
370
        }
371
371
 
372
 
        while ( (pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->queue)) ) {
 
372
        while ((pw = (CamelPOP3Command*)camel_dlist_remhead(&pe->queue))) {
373
373
                pw->state = CAMEL_POP3_COMMAND_ERR;
374
374
                camel_dlist_addtail(&pe->done, (CamelDListNode *)pw);
375
375
        }