From 374bd42f69aca2e132fd854c9619f3d7491f1f96 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 12 Jul 2009 23:33:07 -0400 Subject: Fix excessive whitespace. --- e-util/e-bconf-map.c | 7 ------- e-util/e-bconf-map.h | 2 -- e-util/e-binding.h | 1 - e-util/e-bit-array.c | 1 - e-util/e-bit-array.h | 2 -- e-util/e-dialog-utils.c | 1 - e-util/e-dialog-utils.h | 1 - e-util/e-error.c | 1 - e-util/e-html-utils.c | 1 - e-util/e-icon-factory.c | 3 --- e-util/e-import.h | 1 - e-util/e-mktemp.c | 2 -- e-util/e-mktemp.h | 1 - e-util/e-pilot-map.c | 1 - e-util/e-pilot-util.h | 1 - e-util/e-plugin.h | 2 -- e-util/e-signature-list.c | 8 -------- e-util/e-signature-list.h | 1 - e-util/e-signature.c | 9 --------- e-util/e-signature.h | 1 - e-util/e-sorter-array.c | 1 - e-util/e-sorter.c | 5 ----- e-util/e-text-event-processor-emacs-like.h | 3 --- e-util/e-text-event-processor.h | 2 -- e-util/e-unicode.h | 1 - e-util/e-util.c | 1 - e-util/e-xml-utils.h | 4 ---- 27 files changed, 64 deletions(-) (limited to 'e-util') diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c index 3e44526071..6b6f16d4cf 100644 --- a/e-util/e-bconf-map.c +++ b/e-util/e-bconf-map.c @@ -37,10 +37,8 @@ #include "e-bconf-map.h" - #define d(x) - static gchar hexnib[256] = { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, @@ -88,7 +86,6 @@ e_bconf_url_decode (const gchar *val) return res; } - xmlNodePtr e_bconf_get_path (xmlDocPtr doc, const gchar *path) { @@ -194,7 +191,6 @@ e_bconf_get_string (xmlNodePtr root, const gchar *name) return res; } - /* lookup functions */ typedef gchar * (* bconf_lookup_func) (xmlNodePtr root, const gchar *name, e_bconf_map_t *nap); @@ -235,7 +231,6 @@ bconf_lookup_enum (xmlNodePtr root, const gchar *name, e_bconf_map_t *map) return NULL; } - static bconf_lookup_func lookup_table[] = { bconf_lookup_bool, bconf_lookup_long, bconf_lookup_string, bconf_lookup_enum }; @@ -298,7 +293,6 @@ build_xml (xmlNodePtr root, e_bconf_map_t *map, gint index, xmlNodePtr source) } } - gint e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map_t *map, const gchar *bconf_path, const gchar *gconf_path, @@ -360,7 +354,6 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map return 0; } - static gint gconf_type[] = { GCONF_VALUE_BOOL, GCONF_VALUE_BOOL, GCONF_VALUE_INT, GCONF_VALUE_STRING, GCONF_VALUE_STRING }; gint diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h index 4e72f5ebb3..181533dde4 100644 --- a/e-util/e-bconf-map.h +++ b/e-util/e-bconf-map.h @@ -48,7 +48,6 @@ typedef struct _e_bconf_map { struct _e_bconf_map *child; } e_bconf_map_t; - gchar *e_bconf_hex_decode (const gchar *val); gchar *e_bconf_url_decode (const gchar *val); @@ -64,7 +63,6 @@ gint e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bcon const gchar *bconf_path, const gchar *gconf_path, const gchar *name, const gchar *idparam); - enum { E_GCONF_MAP_BOOL, E_GCONF_MAP_BOOLNOT, diff --git a/e-util/e-binding.h b/e-util/e-binding.h index 12f4db8505..a36c94ec81 100644 --- a/e-util/e-binding.h +++ b/e-util/e-binding.h @@ -102,7 +102,6 @@ EMutualBinding *e_mutual_binding_new_with_negation const gchar *property2); void e_mutual_binding_unbind (EMutualBinding *binding); - /* Useful transformation functions */ gboolean e_binding_transform_color_to_string (const GValue *src_value, diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c index 551ffe2143..898a1933dc 100644 --- a/e-util/e-bit-array.c +++ b/e-util/e-bit-array.c @@ -396,7 +396,6 @@ e_bit_array_toggle_single_row (EBitArray *eba, gint row) eba->data[BOX(row)] |= BITMASK(row); } - static void e_bit_array_init (EBitArray *eba) { diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h index 6f021c51b1..52439c75c8 100644 --- a/e-util/e-bit-array.h +++ b/e-util/e-bit-array.h @@ -51,7 +51,6 @@ typedef struct { GObjectClass parent_class; } EBitArrayClass; - GType e_bit_array_get_type (void); EBitArray *e_bit_array_new (gint count); @@ -95,5 +94,4 @@ gboolean e_bit_array_cross_or (EBitArray *esm); G_END_DECLS - #endif /* _E_BIT_ARRAY_H_ */ diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c index 8740c78054..ae431ee094 100644 --- a/e-util/e-dialog-utils.c +++ b/e-util/e-dialog-utils.c @@ -242,7 +242,6 @@ e_dialog_set_transient_for_xid (GtkWindow *dialog, gdk_window_set_transient_for (gtk_widget_get_window (GTK_WIDGET (dialog)), parent); } - static void save_ok (GtkWidget *widget, gpointer data) diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h index 3ebad46a49..98d85e151d 100644 --- a/e-util/e-dialog-utils.h +++ b/e-util/e-dialog-utils.h @@ -48,5 +48,4 @@ GtkWidget * e_file_get_save_filesel (GtkWindow *parent, const gchar *title, cons gboolean e_file_can_save(GtkWindow *parent, const gchar *uri); gboolean e_file_check_local(const gchar *name); - #endif diff --git a/e-util/e-error.c b/e-util/e-error.c index c78083495e..0671bdecf5 100644 --- a/e-util/e-error.c +++ b/e-util/e-error.c @@ -518,7 +518,6 @@ e_error_newv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap) } else gtk_window_set_title((GtkWindow *)dialog, dgettext(table->translation_domain, type_map[e->type].title)); - if (e->primary) { g_string_append(out, ""); ee_build_label(out, e->primary, args, TRUE); diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c index 619cb6599e..b80ee17891 100644 --- a/e-util/e-html-utils.c +++ b/e-util/e-html-utils.c @@ -435,7 +435,6 @@ e_text_to_html (const gchar *input, guint flags) return e_text_to_html_full (input, flags, 0); } - #ifdef E_HTML_UTILS_TEST struct { diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c index dddd4fa431..85985ef673 100644 --- a/e-util/e-icon-factory.c +++ b/e-util/e-icon-factory.c @@ -55,7 +55,6 @@ static GHashTable *name_to_icon = NULL; static GtkIconTheme *icon_theme = NULL; static GStaticMutex mutex = G_STATIC_MUTEX_INIT; - /* Note: takes ownership of the pixbufs (eg. does not ref them) */ static Icon * icon_new (const gchar *name, GdkPixbuf *pixbuf) @@ -225,7 +224,6 @@ e_icon_factory_shutdown (void) name_to_icon = NULL; } - /** * e_icon_factory_get_icon_filename: * @icon_name: name of the icon @@ -262,7 +260,6 @@ e_icon_factory_get_icon_filename (const gchar *icon_name, return filename; } - /** * e_icon_factory_get_icon: * @icon_name: name of the icon diff --git a/e-util/e-import.h b/e-util/e-import.h index 84c5061132..5a3165e117 100644 --- a/e-util/e-import.h +++ b/e-util/e-import.h @@ -258,7 +258,6 @@ GType e_import_hook_get_type(void); /* for implementors */ void e_import_hook_class_add_target_map(EImportHookClass *klass, const EImportHookTargetMap *); - G_END_DECLS #endif /* __E_IMPORT_H__ */ diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 0e4cc6c7f3..509b312ee8 100644 --- a/e-util/e-mktemp.c +++ b/e-util/e-mktemp.c @@ -185,7 +185,6 @@ e_mktemp (const gchar *template) return ret; } - gint e_mkstemp (const gchar *template) { @@ -208,7 +207,6 @@ e_mkstemp (const gchar *template) return fd; } - gchar * e_mkdtemp (const gchar *template) { diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h index c9b1d55b18..08f75ea67e 100644 --- a/e-util/e-mktemp.h +++ b/e-util/e-mktemp.h @@ -20,7 +20,6 @@ * */ - #ifndef __E_MKTEMP_H__ #define __E_MKTEMP_H__ diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c index 80eb361027..660bdedc9a 100644 --- a/e-util/e-pilot-map.c +++ b/e-util/e-pilot-map.c @@ -268,7 +268,6 @@ e_pilot_map_remove_by_uid (EPilotMap *map, const gchar *uid) g_hash_table_remove (map->uid_map, uid); } - guint32 e_pilot_map_lookup_pid (EPilotMap *map, const gchar *uid, gboolean touch) { diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h index 476320c58b..6b9b0ad884 100644 --- a/e-util/e-pilot-util.h +++ b/e-util/e-pilot-util.h @@ -35,5 +35,4 @@ gchar *e_pilot_utf8_from_pchar (const gchar *string); ESource *e_pilot_get_sync_source (ESourceList *source_list); void e_pilot_set_sync_source (ESourceList *source_list, ESource *source); - #endif /* E_PILOT_UTIL_H */ diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h index 64f4ccd2e5..18949bf893 100644 --- a/e-util/e-plugin.h +++ b/e-util/e-plugin.h @@ -375,7 +375,6 @@ struct _EPluginTypeHookClass { GType e_plugin_type_hook_get_type(void); - /* README: Currently there is only one flag. But we may need more in the future and hence makes sense to keep as an enum */ @@ -384,6 +383,5 @@ typedef enum _EPluginFlags { E_PLUGIN_FLAGS_SYSTEM_PLUGIN = 1 << 0 } EPluginFlags; - #endif /* ! _E_PLUGIN_H */ diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c index 1480f37e68..094d4785da 100644 --- a/e-util/e-signature-list.c +++ b/e-util/e-signature-list.c @@ -51,10 +51,8 @@ static void e_signature_list_init (ESignatureList *list, ESignatureListClass *kl static void e_signature_list_finalize (GObject *object); static void e_signature_list_dispose (GObject *object); - static EListClass *parent_class = NULL; - GType e_signature_list_get_type (void) { @@ -77,7 +75,6 @@ e_signature_list_get_type (void) return type; } - static void e_signature_list_class_init (ESignatureListClass *klass) { @@ -325,7 +322,6 @@ e_signature_list_construct (ESignatureList *signature_list, GConfClient *gconf) } } - /** * e_signature_list_save: * @signature_list: an #ESignatureList @@ -363,7 +359,6 @@ e_signature_list_save (ESignatureList *signature_list) gconf_client_suggest_sync (signature_list->priv->gconf, NULL); } - /** * e_signature_list_add: * @signatures: signature list @@ -379,7 +374,6 @@ e_signature_list_add (ESignatureList *signatures, ESignature *signature) g_signal_emit (signatures, signals[SIGNATURE_ADDED], 0, signature); } - /** * e_signature_list_change: * @signatures: signature list @@ -394,7 +388,6 @@ e_signature_list_change (ESignatureList *signatures, ESignature *signature) g_signal_emit (signatures, signals[SIGNATURE_CHANGED], 0, signature); } - /** * e_signature_list_remove: * @signatures: signature list @@ -414,7 +407,6 @@ e_signature_list_remove (ESignatureList *signatures, ESignature *signature) g_object_unref (signature); } - /** * e_signature_list_find: * @signatures: signature list diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h index 1c27a12453..b662272180 100644 --- a/e-util/e-signature-list.h +++ b/e-util/e-signature-list.h @@ -59,7 +59,6 @@ struct _ESignatureListClass { void (* signature_removed) (ESignatureList *, ESignature *); }; - GType e_signature_list_get_type (void); ESignatureList *e_signature_list_new (GConfClient *gconf); diff --git a/e-util/e-signature.c b/e-util/e-signature.c index 60659f8c55..86e29fe34a 100644 --- a/e-util/e-signature.c +++ b/e-util/e-signature.c @@ -37,15 +37,12 @@ #include "e-signature.h" - static void e_signature_class_init (ESignatureClass *klass); static void e_signature_init (ESignature *sig, ESignatureClass *klass); static void e_signature_finalize (GObject *object); - static GObjectClass *parent_class = NULL; - GType e_signature_get_type (void) { @@ -97,7 +94,6 @@ e_signature_finalize (GObject *object) G_OBJECT_CLASS (parent_class)->finalize (object); } - /** * e_signature_new: * @@ -115,7 +111,6 @@ e_signature_new (void) return signature; } - /** * e_signature_new_from_xml: * @xml: an XML signature description @@ -137,7 +132,6 @@ e_signature_new_from_xml (const gchar *xml) return signature; } - static gboolean xml_set_bool (xmlNodePtr node, const gchar *name, gboolean *val) { @@ -201,7 +195,6 @@ xml_set_content (xmlNodePtr node, gchar **val) } } - /** * e_signature_uid_from_xml: * @xml: an XML signature description @@ -232,7 +225,6 @@ e_signature_uid_from_xml (const gchar *xml) return uid; } - /** * e_signature_set_from_xml: * @signature: an #ESignature @@ -314,7 +306,6 @@ e_signature_set_from_xml (ESignature *signature, const gchar *xml) return changed; } - /** * e_signature_to_xml: * @signature: an #ESignature diff --git a/e-util/e-signature.h b/e-util/e-signature.h index a58a42992c..3dced1903d 100644 --- a/e-util/e-signature.h +++ b/e-util/e-signature.h @@ -54,7 +54,6 @@ struct _ESignatureClass { }; - GType e_signature_get_type (void); ESignature *e_signature_new (void); diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c index b3b4c4a2f2..39f3e61fa8 100644 --- a/e-util/e-sorter-array.c +++ b/e-util/e-sorter-array.c @@ -106,7 +106,6 @@ esa_backsort(ESorterArray *esa) } } - static gint esa_model_to_sorted (ESorter *es, gint row) { diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c index 602b189075..14b469b734 100644 --- a/e-util/e-sorter.c +++ b/e-util/e-sorter.c @@ -63,7 +63,6 @@ e_sorter_new (void) return es; } - static gint es_model_to_sorted (ESorter *es, gint row) { @@ -76,7 +75,6 @@ es_sorted_to_model (ESorter *es, gint row) return row; } - static void es_get_model_to_sorted_array (ESorter *es, gint **array, gint *count) { @@ -87,7 +85,6 @@ es_get_sorted_to_model_array (ESorter *es, gint **array, gint *count) { } - static gboolean es_needs_sorting(ESorter *es) { @@ -118,7 +115,6 @@ e_sorter_sorted_to_model (ESorter *es, gint row) return -1; } - void e_sorter_get_model_to_sorted_array (ESorter *es, gint **array, gint *count) { @@ -137,7 +133,6 @@ e_sorter_get_sorted_to_model_array (ESorter *es, gint **array, gint *count) E_SORTER_GET_CLASS(es)->get_sorted_to_model_array (es, array, count); } - gboolean e_sorter_needs_sorting(ESorter *es) { diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h index a93db0f440..0b9c6c143c 100644 --- a/e-util/e-text-event-processor-emacs-like.h +++ b/e-util/e-text-event-processor-emacs-like.h @@ -38,7 +38,6 @@ G_BEGIN_DECLS #define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE)) #define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE)) - typedef struct _ETextEventProcessorEmacsLike ETextEventProcessorEmacsLike; typedef struct _ETextEventProcessorEmacsLikeClass ETextEventProcessorEmacsLikeClass; @@ -55,11 +54,9 @@ struct _ETextEventProcessorEmacsLikeClass ETextEventProcessorClass parent_class; }; - GType e_text_event_processor_emacs_like_get_type (void); ETextEventProcessor *e_text_event_processor_emacs_like_new (void); G_END_DECLS - #endif /* __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ */ diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h index 1f313bd35d..9e02cb050e 100644 --- a/e-util/e-text-event-processor.h +++ b/e-util/e-text-event-processor.h @@ -60,11 +60,9 @@ struct _ETextEventProcessorClass gint (* event) (ETextEventProcessor *tep, ETextEventProcessorEvent *event); }; - GType e_text_event_processor_get_type (void); gint e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event); G_END_DECLS - #endif /* __E_TEXT_EVENT_PROCESSOR_H__ */ diff --git a/e-util/e-unicode.h b/e-util/e-unicode.h index 77d1a351cb..737c5088eb 100644 --- a/e-util/e-unicode.h +++ b/e-util/e-unicode.h @@ -109,4 +109,3 @@ G_END_DECLS #endif - diff --git a/e-util/e-util.c b/e-util/e-util.c index bb3fb739a8..8423665d08 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -1107,7 +1107,6 @@ e_ascii_dtostr (gchar *buffer, gint buf_len, const gchar *format, gdouble d) format_char == 'g' || format_char == 'G')) return NULL; - g_snprintf (buffer, buf_len, format, d); locale_data = localeconv (); diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h index c327d61e17..fa123a1d04 100644 --- a/e-util/e-xml-utils.h +++ b/e-util/e-xml-utils.h @@ -40,7 +40,6 @@ xmlNode *e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, xmlNode *e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name); - gint e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); gint e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, @@ -50,7 +49,6 @@ void e_xml_set_integer_prop_by_name (xmlNode *parent, const xmlChar *prop_name, gint value); - guint e_xml_get_uint_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); guint e_xml_get_uint_prop_by_name_with_default (const xmlNode *parent, @@ -60,7 +58,6 @@ void e_xml_set_uint_prop_by_name (xmlNode *parent, const xmlChar *prop_name, guint value); - gboolean e_xml_get_bool_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); gboolean e_xml_get_bool_prop_by_name_with_default (const xmlNode *parent, @@ -79,7 +76,6 @@ void e_xml_set_double_prop_by_name ( xmlNode *parent, const xmlChar *prop_name, gdouble value); - gchar *e_xml_get_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); gchar *e_xml_get_string_prop_by_name_with_default (const xmlNode *parent, -- cgit v1.2.3