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

« back to all changes in this revision

Viewing changes to libedataserver/libedataserver-private.h

  • 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:
28
28
 
29
29
const gchar *_libedataserver_get_extensiondir (void) G_GNUC_CONST;
30
30
const gchar *_libedataserver_get_imagesdir (void) G_GNUC_CONST;
31
 
const gchar *_libedataserver_get_ui_gladedir (void) G_GNUC_CONST;
 
31
const gchar *_libedataserver_get_ui_uidir (void) G_GNUC_CONST;
32
32
 
33
33
#undef E_DATA_SERVER_EXTENSIONDIR
34
34
#define E_DATA_SERVER_EXTENSIONDIR _libedataserver_get_extensiondir ()
36
36
#undef E_DATA_SERVER_IMAGESDIR
37
37
#define E_DATA_SERVER_IMAGESDIR _libedataserver_get_imagesdir ()
38
38
 
39
 
#undef E_DATA_SERVER_UI_GLADEDIR
40
 
#define E_DATA_SERVER_UI_GLADEDIR _libedataserver_get_ui_gladedir ()
 
39
#undef E_DATA_SERVER_UI_UIDIR
 
40
#define E_DATA_SERVER_UI_UIDIR _libedataserver_get_ui_uidir ()
41
41
 
42
42
#endif  /* G_OS_WIN32 */
43
43