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

« back to all changes in this revision

Viewing changes to camel/providers/nntp/camel-nntp-store.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
* 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:
125
125
                while ((c = *p++)) {
126
126
                        if (c == ':') {
127
127
                                p[-1] = 0;
128
 
                                for (i=0;i<sizeof(headers)/sizeof(headers[0]);i++) {
 
128
                                for (i = 0; i < G_N_ELEMENTS (headers); i++) {
129
129
                                        if (strcmp(line, headers[i].name) == 0) {
130
130
                                                xover->name = headers[i].name;
131
131
                                                if (strncmp((gchar *) p, "full", 4) == 0)
1378
1378
                    && !camel_service_connect (CAMEL_SERVICE (store), ex))
1379
1379
                        return -1;
1380
1380
 
1381
 
                /* Check for unprocessed data, ! */
 
1381
                /* Check for unprocessed data, !*/
1382
1382
                if (store->stream->mode == CAMEL_NNTP_STREAM_DATA) {
1383
1383
                        g_warning("Unprocessed data left in stream, flushing");
1384
1384
                        while (camel_nntp_stream_getd(store->stream, (guchar **)&p, &u) > 0)