← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/evolution/oneiric-proposed

« back to all changes in this revision

Viewing changes to plugins/bbdb/bbdb.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-08-18 11:10:01 UTC
  • mfrom: (1.1.83 upstream)
  • Revision ID: james.westby@ubuntu.com-20110818111001-559uzyuqsoyj7xjg
Tags: 3.1.5-0ubuntu1
https://launchpad.net/bugs/828693
* New upstream release.
* debian/control: bump e-d-s Build-Depends to 3.1.5.
* debian/patches/03_lpi.patch: refreshed.
* debian/patches/11_remove_upstream_submit_bugreport.patch: refreshed.
* debian/patches/bogofilter_init_903b8e6.patch,
  debian/patches/evo_fbee43e_to_f4505a2.patch,
  debian/patches/spamassassin_init_4fc04af.patch: dropped, included upstream.
* debian/patches/spamd_sbin_path.patch: correct the path to spamd as
  /usr/sbin/spamd, which is the correct path in Ubuntu. (LP: #828693)

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/bbdb/bbdb.c
33
33
#include <libedataserverui/e-client-utils.h>
34
34
 
35
35
#include <e-util/e-config.h>
36
 
#include <mail/em-config.h>
 
36
#include <addressbook/gui/widgets/eab-config.h>
37
37
#include <mail/em-event.h>
38
38
#include <composer/e-msg-composer.h>
39
39
 
48
48
 
49
49
/* For internal use */
50
50
struct bbdb_stuff {
51
 
        EMConfigTargetPrefs *target;
 
51
        EABConfigTargetPrefs *target;
52
52
        ESourceList *source_list;
53
53
 
54
54
        GtkWidget *combo_box;
648
648
bbdb_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
649
649
{
650
650
        struct bbdb_stuff *stuff;
651
 
        EMConfigTargetPrefs *target = (EMConfigTargetPrefs *) hook_data->config->target;
 
651
        EABConfigTargetPrefs *target = (EABConfigTargetPrefs *) hook_data->config->target;
652
652
        GtkWidget *page;
653
653
        GtkWidget *tab_label;
654
654
        GtkWidget *frame;