← Back to branch summary

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

« back to all changes in this revision

Viewing changes to camel/camel-multipart.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-multipart.c
200
200
 
201
201
        link = g_list_nth (multipart->parts, index);
202
202
        if (link == NULL) {
203
 
                g_warning ("CamelMultipart::remove_part_at: "
204
 
                           "part to remove is NULL\n");
 
203
                g_warning (
 
204
                        "CamelMultipart::remove_part_at: "
 
205
                        "part to remove is NULL\n");
205
206
                return NULL;
206
207
        }
207
208
        removed_part = CAMEL_MIME_PART (link->data);
255
256
                GChecksum *checksum;
256
257
 
257
258
                /* Generate a fairly random boundary string. */
258
 
                bgen = g_strdup_printf ("%p:%lu:%lu", (gpointer) multipart,
259
 
                                        (gulong) getpid (),
260
 
                                        (gulong) time (NULL));
 
259
                bgen = g_strdup_printf (
 
260
                        "%p:%lu:%lu",
 
261
                        (gpointer) multipart,
 
262
                        (gulong) getpid (),
 
263
                        (gulong) time (NULL));
261
264
 
262
265
                checksum = g_checksum_new (G_CHECKSUM_MD5);
263
266
                g_checksum_update (checksum, (guchar *) bgen, -1);
300
303
        g_assert (camel_mime_parser_state (mp) == CAMEL_MIME_PARSER_STATE_MULTIPART);
301
304
 
302
305
        /* FIXME: we should use a came-mime-mutlipart, not jsut a camel-multipart, but who cares */
303
 
        d(printf("Creating multi-part\n"));
 
306
        d (printf ("Creating multi-part\n"));
304
307
 
305
308
        content_type = camel_mime_parser_content_type (mp);
306
 
        camel_multipart_set_boundary (multipart,
307
 
                                     camel_content_type_param(content_type, "boundary"));
 
309
        camel_multipart_set_boundary (
 
310
                multipart,
 
311
                camel_content_type_param (content_type, "boundary"));
308
312
 
309
313
        while (camel_mime_parser_step (mp, &buf, &len) != CAMEL_MIME_PARSER_STATE_MULTIPART_END) {
310
314
                camel_mime_parser_unstep (mp);