← Back to branch summary

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

« back to all changes in this revision

Viewing changes to servers/google/libgdata/gdata-service-iface.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
https://launchpad.net/bugs/42199
https://launchpad.net/bugs/229669
https://launchpad.net/bugs/173703
https://launchpad.net/bugs/360344
https://launchpad.net/bugs/508494
* 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:
servers/google/libgdata/gdata-service-iface.c
87
87
GType
88
88
gdata_service_get_type (void)
89
89
{
90
 
        static GType type = 0;
 
90
        static volatile gsize define_type_id__volatile = 0;
91
91
 
92
 
        if (G_UNLIKELY(type == 0))
93
 
        {
 
92
        if (g_once_init_enter (&define_type_id__volatile)) {
94
93
                static const GTypeInfo info =
95
94
                {
96
95
                        sizeof (GDataServiceIface),
103
102
                        0,      /* n_preallocs */
104
103
                        NULL    /* instance_init */
105
104
                };
106
 
                type = g_type_register_static (G_TYPE_INTERFACE,
107
 
                                "GDataService", &info, 0);
108
 
                g_type_interface_add_prerequisite (type, G_TYPE_OBJECT );
 
105
                GType type = g_type_register_static (G_TYPE_INTERFACE, "GDataService", &info, 0);
 
106
 
 
107
                g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
 
108
 
 
109
                g_once_init_leave (&define_type_id__volatile, type);
109
110
        }
110
111
 
111
 
        return type;
 
112
        return define_type_id__volatile;
112
113
}