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. --- mail/e-searching-tokenizer.c | 1 - mail/em-account-editor.c | 1 - mail/em-composer-utils.c | 4 ---- mail/em-config.c | 1 - mail/em-filter-editor.c | 2 -- mail/em-filter-source-element.c | 4 ---- mail/em-folder-browser.c | 1 - mail/em-folder-selector.c | 2 -- mail/em-folder-tree-model.c | 1 - mail/em-folder-tree.c | 3 --- mail/em-folder-utils.c | 1 - mail/em-folder-view.c | 2 -- mail/em-format-hook.c | 1 - mail/em-format-html-display.c | 1 - mail/em-format-html.c | 1 - mail/em-inline-filter.c | 1 - mail/em-subscribe-editor.c | 1 - mail/em-utils.c | 3 --- mail/em-vfolder-editor.c | 1 - mail/em-vfolder-rule.c | 1 - mail/importers/mail-importer.h | 1 - mail/mail-autofilter.c | 1 - mail/mail-component.c | 1 - mail/mail-config.c | 1 - mail/mail-folder-cache.c | 1 - mail/mail-mt.c | 2 -- mail/mail-ops.c | 3 --- mail/mail-session.c | 1 - mail/mail-vfolder.c | 2 -- mail/message-list.c | 8 -------- mail/message-tag-editor.c | 3 --- mail/message-tag-editor.h | 1 - mail/message-tag-followup.c | 5 ----- mail/message-tag-followup.h | 1 - 34 files changed, 64 deletions(-) (limited to 'mail') diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index ed4a01c4c5..b9a00cddf3 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -90,7 +90,6 @@ loop: return v; } - /* note: our tags of interest are 7 bit ascii, only, no need to do any fancy utf8 stuff */ /* tags should be upper case if this list gets longer than 10 entries, consider binary search */ diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 71a2457409..436d24f62b 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -1746,7 +1746,6 @@ emae_refresh_providers (EMAccountEditor *emae, EMAccountEditorService *service) i++; } - gtk_cell_layout_clear ((GtkCellLayout *)dropdown); gtk_combo_box_set_model (dropdown, (GtkTreeModel *)store); gtk_cell_layout_pack_start ((GtkCellLayout *)dropdown, cell, TRUE); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index ce72600ed4..472d499b06 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1044,7 +1044,6 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam e_msg_composer_attach (composer, part); - if (uids) setup_forward_attached_callbacks (composer, folder, uids); @@ -1400,7 +1399,6 @@ em_utils_receipt_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageI mail_send (); } - void em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message) { @@ -2012,7 +2010,6 @@ em_utils_get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, Cam get_reply_all (message, to, cc, postto); } - enum { ATTRIB_UNKNOWN, ATTRIB_CUSTOM, @@ -2284,7 +2281,6 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) return text; } - static void reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessage *message, gpointer user_data) { diff --git a/mail/em-config.c b/mail/em-config.c index a44554b800..357e88555b 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -224,7 +224,6 @@ em_config_target_new_account(EMConfig *emp, struct _EAccount *account) return t; } - /* ********************************************************************** */ /* Popup menu plugin handler */ diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c index 378192a8da..8d720742c6 100644 --- a/mail/em-filter-editor.c +++ b/mail/em-filter-editor.c @@ -41,10 +41,8 @@ static void em_filter_editor_class_init (EMFilterEditorClass *klass); static void em_filter_editor_init (EMFilterEditor *fe); static void em_filter_editor_finalise (GObject *obj); - static RuleEditorClass *parent_class = NULL; - GType em_filter_editor_get_type (void) { diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index 1fd5a518ad..40af002d29 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -34,7 +34,6 @@ #include #include - static void em_filter_source_element_class_init(EMFilterSourceElementClass *klass); static void em_filter_source_element_init(EMFilterSourceElement *fs); static void em_filter_source_element_finalize(GObject *obj); @@ -64,10 +63,8 @@ struct _EMFilterSourceElementPrivate { gchar *current_url; }; - static FilterElementClass *parent_class = NULL; - GType em_filter_source_element_get_type(void) { @@ -319,7 +316,6 @@ format_sexp(FilterElement *fe, GString *out) e_sexp_encode_string(out, fs->priv->current_url); } - static void em_filter_source_element_add_source(EMFilterSourceElement *fs, const gchar *account_name, const gchar *name, const gchar *addr, const gchar *url) diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index be0b076a44..ce3a3c493f 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -910,7 +910,6 @@ emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri message_list_thaw(emfv->list); } - static void emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri) { diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 03970bbc05..198264e62b 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -226,7 +226,6 @@ em_folder_selector_new (EMFolderTree *emft, guint32 flags, const gchar *title, c return (GtkWidget *) emfs; } - static void emfs_create_name_activate (GtkEntry *entry, EMFolderSelector *emfs) { @@ -274,7 +273,6 @@ em_folder_selector_create_new (EMFolderTree *emft, guint32 flags, const gchar *t return (GtkWidget *) emfs; } - void em_folder_selector_set_selected (EMFolderSelector *emfs, const gchar *uri) { diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 6049626f16..699c8dab14 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -702,7 +702,6 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, } } - static void folder_subscribed (CamelStore *store, CamelFolderInfo *fi, diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 1c35699452..f298d19629 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1791,7 +1791,6 @@ tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, EMFolde gtk_tree_view_set_drag_dest_row(tree_view, NULL, GTK_TREE_VIEW_DROP_BEFORE); } - #define SCROLL_EDGE_SIZE 15 static gboolean @@ -2107,7 +2106,6 @@ em_folder_tree_set_selected_list (EMFolderTree *emft, GList *list, gboolean expa } } - #if 0 static void dump_fi (CamelFolderInfo *fi, gint depth) @@ -2144,7 +2142,6 @@ em_folder_tree_set_selected (EMFolderTree *emft, g_list_free(l); } - void em_folder_tree_select_next_path (EMFolderTree *emft, gboolean skip_read_folders) { diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 21ec52b142..904e3908ce 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -583,7 +583,6 @@ static MailMsgInfo create_folder_info = { (MailMsgFreeFunc) emfu_create_folder__free }; - static gint emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done) (CamelFolderInfo *fi, gpointer user_data), gpointer user_data) { diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 8bb0c1e336..26ebac670f 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -395,7 +395,6 @@ emfv_edit_paste(BonoboUIComponent *uid, gpointer data, const gchar *path) // //} - //static void //emp_uri_popup_vfolder_recipient(EPopup *ep, EPopupItem *pitem, gpointer data) //{ @@ -653,7 +652,6 @@ emfv_list_done_message_selected(CamelFolder *folder, const gchar *uid, CamelMime g_object_unref (emfv); } - static gboolean emfv_message_selected_timeout(gpointer data) { diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index dd61fd6520..31aa123bdd 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -33,7 +33,6 @@ #include - /* class name -> klass map for EMFormat and subclasses */ static GHashTable *emfh_types; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index e4aa4e06ab..375eadafe2 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -175,7 +175,6 @@ struct _attach_puri { camel_cipher_validity_encrypt_t encrypt; }; - static void efhd_message_prefix(EMFormat *emf, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info); static void efhd_builtin_init(EMFormatHTMLDisplayClass *efhc); diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 9da3484f99..31c4cf0e88 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -2216,7 +2216,6 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres if (limit > 0 && i>(limit)) { - if (!strcmp (field, _("To"))) { str = g_strdup_printf (" ", EVOLUTION_ICONSDIR); } diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index ab46628dd5..2b68ed65b9 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -83,7 +83,6 @@ em_inline_filter_init (CamelObject *object) emif->data = g_byte_array_new(); } - static void em_inline_filter_finalize (CamelObject *object) { diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 8bea632f24..d572c89eaf 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -801,7 +801,6 @@ static void sub_editor_busy(EMSubscribeEditor *se, gint dir) } } - #define DEFAULT_WIDTH 600 #define DEFAULT_HEIGHT 400 diff --git a/mail/em-utils.c b/mail/em-utils.c index a971b90f34..b47b934ee2 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -343,7 +343,6 @@ em_filename_make_safe (gchar *string) } } - /* Saving messages... */ static const gchar * @@ -536,7 +535,6 @@ exit: gtk_widget_destroy (file_chooser); } - /** * em_utils_save_part_to_file: * @parent: parent window @@ -2264,7 +2262,6 @@ em_utils_clear_get_password_canceled_accounts_flag (void) } } - void em_utils_show_error_silent (GtkWidget *widget) { diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index 9c6f5f8908..84acd5f293 100644 --- a/mail/em-vfolder-editor.c +++ b/mail/em-vfolder-editor.c @@ -41,7 +41,6 @@ static FilterRule *create_rule (RuleEditor *re); static RuleEditorClass *parent_class = NULL; - static void em_vfolder_editor_finalise (GObject *obj) { diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index 2dfac64eb1..4d690115ac 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -567,7 +567,6 @@ source_remove(GtkWidget *widget, struct _source_data *data) set_sensitive(data); } - GtkWidget *em_vfolder_editor_sourcelist_new(gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2); diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 7759a4e4e7..6c5878e633 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -73,7 +73,6 @@ BonoboObject *outlook_importer_new(void); BonoboObject *mail_importer_factory_cb(BonoboGenericFactory *factory, const gchar *iid, gpointer data); - /* Defines copied from nsMsgMessageFlags.h in Mozilla source. */ /* Evolution only cares about these headers I think */ #define MSG_FLAG_READ 0x0001 diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index fd7fc5752b..ece7e75ca5 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -74,7 +74,6 @@ rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddr } } - /* remove 're' part of a subject */ static const gchar * strip_re (const gchar *subject) diff --git a/mail/mail-component.c b/mail/mail-component.c index 176a6cb875..0963a81726 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -302,7 +302,6 @@ impl_createView (PortableServer_Servant servant, // e_user_creatable_items_handler_new("mail", create_local_item_cb, tree_widget), // (GDestroyNotify)g_object_unref); - g_signal_connect (component_view->view_control, "activate", G_CALLBACK (view_control_activate_cb), view_widget); // g_signal_connect (tree_widget, "folder-selected", G_CALLBACK (folder_selected_cb), view_widget); diff --git a/mail/mail-config.c b/mail/mail-config.c index b1cfd5ab29..1ac6892b74 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -483,7 +483,6 @@ mail_config_clear (void) config_clear_mime_types (); } - void mail_config_write (void) { diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index b3d7a1e12b..bf728aa963 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -858,7 +858,6 @@ update_folders(CamelStore *store, CamelFolderInfo *fi, gpointer data) return res; } - struct _ping_store_msg { MailMsg base; diff --git a/mail/mail-mt.c b/mail/mail-mt.c index c5b6edaa14..490f54f8e5 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -159,7 +159,6 @@ end_event_callback (CamelObject *o, EActivity *activity, gpointer error) } } - #ifdef MALLOC_CHECK #include @@ -352,7 +351,6 @@ void mail_msg_cancel(guint msgid) MAIL_MT_UNLOCK(mail_msg_lock); } - /* waits for a message to be finished processing (freed) the messageid is from MailMsg->seq */ void mail_msg_wait(guint msgid) diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 1c00420f89..eb3fd0cb00 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -587,8 +587,6 @@ mail_send_message(CamelFolder *queue, const gchar *uid, const gchar *destination camel_object_ref(folder); } - - camel_folder_append_message (folder, message, info, NULL, ex); if (camel_exception_is_set (ex)) { CamelFolder *sent_folder; @@ -2266,7 +2264,6 @@ mail_save_part (CamelMimePart *part, const gchar *path, return id; } - /* ** PREPARE OFFLINE ***************************************************** */ struct _prep_offline_msg { diff --git a/mail/mail-session.c b/mail/mail-session.c index bdb5d915c9..4bd0a5f78d 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -151,7 +151,6 @@ mail_session_get_type (void) return mail_session_type; } - static gchar * make_key (CamelService *service, const gchar *item) { diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 487eea0e10..96d60ab5f0 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -301,7 +301,6 @@ static MailMsgInfo vfolder_adduri_info = { (MailMsgFreeFunc) vfolder_adduri_free }; - /* uri should be a camel uri */ static gint vfolder_adduri(const gchar *uri, GList *folders, gint remove) @@ -1124,7 +1123,6 @@ new_rule_clicked(GtkWidget *w, gint button, gpointer data) return; } - g_object_ref(rule); rule_context_add_rule((RuleContext *)context, rule); data_dir = em_utils_get_data_dir (); diff --git a/mail/message-list.c b/mail/message-list.c index d28e9a9d0e..d3db1f37ba 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -719,7 +719,6 @@ message_list_select_all (MessageList *message_list) e_selection_model_select_all (etsm); } - typedef struct thread_select_info { MessageList *ml; GPtrArray *paths; @@ -1081,7 +1080,6 @@ static const gchar *score_map[] = { N_("Highest"), }; - static gchar * ml_value_to_string (ETreeModel *etm, gint col, gconstpointer value, gpointer data) { @@ -2700,7 +2698,6 @@ message_list_construct (MessageList *message_list) g_signal_connect((message_list->tree), "selection_change", G_CALLBACK (on_selection_changed_cmd), message_list); - e_tree_drag_source_set(message_list->tree, GDK_BUTTON1_MASK, ml_drag_types, sizeof(ml_drag_types)/sizeof(ml_drag_types[0]), GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK); @@ -2843,7 +2840,6 @@ is_node_selectable (MessageList *ml, CamelMessageInfo *info) return FALSE; } - /* We try and find something that is selectable in our tree. There is * actually no assurance that we'll find something that will still be * there next time, but its probably going to work most of the time. */ @@ -3382,7 +3378,6 @@ build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes) } #endif /* ! BROKEN_ETREE */ - static void mail_folder_hide_by_flag (CamelFolder *folder, MessageList *ml, CamelFolderChangeInfo **changes, gint flag) { @@ -4391,7 +4386,6 @@ regen_list_done (struct _regen_list_msg *m) if (m->ml->priv->destroyed) return; - if (!m->complete) return; @@ -4656,14 +4650,12 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca } } - gdouble message_list_get_scrollbar_position (MessageList *ml) { return gtk_range_get_value ((GtkRange *) ((GtkScrolledWindow *) ml)->vscrollbar); } - void message_list_set_scrollbar_position (MessageList *ml, double pos) { diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c index d3a1d15bfe..1936cd8717 100644 --- a/mail/message-tag-editor.c +++ b/mail/message-tag-editor.c @@ -21,7 +21,6 @@ * */ - #ifdef HAVE_CONFIG_H #include #endif @@ -86,7 +85,6 @@ message_tag_editor_init (MessageTagEditor *editor) gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK); } - static void message_tag_editor_finalise (GObject *obj) { @@ -109,7 +107,6 @@ message_tag_editor_get_tag_list (MessageTagEditor *editor) return MESSAGE_TAG_EDITOR_GET_CLASS (editor)->get_tag_list (editor); } - static void set_tag_list (MessageTagEditor *editor, CamelTag *tags) { diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h index 3b097c190c..0187f81e92 100644 --- a/mail/message-tag-editor.h +++ b/mail/message-tag-editor.h @@ -55,7 +55,6 @@ struct _MessageTagEditorClass { /* signals */ }; - GType message_tag_editor_get_type (void); /* methods */ diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 9959f99142..6ccd74459a 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -49,7 +49,6 @@ static void message_tag_followup_finalise (GObject *obj); static CamelTag *get_tag_list (MessageTagEditor *editor); static void set_tag_list (MessageTagEditor *editor, CamelTag *tags); - #define DEFAULT_FLAG 2 /* Follow-Up */ static const gchar *available_flags[] = { N_("Call"), @@ -67,10 +66,8 @@ static const gchar *available_flags[] = { static gint num_available_flags = sizeof (available_flags) / sizeof (available_flags[0]); - static MessageTagEditorClass *parent_class = NULL; - GType message_tag_followup_get_type (void) { @@ -119,7 +116,6 @@ message_tag_followup_init (MessageTagFollowUp *editor) editor->completed_date = 0; } - static void message_tag_followup_finalise (GObject *obj) { @@ -130,7 +126,6 @@ message_tag_followup_finalise (GObject *obj) G_OBJECT_CLASS (parent_class)->finalize (obj); } - static CamelTag * get_tag_list (MessageTagEditor *editor) { diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h index c7ed55c61a..87dde7637a 100644 --- a/mail/message-tag-followup.h +++ b/mail/message-tag-followup.h @@ -60,7 +60,6 @@ struct _MessageTagFollowUpClass { /* signals */ }; - GType message_tag_followup_get_type (void); MessageTagEditor *message_tag_followup_new (void); -- cgit v1.2.3