From 0274669179600ac77475eed9870d2eab52c2cf14 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Jul 2009 23:33:07 -0400 Subject: Fix excessive whitespace. --- addressbook/gui/widgets/e-addressbook-model.c | 2 -- addressbook/gui/widgets/e-addressbook-model.h | 2 -- addressbook/gui/widgets/e-addressbook-reflow-adapter.c | 2 -- addressbook/gui/widgets/e-addressbook-reflow-adapter.h | 2 -- addressbook/gui/widgets/e-addressbook-table-adapter.c | 1 - addressbook/gui/widgets/e-addressbook-table-adapter.h | 2 -- addressbook/gui/widgets/e-addressbook-view.c | 3 --- addressbook/gui/widgets/e-addressbook-view.h | 1 - addressbook/gui/widgets/e-minicard-label.c | 1 - addressbook/gui/widgets/e-minicard-label.h | 3 --- addressbook/gui/widgets/e-minicard-view-widget.c | 1 - addressbook/gui/widgets/e-minicard-view-widget.h | 2 -- addressbook/gui/widgets/e-minicard-view.c | 1 - addressbook/gui/widgets/e-minicard-view.h | 2 -- addressbook/gui/widgets/e-minicard.c | 5 ----- addressbook/gui/widgets/e-minicard.h | 2 -- addressbook/gui/widgets/eab-contact-display.c | 5 ----- addressbook/gui/widgets/eab-gui-util.c | 2 -- addressbook/gui/widgets/eab-gui-util.h | 1 - addressbook/gui/widgets/eab-popup-control.c | 2 -- addressbook/gui/widgets/eab-popup.c | 4 ---- addressbook/gui/widgets/eab-popup.h | 1 - addressbook/gui/widgets/gal-view-factory-minicard.c | 1 - 23 files changed, 48 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c index 7389cdc8c6..965beb7e27 100644 --- a/addressbook/gui/widgets/e-addressbook-model.c +++ b/addressbook/gui/widgets/e-addressbook-model.c @@ -42,7 +42,6 @@ static GObjectClass *parent_class; static void eab_model_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void eab_model_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); - enum { PROP_0, PROP_BOOK, @@ -549,7 +548,6 @@ get_view_idle (EABModel *model) return FALSE; } - EContact * eab_model_get_contact(EABModel *model, gint row) diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h index f8b448a6be..1383da4b19 100644 --- a/addressbook/gui/widgets/e-addressbook-model.h +++ b/addressbook/gui/widgets/e-addressbook-model.h @@ -59,7 +59,6 @@ struct _EABModel { guint first_get_view : 1; }; - struct _EABModelClass { GObjectClass parent_class; @@ -79,7 +78,6 @@ struct _EABModelClass { void (*backend_died) (EABModel *model); }; - GType eab_model_get_type (void); EABModel *eab_model_new (void); diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c index 56f64e158b..4a85b69fa4 100644 --- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c +++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c @@ -30,7 +30,6 @@ #include #include "addressbook/printing/e-contact-print.h" - struct _EAddressbookReflowAdapterPrivate { EABModel *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 14803e945c..0f8eb4102c 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; @@ -51,7 +50,6 @@ struct _EAddressbookReflowAdapterClass { gint (* drag_begin) (EAddressbookReflowAdapter *adapter, GdkEvent *event); }; - GType e_addressbook_reflow_adapter_get_type (void); void e_addressbook_reflow_adapter_construct (EAddressbookReflowAdapter *adapter, EABModel *model); diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c index f285d76493..a081ebb34d 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 (EABModel *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 edfb1adf00..27bfe0e3f4 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, EABModel *model); diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 53cd6aadec..7805cb19f8 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -907,7 +907,6 @@ open_contact (EPopup *ep, EPopupItem *pitem, gpointer data) eab_view_view (contact_and_book->view); } - static void new_card (EPopup *ep, EPopupItem *pitem, gpointer data) { @@ -1226,7 +1225,6 @@ contacts_removed (EABModel *model, gpointer data, EABView *eav) for (i = 0; i < count; i ++) { - if (eav->displayed_contact == g_array_index (indices, gint, i)) { /* if the contact that's presently displayed is changed, clear the display */ @@ -2105,7 +2103,6 @@ eab_view_move_to_folder (EABView *view, gboolean all) view_transfer_contacts (view, TRUE, all); } - static gboolean eab_view_selection_nonempty (EABView *view) { diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h index d8e0b2b5e1..03bdcb5a1a 100644 --- a/addressbook/gui/widgets/e-addressbook-view.h +++ b/addressbook/gui/widgets/e-addressbook-view.h @@ -56,7 +56,6 @@ typedef enum { EAB_VIEW_TABLE } EABViewType; - typedef struct _EABView EABView; typedef struct _EABViewClass EABViewClass; 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 a48e45ca52..7a95d5ecb5 100644 --- a/addressbook/gui/widgets/e-minicard-view-widget.c +++ b/addressbook/gui/widgets/e-minicard-view-widget.c @@ -339,7 +339,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 37bef22900..2b01dce65e 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; @@ -63,7 +62,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 9461dca3ae..cf0e511aeb 100644 --- a/addressbook/gui/widgets/e-minicard-view.c +++ b/addressbook/gui/widgets/e-minicard-view.c @@ -54,7 +54,6 @@ enum { PROP_EDITABLE }; - enum { RIGHT_CLICK, LAST_SIGNAL diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h index a548c9bf11..82b8cbb63a 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; @@ -92,7 +91,6 @@ void e_minicard_view_jump_to_letter (EMinicardView *view, gunichar letter); GList *e_minicard_view_get_card_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 1a021bea04..41c6ac6809 100644 --- a/addressbook/gui/widgets/e-minicard.c +++ b/addressbook/gui/widgets/e-minicard.c @@ -292,7 +292,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) { @@ -428,8 +427,6 @@ e_minicard_dispose (GObject *object) (* G_OBJECT_CLASS (parent_class)->dispose) (object); } - - static void e_minicard_finalize (GObject *object) { @@ -796,7 +793,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), @@ -816,7 +812,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 64fa90bbac..033e981636 100644 --- a/addressbook/gui/widgets/e-minicard.h +++ b/addressbook/gui/widgets/e-minicard.h @@ -47,7 +47,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; @@ -126,5 +125,4 @@ gboolean e_minicard_activate_editor (EMinicard *minicard); G_END_DECLS - #endif /* __E_MINICARD_H__ */ diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c index 40e75523cc..c7d80b4d51 100644 --- a/addressbook/gui/widgets/eab-contact-display.c +++ b/addressbook/gui/widgets/eab-contact-display.c @@ -172,7 +172,6 @@ static EPopupItem eab_uri_popups[] = { { E_POPUP_ITEM, (gchar *) "20.copy", (gchar *) N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, (gchar *) "edit-copy", EAB_POPUP_URI_MAILTO}, }; - static void eab_uri_popup_free(EPopup *ep, GSList *list, gpointer data) { @@ -380,7 +379,6 @@ accum_address (GString *gstr, EContact *contact, const gchar *html_label, EConta else g_string_append_printf (gstr, "%s:
%s", html_label, _("map")); - if (adr->po && *adr->po) g_string_append_printf (gstr, "%s
", adr->po); if (adr->ext && *adr->ext) g_string_append_printf (gstr, "%s
", adr->ext); if (adr->street && *adr->street) g_string_append_printf (gstr, "%s
", adr->street); @@ -420,7 +418,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) { @@ -712,7 +709,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 @@ -929,7 +925,6 @@ eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *disp gchar *uri; gboolean res = FALSE; - if (event->button.button!= 3 ) return FALSE; diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 77481ad2c8..87601d7271 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -334,7 +334,6 @@ eab_show_multiple_contacts (EBook *book, } } - static gint file_exists(GtkWindow *window, const gchar *filename) { @@ -373,7 +372,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 f29f2292f8..cc7b127aaf 100644 --- a/addressbook/gui/widgets/eab-gui-util.h +++ b/addressbook/gui/widgets/eab-gui-util.h @@ -77,7 +77,6 @@ void eab_send_contact_list (GList *contacts, 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/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index 78b99cf6a4..28aa819e73 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -43,7 +43,6 @@ static GtkObjectClass *parent_class; static void eab_popup_control_dispose (GObject *); static void eab_popup_control_query (EABPopupControl *); - static void eab_popup_control_class_init (EABPopupControlClass *klass) { @@ -297,7 +296,6 @@ eab_popup_control_construct (EABPopupControl *pop) pop->contact_display = eab_contact_display_new (); gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->contact_display, TRUE, TRUE, 0); - /* Final assembly */ gtk_container_add (GTK_CONTAINER (pop), pop->main_vbox); diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c index 2957c483a6..30ab08f837 100644 --- a/addressbook/gui/widgets/eab-popup.c +++ b/addressbook/gui/widgets/eab-popup.c @@ -136,7 +136,6 @@ EABPopup *eab_popup_new(const gchar *menuid) * Return value: **/ - EABPopupTargetURI * eab_popup_target_new_uri(EABPopup *emp, const gchar *uri) { @@ -158,9 +157,6 @@ eab_popup_target_new_uri(EABPopup *emp, const gchar *uri) return t; } - - - EABPopupTargetSelect * eab_popup_target_new_select(EABPopup *eabp, struct _EBook *book, gint readonly, GPtrArray *cards) { diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h index d1d0ed3225..31d0310829 100644 --- a/addressbook/gui/widgets/eab-popup.h +++ b/addressbook/gui/widgets/eab-popup.h @@ -108,7 +108,6 @@ struct _EABPopupTargetSelect { GPtrArray *cards; }; - struct _EABPopupTargetURI { EPopupTarget target; gchar *uri; 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); } - -- cgit