← 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-entry.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-entry.c
35
35
 
36
36
#define GDATA_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GDATA_TYPE_ENTRY, GDataEntryPrivate))
37
37
 
 
38
G_DEFINE_TYPE (GDataEntry, gdata_entry, G_TYPE_OBJECT)
 
39
 
38
40
struct _GDataEntryPrivate {
39
41
        GSList *authors;
40
42
        GSList *categories;
172
174
        g_free (address);
173
175
}
174
176
 
175
 
static void gdata_entry_init (GTypeInstance *instance,
176
 
                gpointer      g_class)
 
177
static void gdata_entry_init (GDataEntry *instance)
177
178
{
 
179
        GDataEntry *self = instance;
178
180
        GDataEntryPrivate *priv;
179
 
        GDataEntry *self = (GDataEntry *)instance;
180
181
 
181
182
        /* Private data set by g_type_class_add_private */
182
183
        priv = GDATA_ENTRY_GET_PRIVATE(self);
290
291
        priv = GDATA_ENTRY_GET_PRIVATE(self);
291
292
}
292
293
 
293
 
static void gdata_entry_class_init (gpointer g_class,
294
 
                gpointer g_class_data)
 
294
static void gdata_entry_class_init (GDataEntryClass *klass)
295
295
{
296
 
        GObjectClass *gobject_class = G_OBJECT_CLASS(g_class);
297
 
        GDataEntryClass *klass = GDATA_ENTRY_CLASS(g_class);
 
296
        GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
298
297
 
299
298
        g_type_class_add_private(klass, sizeof (GDataEntryPrivate));
300
299
        gobject_class->set_property = gdata_entry_set_property;
303
302
        gobject_class->finalize = gdata_entry_finalize;
304
303
}
305
304
 
306
 
GType gdata_entry_get_type (void)
307
 
{
308
 
        static GType type = 0;
309
 
        if (type == 0) {
310
 
                static const GTypeInfo info = {
311
 
                        sizeof (GDataEntryClass),
312
 
                        NULL, /* base init */
313
 
                        NULL, /* base finalize */
314
 
                        gdata_entry_class_init, /* class init */
315
 
                        NULL, /* class finalize */
316
 
                        NULL, /* class data */
317
 
                        sizeof (GDataEntry),
318
 
                        0, /* n_preallocs */
319
 
                        gdata_entry_init /* instance init */
320
 
                };
321
 
                type = g_type_register_static(G_TYPE_OBJECT,"GDataEntryType", &info,0);
322
 
        }
323
 
 
324
 
        return type;
325
 
}
326
 
 
327
305
/*** API ***/
328
306
static GDataEntryAuthor *
329
307
xmlnode_to_author (xmlDocPtr doc, xmlNodePtr cur)