← Back to branch summary

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

« back to all changes in this revision

Viewing changes to addressbook/libebook/e-vcard.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:
addressbook/libebook/e-vcard.c
659
659
 
660
660
        buf = make_valid_utf8 (str);
661
661
 
662
 
        d(printf ("BEFORE FOLDING:\n"));
 
662
        d (printf ("BEFORE FOLDING:\n"));
663
663
        d (printf (str));
664
 
        d(printf ("\n\nAFTER FOLDING:\n"));
 
664
        d (printf ("\n\nAFTER FOLDING:\n"));
665
665
        d (printf (buf));
666
666
 
667
667
        p = buf;
935
935
                        count = 1; /* 1 for space needed for folding */
936
936
                }
937
937
 
938
 
                g_string_append_printf (escaped, "=%2.2X", (unsigned char) *p++);
 
938
                g_string_append_printf (escaped, "=%2.2X", (guchar) *p++);
939
939
                count += 3;
940
940
        }
941
941
 
1309
1309
                }
1310
1310
                printf ("    +- values=\n");
1311
1311
                for (v = attr->values, i = 0; v; v = v->next, i++) {
1312
 
                        printf ("        [%d] = `%s'\n", i, (gchar *)v->data);
 
1312
                        printf ("        [%d] = `%s'\n", i, (gchar *) v->data);
1313
1313
                }
1314
1314
        }
1315
1315
}
1668
1668
                /* make sure the decoded list is up to date */
1669
1669
                e_vcard_attribute_get_values_decoded (attr);
1670
1670
 
1671
 
                d(printf ("base64 encoded value: %s\n", b64_data));
1672
 
                d(printf ("original length: %d\n", len));
 
1671
                d (printf ("base64 encoded value: %s\n", b64_data));
 
1672
                d (printf ("original length: %d\n", len));
1673
1673
 
1674
1674
                attr->values = g_list_append (attr->values, b64_data);
1675
1675
                attr->decoded_values = g_list_append (attr->decoded_values, decoded);
1965
1965
                }
1966
1966
 
1967
1967
                if (param->values && param->values->data) {
1968
 
                        if (!g_ascii_strcasecmp ((gchar *)param->values->data, "b") ||
1969
 
                            !g_ascii_strcasecmp ((gchar *)param->values->data, "BASE64"))
 
1968
                        if (!g_ascii_strcasecmp ((gchar *) param->values->data, "b") ||
 
1969
                            !g_ascii_strcasecmp ((gchar *) param->values->data, "BASE64"))
1970
1970
                                attr->encoding = EVC_ENCODING_BASE64;
1971
1971
                        else if (!g_ascii_strcasecmp ((gchar *) param->values->data, EVC_QUOTEDPRINTABLE))
1972
1972
                                attr->encoding = EVC_ENCODING_QP;