diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-07-13 11:33:07 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-07-14 23:26:22 +0800 |
commit | 374bd42f69aca2e132fd854c9619f3d7491f1f96 (patch) | |
tree | bf50b5daa8664d4d793b82f6b6ec59d0686553e0 /addressbook/gui/widgets | |
parent | 573eb0880a80e04737cb4497931ca6588272686e (diff) | |
download | gsoc2013-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/gui/widgets')
22 files changed, 0 insertions, 40 deletions
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); } - |