← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to camel/camel-mime-filter-bestenc.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/camel-mime-filter-bestenc.c
40
40
        guint total;    /* total characters read */
41
41
 
42
42
        guint lastc;    /* the last character read */
43
 
        gint crlfnoorder;       /* if crlf's occured where they shouldn't have */
 
43
        gint crlfnoorder;       /* if crlf's occurred where they shouldn't have */
44
44
 
45
45
        gint startofline;       /* are we at the start of a new line? */
46
46
 
86
86
                    && (priv->fromcount > 0 || priv->startofline)) {
87
87
                        if (priv->fromcount + len >=5) {
88
88
                                memcpy (&priv->fromsave[priv->fromcount], in, 5 - priv->fromcount);
89
 
                                priv->hadfrom = strncmp(priv->fromsave, "From ", 5) == 0;
 
89
                                priv->hadfrom = strncmp (priv->fromsave, "From ", 5) == 0;
90
90
                                priv->fromcount = 0;
91
91
                        } else {
92
92
                                memcpy (&priv->fromsave[priv->fromcount], in, len);
125
125
                                        /* Check for "^From " lines */
126
126
                                        if ((priv->flags & CAMEL_BESTENC_NO_FROM) && !priv->hadfrom) {
127
127
                                                if (pend - p >= 5) {
128
 
                                                        priv->hadfrom = strncmp((gchar *) p, (gchar *) "From ", 5) == 0;
 
128
                                                        priv->hadfrom = strncmp ((gchar *) p, (gchar *) "From ", 5) == 0;
129
129
                                                } else if (pend - p == 0) {
130
130
                                                        priv->startofline = TRUE;
131
131
                                                } else {
263
263
        required = required & ~CAMEL_BESTENC_TEXT;
264
264
 
265
265
#if 0
266
 
        printf("count0 = %d, count8 = %d, total = %d\n", priv->count0, priv->count8, priv->total);
267
 
        printf("maxline = %d, crlfnoorder = %s\n", priv->maxline, priv->crlfnoorder?"TRUE":"FALSE");
268
 
        printf(" %d%% require encoding?\n", (priv->count0+priv->count8)*100 / priv->total);
 
266
        printf ("count0 = %d, count8 = %d, total = %d\n", priv->count0, priv->count8, priv->total);
 
267
        printf ("maxline = %d, crlfnoorder = %s\n", priv->maxline, priv->crlfnoorder?"TRUE":"FALSE");
 
268
        printf (" %d%% require encoding?\n", (priv->count0 + priv->count8) * 100 / priv->total);
269
269
#endif
270
270
 
271
271
        /* if we're not allowed to have From lines and we had one, use an encoding