aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-07-13 11:33:07 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-07-14 23:26:22 +0800
commit374bd42f69aca2e132fd854c9619f3d7491f1f96 (patch)
treebf50b5daa8664d4d793b82f6b6ec59d0686553e0 /addressbook
parent573eb0880a80e04737cb4497931ca6588272686e (diff)
downloadgsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar
gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.gz
gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.bz2
gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.lz
gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.xz
gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.tar.zst
gsoc2013-evolution-374bd42f69aca2e132fd854c9619f3d7491f1f96.zip
Fix excessive whitespace.
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/conduit/address-conduit.c1
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor-fullname.h2
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c8
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.h1
-rw-r--r--addressbook/gui/contact-editor/e-contact-quick-add.c5
-rw-r--r--addressbook/gui/merging/eab-contact-compare.c5
-rw-r--r--addressbook/gui/merging/eab-contact-compare.h2
-rw-r--r--addressbook/gui/merging/eab-contact-merging.c1
-rw-r--r--addressbook/gui/widgets/e-addressbook-model.h1
-rw-r--r--addressbook/gui/widgets/e-addressbook-reflow-adapter.c2
-rw-r--r--addressbook/gui/widgets/e-addressbook-reflow-adapter.h2
-rw-r--r--addressbook/gui/widgets/e-addressbook-table-adapter.c1
-rw-r--r--addressbook/gui/widgets/e-addressbook-table-adapter.h2
-rw-r--r--addressbook/gui/widgets/e-minicard-label.c1
-rw-r--r--addressbook/gui/widgets/e-minicard-label.h3
-rw-r--r--addressbook/gui/widgets/e-minicard-view-widget.c1
-rw-r--r--addressbook/gui/widgets/e-minicard-view-widget.h2
-rw-r--r--addressbook/gui/widgets/e-minicard-view.c1
-rw-r--r--addressbook/gui/widgets/e-minicard-view.h2
-rw-r--r--addressbook/gui/widgets/e-minicard.c5
-rw-r--r--addressbook/gui/widgets/e-minicard.h2
-rw-r--r--addressbook/gui/widgets/ea-addressbook-view.h2
-rw-r--r--addressbook/gui/widgets/ea-minicard-view.c1
-rw-r--r--addressbook/gui/widgets/ea-minicard-view.h3
-rw-r--r--addressbook/gui/widgets/ea-minicard.h2
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c3
-rw-r--r--addressbook/gui/widgets/eab-contact-display.h1
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c1
-rw-r--r--addressbook/gui/widgets/eab-gui-util.h1
-rw-r--r--addressbook/gui/widgets/gal-view-factory-minicard.c1
-rw-r--r--addressbook/importers/evolution-csv-importer.c2
-rw-r--r--addressbook/importers/evolution-ldif-importer.c1
-rw-r--r--addressbook/importers/evolution-vcard-importer.c1
-rw-r--r--addressbook/tools/evolution-addressbook-export-list-cards.c13
-rw-r--r--addressbook/tools/evolution-addressbook-export.h1
-rw-r--r--addressbook/util/addressbook.c4
-rw-r--r--addressbook/util/eab-book-util.c1
37 files changed, 0 insertions, 88 deletions
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 4bba2a3ddc..d7b97233e3 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -133,7 +133,6 @@ struct _EAddrLocalRecord {
struct Address *addr;
};
-
static void
addrconduit_destroy_record (EAddrLocalRecord *local)
{
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
index 6ccd89ed9e..7741b208fb 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
@@ -44,7 +44,6 @@ G_BEGIN_DECLS
#define E_IS_CONTACT_EDITOR_FULLNAME(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME))
#define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME))
-
typedef struct _EContactEditorFullname EContactEditorFullname;
typedef struct _EContactEditorFullnameClass EContactEditorFullnameClass;
@@ -65,7 +64,6 @@ struct _EContactEditorFullnameClass
GtkDialogClass parent_class;
};
-
GtkWidget *e_contact_editor_fullname_new(const EContactName *name);
GType e_contact_editor_fullname_get_type (void);
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index d4768ae675..1d1d16c55b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -74,7 +74,6 @@ enum {
NUM_IM_COLUMNS
};
-
static void e_contact_editor_init (EContactEditor *editor);
static void e_contact_editor_class_init (EContactEditorClass *klass);
static void e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
@@ -2726,7 +2725,6 @@ full_name_clicked (GtkWidget *button, EContactEditor *editor)
editor->fullname_dialog = GTK_WIDGET (dialog);
}
-
static void
categories_response (GtkDialog *dialog, gint response, EContactEditor *editor)
{
@@ -3056,7 +3054,6 @@ save_contact (EContactEditor *ce, gboolean should_close)
if (!ce->target_book)
return;
-
if (ce->target_editable && !e_book_is_writable (ce->source_book)) {
if (e_error_run (GTK_WINDOW (ce->app), "addressbook:prompt-move", NULL) == GTK_RESPONSE_NO)
return;
@@ -3133,7 +3130,6 @@ static const EContactField non_string_fields [] = {
E_CONTACT_BIRTH_DATE,
E_CONTACT_ANNIVERSARY
-
};
static gboolean
@@ -3148,7 +3144,6 @@ is_non_string_field (EContactField id)
}
-
/* insert checks here (date format, for instance, etc.) */
static gboolean
e_contact_editor_is_valid (EABEditor *editor)
@@ -3201,11 +3196,9 @@ e_contact_editor_is_valid (EABEditor *editor)
break;
}
-
}
}
-
if (validation_error) {
g_string_append (errmsg, ".");
e_error_run (GTK_WINDOW (ce->app), "addressbook:generic-error",
@@ -3546,7 +3539,6 @@ required_fields_cb (EBook *book, EBookStatus status,
"required_fields", fields,
NULL);
-
}
EABEditor *
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index 6228dc3499..9a83831eff 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -49,7 +49,6 @@ G_BEGIN_DECLS
#define E_IS_CONTACT_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR))
#define E_IS_CONTACT_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR))
-
typedef struct _EContactEditor EContactEditor;
typedef struct _EContactEditorClass EContactEditorClass;
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index df3eb6ec58..bb40e9a79d 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -151,7 +151,6 @@ quick_add_merge_contact (QuickAdd *qa)
addressbook_load (qa->book, merge_cb, qa);
}
-
/*
* Raise a contact editor with all fields editable, and hook up all signals accordingly.
*/
@@ -511,7 +510,6 @@ e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, g
in_quote = !in_quote;
}
-
if (last_at == NULL) {
/* No at sign, so we treat it all as the name */
name = g_strdup (text);
@@ -544,8 +542,6 @@ e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, g
if (name == NULL && email == NULL)
name = g_strdup (text);
-
-
/* Clean up email, remove bracketing <>s */
if (email && *email) {
gboolean changed = FALSE;
@@ -562,7 +558,6 @@ e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, g
g_strstrip (email);
}
-
e_contact_quick_add (name, email, cb, closure);
g_free (name);
g_free (email);
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index bdf385f0ba..010b0dcdba 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -39,7 +39,6 @@ combine_comparisons (EABContactMatchType prev,
return (EABContactMatchType) MAX ((gint) prev, (gint) new_info);
}
-
/*** Name comparisons ***/
/* This *so* doesn't belong here... at least not implemented in a
@@ -352,7 +351,6 @@ eab_contact_compare_name (EContact *contact1, EContact *contact2)
return EAB_CONTACT_MATCH_NONE;
}
-
/*** Nickname Comparisons ***/
EABContactMatchType
@@ -364,8 +362,6 @@ eab_contact_compare_nickname (EContact *contact1, EContact *contact2)
return EAB_CONTACT_MATCH_NOT_APPLICABLE;
}
-
-
/*** E-mail Comparisons ***/
static gboolean
@@ -692,7 +688,6 @@ use_common_book_cb (EBook *book, gpointer closure)
g_list_free (contact_email);
}
-
/* Build up our full query from the parts. */
query_parts[p] = NULL;
qj = g_strjoinv (" ", query_parts);
diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h
index d08461940b..4fc8ed1569 100644
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ b/addressbook/gui/merging/eab-contact-compare.h
@@ -66,7 +66,5 @@ EABContactMatchType eab_contact_compare (EContact *contact1, EContact
void eab_contact_locate_match (EContact *contact, EABContactMatchQueryCallback cb, gpointer closure);
void eab_contact_locate_match_full (EBook *book, EContact *contact, GList *avoid, EABContactMatchQueryCallback cb, gpointer closure);
-
-
#endif /* __E_CONTACT_COMPARE_H__ */
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 1be9758627..78f179c176 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -64,7 +64,6 @@ static void match_query_callback (EContact *contact, EContact *match, EABContact
static GList *merging_queue = NULL;
static gint running_merge_requests = 0;
-
static void
add_lookup (EContactMergingLookup *lookup)
{
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index 87f1ac5175..d17a8f38a7 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -55,7 +55,6 @@ struct _EAddressbookModel {
EAddressbookModelPrivate *priv;
};
-
struct _EAddressbookModelClass {
GObjectClass parent_class;
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index dbcc1c1ed2..e562d9989f 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -29,7 +29,6 @@
#include <misc/e-gui-utils.h>
#include "addressbook/printing/e-contact-print.h"
-
struct _EAddressbookReflowAdapterPrivate {
EAddressbookModel *model;
@@ -97,7 +96,6 @@ unlink_model(EAddressbookReflowAdapter *adapter)
priv->model = NULL;
}
-
static gint
text_height (PangoLayout *layout, const gchar *text)
{
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
index fc08dcd43c..bc428ba30c 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
@@ -41,7 +41,6 @@ struct _EAddressbookReflowAdapter {
EAddressbookReflowAdapterPrivate *priv;
};
-
struct _EAddressbookReflowAdapterClass {
EReflowModelClass parent_class;
@@ -54,7 +53,6 @@ struct _EAddressbookReflowAdapterClass {
EContact *contact);
};
-
GType e_addressbook_reflow_adapter_get_type (void);
void e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter,
EAddressbookModel *model);
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index fabf87f24f..396c382d32 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -302,7 +302,6 @@ eab_table_adapter_init (GObject *object)
priv->model_changed_id = 0;
}
-
static void
create_contact (EAddressbookModel *model,
gint index, gint count,
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h
index d892894570..71999bd4d1 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h
@@ -41,12 +41,10 @@ struct _EAddressbookTableAdapter {
EAddressbookTableAdapterPrivate *priv;
};
-
struct _EAddressbookTableAdapterClass {
ETableModelClass parent_class;
};
-
GType eab_table_adapter_get_type (void);
void eab_table_adapter_construct (EAddressbookTableAdapter *adapter,
EAddressbookModel *model);
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 52110bb169..414b760e1e 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -471,7 +471,6 @@ e_minicard_label_reflow(GnomeCanvasItem *item, gint flags)
e_minicard_label->height = text_height;
-
g_object_get(e_minicard_label->field,
"text_height", &text_height,
NULL);
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
index df68210473..6031b803f3 100644
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ b/addressbook/gui/widgets/e-minicard-label.h
@@ -46,7 +46,6 @@ G_BEGIN_DECLS
#define E_IS_MINICARD_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_LABEL))
#define E_IS_MINICARD_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_LABEL))
-
typedef struct _EMinicardLabel EMinicardLabel;
typedef struct _EMinicardLabelClass EMinicardLabelClass;
@@ -73,12 +72,10 @@ struct _EMinicardLabelClass
void (* style_set) (EMinicardLabel *label, GtkStyle *previous_style);
};
-
GType e_minicard_label_get_type (void);
GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent);
void e_minicard_label_construct (GnomeCanvasItem *item);
G_END_DECLS
-
#endif /* __E_MINICARD_LABEL_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index df4a4c894b..5030793938 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -371,7 +371,6 @@ e_minicard_view_widget_style_set (GtkWidget *widget, GtkStyle *previous_style)
GTK_WIDGET_CLASS(parent_class)->style_set (widget, previous_style);
}
-
static void
e_minicard_view_widget_realize (GtkWidget *widget)
{
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index b9dcaecbf1..bf9fe8dd4e 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -35,7 +35,6 @@ G_BEGIN_DECLS
#define E_IS_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
-
typedef struct _EMinicardViewWidget EMinicardViewWidget;
typedef struct _EMinicardViewWidgetClass EMinicardViewWidgetClass;
@@ -65,7 +64,6 @@ struct _EMinicardViewWidgetClass
guint (*right_click) (EMinicardViewWidget *emvw);
};
-
GType e_minicard_view_widget_get_type (void);
GtkWidget *e_minicard_view_widget_new (EAddressbookReflowAdapter *adapter);
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 6ee55f8b9f..d849d9fe47 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -55,7 +55,6 @@ enum {
PROP_EDITABLE
};
-
enum {
CREATE_CONTACT,
CREATE_CONTACT_LIST,
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index db8815e3a2..babfddd0c3 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -58,7 +58,6 @@ G_BEGIN_DECLS
#define E_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW))
#define E_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW))
-
typedef struct _EMinicardView EMinicardView;
typedef struct _EMinicardViewClass EMinicardViewClass;
@@ -94,7 +93,6 @@ GList *e_minicard_view_get_card_list (EMinicardView *view);
void e_minicard_view_create_contact (EMinicardView *view);
void e_minicard_view_create_contact_list (EMinicardView *view);
-
G_END_DECLS
#endif /* __E_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index a8b6554888..b47acd0938 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -300,7 +300,6 @@ set_has_cursor (EMinicard *minicard, gboolean has_cursor)
minicard->has_cursor = has_cursor;
}
-
static void
e_minicard_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
@@ -436,8 +435,6 @@ e_minicard_dispose (GObject *object)
(* G_OBJECT_CLASS (parent_class)->dispose) (object);
}
-
-
static void
e_minicard_finalize (GObject *object)
{
@@ -768,7 +765,6 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
"width", e_minicard->width - 4.0,
NULL );
-
#ifdef notyet
g_object_set(E_MINICARD_LABEL(new_item)->field,
"allow_newlines", e_card_simple_get_allow_newlines (e_minicard->contact, field),
@@ -788,7 +784,6 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
g_free(string);
}
-
static const gchar *
get_email_location (EVCardAttribute *attr)
{
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 82cd2c6f8b..4135090763 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -46,7 +46,6 @@ G_BEGIN_DECLS
#define E_IS_MINICARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD))
#define E_IS_MINICARD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD))
-
typedef struct _EMinicard EMinicard;
typedef struct _EMinicardClass EMinicardClass;
typedef enum _EMinicardFocusType EMinicardFocusType;
@@ -124,5 +123,4 @@ void e_minicard_activate_editor (EMinicard *minicard);
G_END_DECLS
-
#endif /* __E_MINICARD_H__ */
diff --git a/addressbook/gui/widgets/ea-addressbook-view.h b/addressbook/gui/widgets/ea-addressbook-view.h
index 4607746337..6179b6758e 100644
--- a/addressbook/gui/widgets/ea-addressbook-view.h
+++ b/addressbook/gui/widgets/ea-addressbook-view.h
@@ -42,7 +42,6 @@ struct _EaABView
GtkAccessible parent;
};
-
struct _EaABViewClass
{
GtkAccessibleClass parent_class;
@@ -53,5 +52,4 @@ AtkObject* ea_ab_view_new(GObject *obj);
G_END_DECLS
-
#endif /* __EA_ADDRESSBOOK_VIEW_H__ */
diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index b35f64ae5e..07d76c3a77 100644
--- a/addressbook/gui/widgets/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
@@ -34,7 +34,6 @@ static const gchar * action_name[] = {
N_("New Contact List")
};
-
static G_CONST_RETURN gchar * ea_minicard_view_get_name (AtkObject *accessible);
static G_CONST_RETURN gchar * ea_minicard_view_get_description (AtkObject *accessible);
diff --git a/addressbook/gui/widgets/ea-minicard-view.h b/addressbook/gui/widgets/ea-minicard-view.h
index c564dac8c8..cc8eaecae7 100644
--- a/addressbook/gui/widgets/ea-minicard-view.h
+++ b/addressbook/gui/widgets/ea-minicard-view.h
@@ -34,7 +34,6 @@ G_BEGIN_DECLS
#define EA_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_MINICARD_VIEW))
#define EA_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EA_TYPE_MINICARD_VIEW))
-
typedef struct _EaMinicardView EaMinicardView;
typedef struct _EaMinicardViewClass EaMinicardViewClass;
@@ -43,7 +42,6 @@ struct _EaMinicardView
AtkGObjectAccessible parent;
};
-
struct _EaMinicardViewClass
{
AtkGObjectAccessibleClass parent_class;
@@ -55,5 +53,4 @@ AtkObject* ea_minicard_view_new(GObject *obj);
G_END_DECLS
-
#endif /* __EA_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/ea-minicard.h b/addressbook/gui/widgets/ea-minicard.h
index 879463b629..8b49ab6284 100644
--- a/addressbook/gui/widgets/ea-minicard.h
+++ b/addressbook/gui/widgets/ea-minicard.h
@@ -43,7 +43,6 @@ struct _EaMinicard
AtkGObjectAccessible parent;
};
-
struct _EaMinicardClass
{
AtkGObjectAccessibleClass parent_class;
@@ -54,5 +53,4 @@ AtkObject* ea_minicard_new(GObject *obj);
G_END_DECLS
-
#endif /* __EA_MINICARD_H__ */
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index a75c06daff..d47b3e1866 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -373,7 +373,6 @@ accum_address (GString *gstr, EContact *contact, const gchar *html_label, EConta
else
g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">", html_label, _("map"));
-
if (adr->po && *adr->po) g_string_append_printf (gstr, "%s<br>", adr->po);
if (adr->ext && *adr->ext) g_string_append_printf (gstr, "%s<br>", adr->ext);
if (adr->street && *adr->street) g_string_append_printf (gstr, "%s<br>", adr->street);
@@ -413,7 +412,6 @@ accum_name_value (GString *gstr, const gchar *label, const gchar *str, const gch
g_free (value);
}
-
static void
accum_attribute (GString *gstr, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags)
{
@@ -699,7 +697,6 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
g_free (html);
}
-
if (e_contact_get (contact, E_CONTACT_IS_LIST))
render_contact_list (html_stream, contact);
else
diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h
index a671b378fc..5a6902fc20 100644
--- a/addressbook/gui/widgets/eab-contact-display.h
+++ b/addressbook/gui/widgets/eab-contact-display.h
@@ -81,7 +81,6 @@ EABContactDisplayMode
void eab_contact_display_set_mode (EABContactDisplay *display,
EABContactDisplayMode mode);
-
G_END_DECLS
#endif /* EAB_CONTACT_DISPLAY_H */
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 58dc60083d..e482e3aad2 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -233,7 +233,6 @@ save_it(GtkWidget *widget, SaveAsInfo *info)
gchar *uri;
gint response = 0;
-
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (info->filesel));
uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (info->filesel));
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
index 916aa7d555..7422eabb65 100644
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ b/addressbook/gui/widgets/eab-gui-util.h
@@ -53,7 +53,6 @@ void eab_contact_list_save (gchar *title,
GtkWidget *eab_create_image_chooser_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
-
ESource *eab_select_source (const gchar *title, const gchar *message,
const gchar *select_uid, GtkWindow *parent);
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
index 2e9accaeac..ee61207855 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.c
@@ -94,4 +94,3 @@ gal_view_factory_minicard_construct (GalViewFactoryMinicard *factory)
return GAL_VIEW_FACTORY(factory);
}
-
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 9cce21d548..6f88bb9cbd 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -221,7 +221,6 @@ static import_fields csv_fields_mozilla[] = {
{"Custom 4", NOMAP},
{"Notes", NOMAP},
-
};
static import_fields csv_fields_evolution[] = {
@@ -829,7 +828,6 @@ csv_cancel(EImport *ei, EImportTarget *target, EImportImporter *im) {
gci->state = 1;
}
-
static EImportImporter csv_outlook_importer = {
E_IMPORT_TARGET_URI,
0,
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 8aaad1ba33..2c8b24cac5 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -71,7 +71,6 @@ typedef struct {
static void ldif_import_done(LDIFImporter *gci);
-
static struct {
const gchar *ldif_attribute;
EContactField contact_field;
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index ff6b205afa..b3b965ffa0 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -273,7 +273,6 @@ fix_utf16_endianness (gunichar2 *utf16)
{
gunichar2 *it;
-
if ((utf16 == NULL) || (*utf16 == '\0')) {
return;
}
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 556931462a..ea3eb7a40e 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -246,7 +246,6 @@ gint output_n_cards_file (FILE * outputfile, GList *contacts, gint size, gint be
static void fork_to_background (void);
void set_pre_defined_field (GSList ** pre_defined_fields);
-
/* function declarations*/
gint
e_contact_csv_get_contact_field (EContactFieldCSV csv_field)
@@ -279,7 +278,6 @@ e_contact_csv_get_name (EContactFieldCSV csv_field)
return quoted_name;
}
-
gchar *
e_contact_csv_get (EContact * contact, EContactFieldCSV csv_field)
{
@@ -398,7 +396,6 @@ e_contact_csv_get (EContact * contact, EContactFieldCSV csv_field)
return quoted_field_value;
}
-
gchar *
e_contact_csv_get_header_line (GSList * csv_all_fields)
{
@@ -429,7 +426,6 @@ e_contact_csv_get_header_line (GSList * csv_all_fields)
}
-
gchar *
e_contact_to_csv (EContact * contact, GSList * csv_all_fields)
{
@@ -459,7 +455,6 @@ e_contact_to_csv (EContact * contact, GSList * csv_all_fields)
}
-
gchar *
e_contact_get_csv (EContact * contact, GSList * csv_all_fields)
{
@@ -469,7 +464,6 @@ e_contact_get_csv (EContact * contact, GSList * csv_all_fields)
return aline;
}
-
gchar *
check_null_pointer (gchar * orig)
{
@@ -620,9 +614,6 @@ fork_to_background (void)
#endif
}
-
-
-
static void
action_list_cards (GList *contacts, ActionContext * p_actctx)
{
@@ -642,7 +633,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx)
exit (-1);
}
-
if (p_actctx->action_list_cards.async_mode == FALSE) { /* normal mode */
if (p_actctx->action_list_cards.output_file == NULL) {
@@ -667,7 +657,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx)
}
}
-
/*async mode */
else {
@@ -690,7 +679,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx)
exit (-1);
}
-
if (p_actctx->action_list_cards.IsVCard == TRUE)
format = CARD_FORMAT_VCARD;
else
@@ -706,7 +694,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx)
IsFirstOne = FALSE;
}
-
}
while (series_no * size < length);
g_free (file_series_name);
diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h
index 1d150b3f2a..804bd50780 100644
--- a/addressbook/tools/evolution-addressbook-export.h
+++ b/addressbook/tools/evolution-addressbook-export.h
@@ -64,7 +64,6 @@ union _ActionContext
typedef union _ActionContext ActionContext;
-
/* action_list_folders */
guint action_list_folders_init (ActionContext * p_actctx);
diff --git a/addressbook/util/addressbook.c b/addressbook/util/addressbook.c
index 45790e15c0..7caa545059 100644
--- a/addressbook/util/addressbook.c
+++ b/addressbook/util/addressbook.c
@@ -241,8 +241,6 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc
g_free (uri);
}
-
-
static void
auth_required_cb (EBook *book, gpointer data)
{
@@ -253,8 +251,6 @@ auth_required_cb (EBook *book, gpointer data)
addressbook_authenticate (book, FALSE, load_source_data->source,
load_source_auth_cb, load_source_data);
-
-
}
static void
load_source_cb (EBook *book, EBookStatus status, gpointer closure)
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index 599486cfda..54e95e4950 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -187,7 +187,6 @@ eab_strstrcase (const gchar *haystack, const gchar *needle)
return NULL;
}
-
GList*
eab_contact_list_from_string (const gchar *str)
{