From cf658dcba6ea5c52a8b2e7bb1b39cae37aaa3ca4 Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Thu, 29 Mar 2001 20:55:01 +0000 Subject: Clean up #includes. Replace , and with 2001-03-29 Kjartan Maraas * *.*: Clean up #includes. Replace , and with more finegrained headers where needed. svn path=/trunk/; revision=9026 --- addressbook/backend/ebook/e-book-util.c | 5 ++++- addressbook/backend/ebook/e-book.c | 2 +- addressbook/backend/ebook/e-book.h | 2 +- addressbook/backend/ebook/e-card-cursor.c | 2 +- addressbook/backend/ebook/e-card-cursor.h | 2 +- addressbook/backend/ebook/e-card-simple.c | 2 +- addressbook/backend/ebook/e-card-simple.h | 2 +- addressbook/backend/ebook/e-card.c | 14 +++++++------- addressbook/backend/ebook/e-card.h | 2 +- addressbook/backend/ebook/e-destination.c | 3 ++- addressbook/backend/ebook/e-destination.h | 2 +- addressbook/backend/ebook/evolution-gnomecard-importer.c | 7 ++++--- addressbook/backend/ebook/load-gnomecard-addressbook.c | 13 +++++++++---- addressbook/backend/ebook/load-pine-addressbook.c | 15 ++++++++++----- addressbook/backend/ebook/test-card.c | 4 +++- addressbook/backend/ebook/test-client-list.c | 9 +++++++-- addressbook/backend/ebook/test-client.c | 10 +++++++--- 17 files changed, 61 insertions(+), 35 deletions(-) (limited to 'addressbook/backend/ebook') diff --git a/addressbook/backend/ebook/e-book-util.c b/addressbook/backend/ebook/e-book-util.c index 1c79ea5d71..aa7ead900f 100644 --- a/addressbook/backend/ebook/e-book-util.c +++ b/addressbook/backend/ebook/e-book-util.c @@ -26,7 +26,8 @@ */ #include -#include +#include +#include #include #include #include "e-book-util.h" @@ -155,6 +156,8 @@ simple_query_free (SimpleQueryInfo *sq) book_remove_simple_query (sq->book, sq); #ifdef USE_WORKAROUND + Glist *i; + /* If we are still in the queue, remove ourselves. */ for (i = WORKAROUND_sq_queue; i != NULL; i = g_list_next (i)) { if (i->data == sq) { diff --git a/addressbook/backend/ebook/e-book.c b/addressbook/backend/ebook/e-book.c index c603f94743..aaa46af719 100644 --- a/addressbook/backend/ebook/e-book.c +++ b/addressbook/backend/ebook/e-book.c @@ -1076,7 +1076,7 @@ e_book_get_cursor (EBook *book, guint e_book_get_book_view (EBook *book, - gchar *query, + const gchar *query, EBookBookViewCallback cb, gpointer closure) { diff --git a/addressbook/backend/ebook/e-book.h b/addressbook/backend/ebook/e-book.h index 72efb7250c..ed635dcace 100644 --- a/addressbook/backend/ebook/e-book.h +++ b/addressbook/backend/ebook/e-book.h @@ -118,7 +118,7 @@ guint e_book_get_cursor (EBook *book, gpointer closure); guint e_book_get_book_view (EBook *book, - char *query, + const gchar *query, EBookBookViewCallback cb, gpointer closure); diff --git a/addressbook/backend/ebook/e-card-cursor.c b/addressbook/backend/ebook/e-card-cursor.c index faf402d1e7..cccc493352 100644 --- a/addressbook/backend/ebook/e-card-cursor.c +++ b/addressbook/backend/ebook/e-card-cursor.c @@ -7,7 +7,7 @@ */ #include -#include +#include #include "addressbook.h" #include "e-card-cursor.h" diff --git a/addressbook/backend/ebook/e-card-cursor.h b/addressbook/backend/ebook/e-card-cursor.h index 1b5f0d0e0c..a4dad0ff5b 100644 --- a/addressbook/backend/ebook/e-card-cursor.h +++ b/addressbook/backend/ebook/e-card-cursor.h @@ -10,8 +10,8 @@ #ifndef __E_CARD_CURSOR_H__ #define __E_CARD_CURSOR_H__ +#include #include -#include #include #include diff --git a/addressbook/backend/ebook/e-card-simple.c b/addressbook/backend/ebook/e-card-simple.c index 6c398b6133..6d5619d135 100644 --- a/addressbook/backend/ebook/e-card-simple.c +++ b/addressbook/backend/ebook/e-card-simple.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include "e-card-simple.h" diff --git a/addressbook/backend/ebook/e-card-simple.h b/addressbook/backend/ebook/e-card-simple.h index 2fe96be18e..66d8e87db4 100644 --- a/addressbook/backend/ebook/e-card-simple.h +++ b/addressbook/backend/ebook/e-card-simple.h @@ -13,8 +13,8 @@ #define __E_CARD_SIMPLE_H__ #include -#include #include +#include #include #include #include diff --git a/addressbook/backend/ebook/e-card.c b/addressbook/backend/ebook/e-card.c index 8729652c6d..435d8fef51 100644 --- a/addressbook/backend/ebook/e-card.c +++ b/addressbook/backend/ebook/e-card.c @@ -13,17 +13,17 @@ #include #include #include -#include + +#include +#include +#include #include +#include "e-util/ename/e-name-western.h" +#include "e-util/ename/e-address-western.h" + #include "e-card.h" #include "e-card-pairs.h" -#include -#include - -#include - -#include #define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop))) #define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc (1, 1)) diff --git a/addressbook/backend/ebook/e-card.h b/addressbook/backend/ebook/e-card.h index eba8c07140..5c0865ab50 100644 --- a/addressbook/backend/ebook/e-card.h +++ b/addressbook/backend/ebook/e-card.h @@ -13,7 +13,7 @@ #define __E_CARD_H__ #include -#include +#include #include #include #include diff --git a/addressbook/backend/ebook/e-destination.c b/addressbook/backend/ebook/e-destination.c index c1e0ad8a78..c652564442 100644 --- a/addressbook/backend/ebook/e-destination.c +++ b/addressbook/backend/ebook/e-destination.c @@ -26,7 +26,8 @@ */ #include -#include +#include +#include #include #include #include "e-destination.h" diff --git a/addressbook/backend/ebook/e-destination.h b/addressbook/backend/ebook/e-destination.h index 2014f8e340..618cfdb458 100644 --- a/addressbook/backend/ebook/e-destination.h +++ b/addressbook/backend/ebook/e-destination.h @@ -28,7 +28,7 @@ #ifndef __E_DESTINATION_H__ #define __E_DESTINATION_H__ -#include +#include #include #define E_TYPE_DESTINATION (e_destination_get_type ()) diff --git a/addressbook/backend/ebook/evolution-gnomecard-importer.c b/addressbook/backend/ebook/evolution-gnomecard-importer.c index 42ab35d223..9329ab9a86 100644 --- a/addressbook/backend/ebook/evolution-gnomecard-importer.c +++ b/addressbook/backend/ebook/evolution-gnomecard-importer.c @@ -1,10 +1,11 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ #include -#include -#include -#include #include +#include +#include +#include + #include #include diff --git a/addressbook/backend/ebook/load-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c index 3295854b0a..5d16a26a7c 100644 --- a/addressbook/backend/ebook/load-gnomecard-addressbook.c +++ b/addressbook/backend/ebook/load-gnomecard-addressbook.c @@ -1,11 +1,16 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ #include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include "e-book.h" static CORBA_Environment ev; diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c index 30fda41be4..2c18efb7c8 100644 --- a/addressbook/backend/ebook/load-pine-addressbook.c +++ b/addressbook/backend/ebook/load-pine-addressbook.c @@ -1,12 +1,17 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ #include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include "e-book.h" static CORBA_Environment ev; diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c index a727dae7a3..a2f10e5aca 100644 --- a/addressbook/backend/ebook/test-card.c +++ b/addressbook/backend/ebook/test-card.c @@ -1,4 +1,6 @@ -#include +#include +#include +#include #include "e-card.h" #define TEST_VCARD \ diff --git a/addressbook/backend/ebook/test-client-list.c b/addressbook/backend/ebook/test-client-list.c index 69422ba20e..0de62d701c 100644 --- a/addressbook/backend/ebook/test-client-list.c +++ b/addressbook/backend/ebook/test-client-list.c @@ -1,8 +1,13 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ #include -#include -#include + +#include +#include +#include +#include +#include #include +#include #include "e-book.h" diff --git a/addressbook/backend/ebook/test-client.c b/addressbook/backend/ebook/test-client.c index 25a3cb6dc9..36115d848a 100644 --- a/addressbook/backend/ebook/test-client.c +++ b/addressbook/backend/ebook/test-client.c @@ -1,10 +1,14 @@ /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ #include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include +#include "e-book.h" #define TEST_VCARD \ "BEGIN:VCARD -- cgit v1.2.3