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

« back to all changes in this revision

Viewing changes to camel/camel-charset-map.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:
140
140
        iconv_t cd;
141
141
 
142
142
        /* dont count the terminator */
143
 
        bytes = ((sizeof (tables) / sizeof (tables[0])) + 7 - 1) / 8;
 
143
        bytes = (G_N_ELEMENTS (tables) + 7 - 1) / 8;
144
144
        g_assert (bytes <= 4);
145
145
 
146
146
        for (i = 0; i < 128; i++)
442
442
        return isocharset;
443
443
}
444
444
 
445
 
#endif /* !BUILD_MAP */
 
445
#endif /* BUILD_MAP */