~dobey/ubuntu/precise/ubuntuone-client-gnome/release-2-99-2

« back to all changes in this revision

Viewing changes to nautilus/contacts-view.h

  • Committer: Sebastien Bacher
  • Date: 2011-09-27 18:58:57 UTC
  • mfrom: (4.1.1 ubuntuone-client-gnome)
  • Revision ID: seb128@ubuntu.com-20110927185857-ol7fo1na0eah2lra
Tags: 2.0.0-0ubuntu1
releasing version 2.0.0-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
#ifndef __CONTACTS_VIEW_H__
23
23
#define __CONTACTS_VIEW_H__
24
24
 
25
 
#include <gconf/gconf-client.h>
26
25
#include <gtk/gtk.h>
27
26
#include <libedataserver/e-source-list.h>
28
27
#include <libebook/e-book.h>
 
28
#ifdef HAVE_NAUTILUS_30
 
29
#include <gio/gio.h>
 
30
#include <libedataserver/e-client.h>
 
31
#else
 
32
#include <gconf/gconf-client.h>
 
33
#endif
29
34
 
30
35
#define TYPE_CONTACTS_VIEW                (contacts_view_get_type ())
31
36
#define CONTACTS_VIEW(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CONTACTS_VIEW, ContactsView))
37
42
typedef struct {
38
43
        GtkScrolledWindow parent;
39
44
 
 
45
#ifdef HAVE_NAUTILUS_30
 
46
        GSettings *settings;
 
47
#else
40
48
        GConfClient *config_client;
 
49
#endif
41
50
 
42
51
        /* Data from addressbooks */
43
52
        ESourceList *source_list;