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

« back to all changes in this revision

Viewing changes to libedataserverui/e-name-selector-dialog.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:
25
25
#define E_NAME_SELECTOR_DIALOG_H
26
26
 
27
27
#include <gtk/gtk.h>
28
 
#include <glade/glade.h>
29
28
#include <libebook/e-book.h>
30
29
#include <libedataserverui/e-contact-store.h>
31
30
#include <libedataserverui/e-name-selector-model.h>
68
67
        ENameSelectorModel *name_selector_model;
69
68
        GtkTreeModelSort   *contact_sort;
70
69
 
71
 
        GladeXML           *gui;
 
70
        GtkBuilder         *gui;
72
71
        GtkTreeView        *contact_view;
73
72
        GtkLabel           *status_label;
74
73
        GtkBox             *destination_box;