diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-09-27 13:13:42 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-09-27 21:31:13 +0800 |
| commit | e2b6ff7a6c1e1580c26ee0719b349151e8dad6fd (patch) | |
| tree | d2d2ce8eb509717d412ad3171059e470ff0e7030 /addressbook/importers | |
| parent | c520043a094d81d222aa0c3e23b0035ddb89d0bf (diff) | |
| download | gsoc2013-evolution-e2b6ff7a6c1e1580c26ee0719b349151e8dad6fd.tar.gz gsoc2013-evolution-e2b6ff7a6c1e1580c26ee0719b349151e8dad6fd.tar.zst gsoc2013-evolution-e2b6ff7a6c1e1580c26ee0719b349151e8dad6fd.zip | |
Miscellaneous cleanups from the account-mgmt branch.
Reducing diff noise so I can see important changes easier when comparing
branches. A few API changes, but nothing that affects functionality.
Diffstat (limited to 'addressbook/importers')
| -rw-r--r-- | addressbook/importers/evolution-csv-importer.c | 9 | ||||
| -rw-r--r-- | addressbook/importers/evolution-ldif-importer.c | 2 | ||||
| -rw-r--r-- | addressbook/importers/evolution-vcard-importer.c | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c index f41a806940..20d0209f4b 100644 --- a/addressbook/importers/evolution-csv-importer.c +++ b/addressbook/importers/evolution-csv-importer.c @@ -40,7 +40,7 @@ #include <libebook/e-destination.h> -#include "e-util/e-import.h" +#include <e-util/e-import.h> #include "evolution-addressbook-importers.h" @@ -784,9 +784,12 @@ csv_getwidget (EImport *ei, if (primary == NULL) { primary = e_source_list_peek_source_any (source_list); g_object_ref (primary); - g_datalist_set_data_full(&target->data, "csv-source", primary, g_object_unref); + g_datalist_set_data_full ( + &target->data, "csv-source", primary, + (GDestroyNotify) g_object_unref); } - e_source_selector_set_primary_selection (E_SOURCE_SELECTOR (selector), primary); + e_source_selector_set_primary_selection ( + E_SOURCE_SELECTOR (selector), primary); g_object_unref (source_list); g_signal_connect ( diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c index 8eb0c57192..989bb805f4 100644 --- a/addressbook/importers/evolution-ldif-importer.c +++ b/addressbook/importers/evolution-ldif-importer.c @@ -47,7 +47,7 @@ #include <libebook/e-destination.h> -#include "e-util/e-import.h" +#include <e-util/e-import.h> #include "evolution-addressbook-importers.h" diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c index cf3a429337..be97f25c98 100644 --- a/addressbook/importers/evolution-vcard-importer.c +++ b/addressbook/importers/evolution-vcard-importer.c @@ -42,9 +42,9 @@ #include <util/eab-book-util.h> #include <libebook/e-destination.h> -#include "e-util/e-import.h" -#include "e-util/e-datetime-format.h" -#include "misc/e-web-view-preview.h" +#include <e-util/e-import.h> +#include <e-util/e-datetime-format.h> +#include <misc/e-web-view-preview.h> #include "evolution-addressbook-importers.h" |