← Back to branch summary

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

« back to all changes in this revision

Viewing changes to camel/camel-internet-address.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-internet-address.c
75
75
        if (a->addresses->len == 0)
76
76
                return NULL;
77
77
 
78
 
        out = g_string_new("");
 
78
        out = g_string_new ("");
79
79
 
80
80
        for (i = 0; i < a->addresses->len; i++) {
81
81
                struct _address *addr = g_ptr_array_index (a->addresses, i);
82
82
                gchar *enc;
83
83
 
84
84
                if (i != 0)
85
 
                        g_string_append(out, ", ");
 
85
                        g_string_append (out, ", ");
86
86
 
87
87
                enc = camel_internet_address_encode_address (&len, addr->name, addr->address);
88
88
                g_string_append (out, enc);
106
106
        if (raw == NULL)
107
107
                return 0;
108
108
 
109
 
        d(printf("unformatting address: %s\n", raw));
 
109
        d (printf ("unformatting address: %s\n", raw));
110
110
 
111
111
        /* we copy, so we can modify as we go */
112
112
        buffer = g_strdup (raw);
148
148
                                name = g_strstrip (name);
149
149
                        addr = g_strstrip (addr);
150
150
                        if (addr[0]) {
151
 
                                d(printf("found address: '%s' <%s>\n", name, addr));
 
151
                                d (printf ("found address: '%s' <%s>\n", name, addr));
152
152
                                camel_internet_address_add ((CamelInternetAddress *) a, name, addr);
153
153
                        }
154
154
                        name = NULL;
172
172
        if (a->addresses->len == 0)
173
173
                return NULL;
174
174
 
175
 
        out = g_string_new("");
 
175
        out = g_string_new ("");
176
176
 
177
177
        for (i = 0; i < a->addresses->len; i++) {
178
178
                struct _address *addr = g_ptr_array_index (a->addresses, i);
179
179
                gchar *enc;
180
180
 
181
181
                if (i != 0)
182
 
                        g_string_append(out, ", ");
 
182
                        g_string_append (out, ", ");
183
183
 
184
184
                enc = camel_internet_address_format_address (addr->name, addr->address);
185
185
                g_string_append (out, enc);
442
442
        gchar *name = camel_header_encode_phrase ((const guchar *) real);
443
443
        gchar *ret = NULL;
444
444
        gint len = 0;
445
 
        GString *out = g_string_new("");
 
445
        GString *out = g_string_new ("");
446
446
 
447
447
        g_assert (addr);
448
448
 
472
472
         * that will probably not handle this case, we will just move
473
473
         * the whole address to its own line. */
474
474
        if (inlen != NULL && (strlen (addr) + len) > CAMEL_FOLD_SIZE) {
475
 
                g_string_append(out, "\n\t");
 
475
                g_string_append (out, "\n\t");
476
476
                len = 1;
477
477
        }
478
478
 
479
479
        len -= out->len;
480
480
 
481
481
        if (name && name[0])
482
 
                g_string_append_printf(out, " <");
 
482
                g_string_append_printf (out, " <");
483
483
        cia_encode_addrspec (out, addr);
484
484
        if (name && name[0])
485
 
                g_string_append_printf(out, ">");
 
485
                g_string_append_printf (out, ">");
486
486
 
487
487
        len += out->len;
488
488
 
527
527
                                        if (c != '\"')
528
528
                                                *o++ = c;
529
529
                                *o++ = '\"';
530
 
                                sprintf(o, " <%s>", addr);
531
 
                                d(printf("encoded '%s' => '%s'\n", name, ret));
 
530
                                sprintf (o, " <%s>", addr);
 
531
                                d (printf ("encoded '%s' => '%s'\n", name, ret));
532
532
                                return ret;
533
533
                        }
534
534
                }
535
 
                ret = g_strdup_printf("%s <%s>", name, addr);
 
535
                ret = g_strdup_printf ("%s <%s>", name, addr);
536
536
        } else
537
537
                ret = g_strdup (addr);
538
538