diff options
Diffstat (limited to 'mail')
50 files changed, 0 insertions, 135 deletions
diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index e06885a320..32a2d6ccd3 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -73,7 +73,6 @@ struct _SharedState { /* ********************************************************************** */ - #if 0 static SharedState * shared_state_new (void) @@ -150,7 +149,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/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h index e9b1a94343..ddb47d7f05 100644 --- a/mail/e-searching-tokenizer.h +++ b/mail/e-searching-tokenizer.h @@ -64,7 +64,6 @@ void e_searching_tokenizer_set_secondary_search_string (ESearchingTokenizer * void e_searching_tokenizer_add_secondary_search_string (ESearchingTokenizer *st, const gchar *search_str); void e_searching_tokenizer_set_secondary_case_sensitivity (ESearchingTokenizer *, gboolean is_case_sensitive); - gint e_searching_tokenizer_match_count (ESearchingTokenizer *); #endif /* __E_SEARCHING_TOKENIZER_H__ */ diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c index be431db9cc..535fbd277f 100644 --- a/mail/em-account-prefs.c +++ b/mail/em-account-prefs.c @@ -48,13 +48,10 @@ static void em_account_prefs_destroy (GtkObject *object); static void mail_accounts_load (EMAccountPrefs *prefs); - static GtkVBoxClass *parent_class = NULL; - #define PREFS_WINDOW(prefs) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (prefs), GTK_TYPE_WINDOW)) - GType em_account_prefs_get_type (void) { @@ -455,8 +452,6 @@ mail_accounts_load (EMAccountPrefs *prefs) g_object_unref (node); } - - GtkWidget *em_account_prefs_treeview_new (gchar *widget_name, gchar *string1, gchar *string2, gint int1, gint int2); @@ -494,7 +489,6 @@ em_account_prefs_treeview_new (gchar *widget_name, gchar *string1, gchar *string gtk_tree_view_set_headers_visible ((GtkTreeView *) table, TRUE); atk_object_set_name (gtk_widget_get_accessible (table), _("Mail Accounts")); - /* FIXME: column auto-resize? */ /* Is this needed? gtk_tree_view_column_set_alignment (gtk_tree_view_get_column (prefs->table, 0), 1.0);*/ diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h index 9539661abe..2415e1366b 100644 --- a/mail/em-account-prefs.h +++ b/mail/em-account-prefs.h @@ -35,7 +35,6 @@ G_BEGIN_DECLS - #define EM_ACCOUNT_PREFS_TYPE (em_account_prefs_get_type ()) #define EM_ACCOUNT_PREFS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_ACCOUNT_PREFS_TYPE, EMAccountPrefs)) #define EM_ACCOUNT_PREFS_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), EM_ACCOUNT_PREFS_TYPE, EMAccountPrefsClass)) @@ -73,7 +72,6 @@ struct _EMAccountPrefsClass { }; - GType em_account_prefs_get_type (void); GtkWidget *em_account_prefs_new (GNOME_Evolution_Shell shell); diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 9341950335..402a6d2ca1 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1041,7 +1041,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); @@ -1395,7 +1394,6 @@ em_utils_receipt_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageI mail_send (); } - void em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message) { @@ -2007,7 +2005,6 @@ em_utils_get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, Cam get_reply_all (message, to, cc, postto); } - enum { ATTRIB_UNKNOWN, ATTRIB_CUSTOM, @@ -2279,7 +2276,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-event.h b/mail/em-event.h index 770daa72f2..e2235a122a 100644 --- a/mail/em-event.h +++ b/mail/em-event.h @@ -110,7 +110,6 @@ struct _EMEventTargetFolderBrowser { EMFolderBrowser *emfb; }; - typedef struct _EMEventTargetSendReceive EMEventTargetSendReceive; struct _EMEventTargetSendReceive { 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 <libedataserver/e-account-list.h> #include <camel/camel-url.h> - 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 085521febd..c6c90caffb 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -676,7 +676,6 @@ emfb_class_init(GObjectClass *klass) g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - ((GtkObjectClass *)klass)->destroy = emfb_destroy; ((EMFolderViewClass *)klass)->set_folder = emfb_set_folder; ((EMFolderViewClass *)klass)->activate = emfb_activate; @@ -1007,7 +1006,6 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const gchar *folder_uri) return view_sexp; } - struct _setup_msg { MailMsg base; @@ -1604,7 +1602,6 @@ emfb_folder_refresh(BonoboUIComponent *uid, gpointer data, const gchar *path) } } - static void emfb_folder_rename(BonoboUIComponent *uid, gpointer data, const gchar *path) { @@ -1807,7 +1804,6 @@ static EPixmap emfb_pixmaps[] = { E_PIXMAP_END }; - static void emfb_hide_deleted(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data) { @@ -1969,7 +1965,6 @@ emfb_etree_unfreeze (GtkWidget *widget, GdkEvent *event, EMFolderView *emfv) g_object_set_data (G_OBJECT (((GnomeCanvasItem *) item)->canvas), "freeze-cursor", 0); } - /* TODO: This should probably be handled by message-list, by storing/queueing up the select operation if its busy rebuilding the message-list */ static void @@ -2051,7 +2046,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-selection-button.h b/mail/em-folder-selection-button.h index c04747369d..d30867435e 100644 --- a/mail/em-folder-selection-button.h +++ b/mail/em-folder-selection-button.h @@ -51,7 +51,6 @@ struct _EMFolderSelectionButtonClass { void (* selected) (EMFolderSelectionButton *button); }; - GType em_folder_selection_button_get_type (void); GtkWidget *em_folder_selection_button_new (const gchar *title, const gchar *caption); diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 7a4f389482..95339ff8ad 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -42,19 +42,15 @@ #define d(x) - extern CamelSession *session; - static void em_folder_selector_class_init (EMFolderSelectorClass *klass); static void em_folder_selector_init (EMFolderSelector *emfs); static void em_folder_selector_destroy (GtkObject *obj); static void em_folder_selector_finalize (GObject *obj); - static GtkDialogClass *parent_class = NULL; - GType em_folder_selector_get_type (void) { @@ -223,7 +219,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) { @@ -271,7 +266,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 e9c5b35d1d..c6e3e5f833 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -128,7 +128,6 @@ em_folder_tree_model_get_type (void) return type; } - static void em_folder_tree_model_class_init (EMFolderTreeModelClass *klass) { @@ -309,7 +308,6 @@ em_folder_tree_model_finalize (GObject *obj) G_OBJECT_CLASS (parent_class)->finalize (obj); } - static void tree_model_iface_init (GtkTreeModelIface *iface) { @@ -322,7 +320,6 @@ tree_sortable_iface_init (GtkTreeSortableIface *iface) ; } - static void em_folder_tree_model_load_state (EMFolderTreeModel *model, const gchar *filename) { @@ -354,7 +351,6 @@ em_folder_tree_model_load_state (EMFolderTreeModel *model, const gchar *filename xmlSetProp (node, (const guchar *)"expand", (const guchar *)"true"); } - EMFolderTreeModel * em_folder_tree_model_new (const gchar *evolution_dir) { @@ -388,7 +384,6 @@ em_folder_tree_model_new (const gchar *evolution_dir) return model; } - static void account_changed (EAccountList *accounts, EAccount *account, gpointer user_data) { @@ -625,7 +620,6 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite } } - static void folder_subscribed (CamelStore *store, CamelFolderInfo *fi, EMFolderTreeModel *model) { @@ -925,7 +919,6 @@ em_folder_tree_model_remove_uri (EMFolderTreeModel *model, const gchar *uri) g_hash_table_remove (model->uri_hash, uri); } - static void em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelStore *store) { @@ -942,7 +935,6 @@ em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelStore *st g_hash_table_remove (model->store_hash, si->store); } - void em_folder_tree_model_remove_folders (EMFolderTreeModel *model, struct _EMFolderTreeModelStoreInfo *si, GtkTreeIter *toplevel) { @@ -979,7 +971,6 @@ em_folder_tree_model_remove_folders (EMFolderTreeModel *model, struct _EMFolderT g_free (uri); } - void em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store) { @@ -1001,7 +992,6 @@ em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store) em_folder_tree_model_remove_folders (model, si, &iter); } - static xmlNodePtr find_xml_node (xmlNodePtr root, const gchar *name) { @@ -1068,7 +1058,6 @@ em_folder_tree_model_get_expanded (EMFolderTreeModel *model, const gchar *key) return FALSE; } - void em_folder_tree_model_set_expanded (EMFolderTreeModel *model, const gchar *key, gboolean expanded) { @@ -1226,7 +1215,6 @@ em_folder_tree_model_save_state (EMFolderTreeModel *model) e_xml_save_file (model->filename, model->state); } - static void expand_foreach_r (EMFolderTreeModel *model, xmlNodePtr parent, const gchar *dirname, EMFTModelExpandFunc func, gpointer user_data) { @@ -1403,7 +1391,6 @@ em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *sto emft_model_unread_count_changed (GTK_TREE_MODEL (model), &iter); } - gchar * em_folder_tree_model_get_selected (EMFolderTreeModel *model) { @@ -1435,7 +1422,6 @@ em_folder_tree_model_get_selected (EMFolderTreeModel *model) return uri; } - void em_folder_tree_model_set_selected (EMFolderTreeModel *model, const gchar *uri) { diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index 2c2274f6c9..f0bf091eb1 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -62,7 +62,6 @@ enum { NUM_COLUMNS }; - struct _EMFolderTreeModelStoreInfo { CamelStore *store; GtkTreeRowReference *row; @@ -113,13 +112,10 @@ struct _EMFolderTreeModelClass { const gchar *uri); }; - GType em_folder_tree_model_get_type (void); - EMFolderTreeModel *em_folder_tree_model_new (const gchar *evolution_dir); - void em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *iter, struct _EMFolderTreeModelStoreInfo *si, CamelFolderInfo *fi, gint fully_loaded); diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 1702713104..cf9fb8a4e0 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1340,7 +1340,6 @@ tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, EMFolde gtk_tree_view_set_drag_dest_row(emft->priv->treeview, NULL, GTK_TREE_VIEW_DROP_BEFORE); } - #define SCROLL_EDGE_SIZE 15 static gboolean @@ -1652,7 +1651,6 @@ em_folder_tree_set_selected_list (EMFolderTree *emft, GList *list, gboolean expa } } - #if 0 static void dump_fi (CamelFolderInfo *fi, gint depth) @@ -2117,7 +2115,6 @@ static EPopupItem emft_popup_items[] = { { E_POPUP_ITEM, (gchar *) "30.emc.03", (gchar *) N_("Re_fresh"), emft_popup_refresh_folder, NULL, (gchar *) "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, { E_POPUP_ITEM, (gchar *) "30.emc.04", (gchar *) N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, (gchar *) "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, - { E_POPUP_BAR, (gchar *) "99.emc" }, { E_POPUP_ITEM, (gchar *) "99.emc.00", (gchar *) N_("_Properties"), emft_popup_properties, NULL, (gchar *) "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } }; @@ -2355,7 +2352,6 @@ em_folder_tree_set_selected (EMFolderTree *emft, const gchar *uri, gboolean expa g_list_free(l); } - void em_folder_tree_select_next_path (EMFolderTree *emft, gboolean skip_read_folders) { @@ -2496,7 +2492,6 @@ em_folder_tree_select_prev_path (EMFolderTree *emft, gboolean skip_read_folders) return; } - gchar * em_folder_tree_get_selected_uri (EMFolderTree *emft) { @@ -2634,7 +2629,6 @@ emft_save_state (EMFolderTree *emft) return FALSE; } - static void emft_queue_save_state (EMFolderTree *emft) { diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index f5378684b0..7a23cb5f0c 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -573,7 +573,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 f762e2ee39..3025031909 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -145,7 +145,6 @@ static void emfv_set_seen (EMFolderView *emfv, const gchar *uid); static gboolean emfv_on_html_button_released_cb (GtkHTML *html, GdkEventButton *button, EMFolderView *emfv); static gboolean emfv_popup_menu (GtkWidget *widget); - /* this is added to emfv->enable_map in :init() */ static const EMFolderViewEnable emfv_enable_map[] = { { "EditCut", EM_POPUP_SELECT_MANY }, @@ -1949,7 +1948,6 @@ emp_uri_popup_vfolder_sender(EPopup *ep, EPopupItem *pitem, gpointer data) } - static void emp_uri_popup_vfolder_recipient(EPopup *ep, EPopupItem *pitem, gpointer data) { @@ -2134,7 +2132,6 @@ static EPixmap emfv_message_pixmaps[] = { E_PIXMAP_END }; - static void emfv_enable_menus(EMFolderView *emfv) { @@ -2504,7 +2501,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 <glib/gi18n.h> - /* 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 3a75bfb59a..48595582da 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -140,7 +140,6 @@ struct _attach_puri { camel_cipher_validity_encrypt_t encrypt; }; - static void efhd_iframe_created(GtkHTML *html, GtkHTML *iframe, EMFormatHTMLDisplay *efh); /*static void efhd_url_requested(GtkHTML *html, const gchar *url, GtkHTMLStream *handle, EMFormatHTMLDisplay *efh); static gboolean efhd_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTMLDisplay *efh);*/ diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 76ab642c59..d769127705 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -207,7 +207,6 @@ efh_insert_cache(EMFormatHTML *efh, const gchar *partid) return efhc; } - static void efh_finalise(GObject *o) { @@ -484,7 +483,6 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled) if (instream == NULL) { gchar *proxy; - if (!(job->format->load_http_now || job->format->load_http == MAIL_CONFIG_HTTP_ALWAYS || (job->format->load_http == MAIL_CONFIG_HTTP_SOMETIMES @@ -1647,7 +1645,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 ("<a href=\"##TO##\"><img src=\"%s/minus.png\" /></a> ", EVOLUTION_ICONSDIR); } diff --git a/mail/em-format.h b/mail/em-format.h index 35569a4bc4..b3af1e8c3c 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -106,7 +106,6 @@ enum _em_format_handler_t { EM_FORMAT_HANDLER_INLINE_DISPOSITION = 1<<1 }; - typedef struct _EMFormatPURI EMFormatPURI; typedef void (*EMFormatPURIFunc)(EMFormat *md, CamelStream *stream, EMFormatPURI *puri); diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h index 20b781852d..abd12e154f 100644 --- a/mail/em-html-stream.h +++ b/mail/em-html-stream.h @@ -47,7 +47,6 @@ typedef struct { } EMHTMLStreamClass; - CamelType em_html_stream_get_type (void); /* the html_stream is closed when we are finalised (with an error), or closed (ok) */ diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index bf18aab0f7..7ff92fae5e 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -82,7 +82,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-mailer-prefs.c b/mail/em-mailer-prefs.c index a76af74b1c..057b2d9210 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -157,7 +157,6 @@ em_mailer_prefs_dispose (GObject *obj) ((GObjectClass *)(parent_class))->dispose (obj); } - static void color_button_set_color (GtkColorButton *color_button, const gchar *spec) { @@ -297,7 +296,6 @@ label_tree_refill (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpoint e_util_labels_free (labels); } - static void jh_tree_refill (EMMailerPrefs *prefs) { @@ -421,7 +419,6 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data) } } - static gboolean init_junk_tree (GtkTreeView *jh_tree, EMMailerPrefs *prefs) { @@ -839,7 +836,6 @@ custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs) gtk_widget_set_sensitive ((GtkWidget *) prefs->junk_header_remove, FALSE); } - } static void @@ -1009,7 +1005,6 @@ http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs) gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", when, NULL); } - static GtkWidget * emmp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data) { @@ -1513,7 +1508,6 @@ em_mailer_prefs_new (void) return (GtkWidget *) new; } - static struct _EMMailerPrefsHeader * emmp_header_from_xmldoc (xmlDocPtr doc) { diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 1428013891..fd59bafea9 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -1092,7 +1092,6 @@ em_migrate_session_new (const gchar *path) return session; } - #endif /* !G_OS_WIN32 */ static GtkWidget *window; @@ -2942,7 +2941,6 @@ migrate_to_db() em_migrate_close_progress_dialog (); } - gint em_migrate (const gchar *evolution_dir, gint major, gint minor, gint revision, CamelException *ex) { @@ -3036,7 +3034,6 @@ em_migrate (const gchar *evolution_dir, gint major, gint minor, gint revision, C #endif } - if (major < 2 || (major == 2 && minor < 22)) em_update_message_notify_settings_2_21 (); diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c index 235994aadd..d8b576f1f1 100644 --- a/mail/em-network-prefs.c +++ b/mail/em-network-prefs.c @@ -68,10 +68,8 @@ static void em_network_prefs_init (EMNetworkPrefs *dialog); static void em_network_prefs_destroy (GtkObject *obj); static void em_network_prefs_finalise (GObject *obj); - static GtkVBoxClass *parent_class = NULL; - GType em_network_prefs_get_type (void) { diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 71031fbe35..0b6cd5ff63 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -45,7 +45,6 @@ typedef enum { NETWORK_PROXY_AUTOCONFIG } NetworkConfigProxyType; - struct _EMNetworkPrefs { GtkVBox parent_object; diff --git a/mail/em-popup.c b/mail/em-popup.c index 4f6b7ededf..4fc912ba07 100644 --- a/mail/em-popup.c +++ b/mail/em-popup.c @@ -625,7 +625,6 @@ emp_add_vcard (EPopup *ep, EPopupItem *item, gpointer data) CamelDataWrapper *content; CamelStreamMem *mem; - part = ((EMPopupTargetPart *) target)->part; if (!part) diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c index 39e6d02dad..42d824778b 100644 --- a/mail/em-stripsig-filter.c +++ b/mail/em-stripsig-filter.c @@ -30,7 +30,6 @@ #include "em-stripsig-filter.h" - static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass); static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass); @@ -40,10 +39,8 @@ static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len gchar **out, gsize *outlen, gsize *outprespace); static void filter_reset (CamelMimeFilter *filter); - static CamelMimeFilterClass *parent_class = NULL; - CamelType em_stripsig_filter_get_type (void) { @@ -63,7 +60,6 @@ em_stripsig_filter_get_type (void) return type; } - static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass) { @@ -154,7 +150,6 @@ filter_reset (CamelMimeFilter *filter) stripsig->midline = FALSE; } - /** * em_stripsig_filter_new: * diff --git a/mail/em-stripsig-filter.h b/mail/em-stripsig-filter.h index 9a09d1aab2..39493e5e88 100644 --- a/mail/em-stripsig-filter.h +++ b/mail/em-stripsig-filter.h @@ -48,7 +48,6 @@ struct _EMStripSigFilterClass { }; - CamelType em_stripsig_filter_get_type (void); CamelMimeFilter *em_stripsig_filter_new (void); diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index eaac3b4d71..4d20b31baa 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -800,7 +800,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 1e285bc351..b1cc782b4c 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -73,7 +73,6 @@ #include "e-util/e-dialog-utils.h" #include "e-util/e-error.h" - #include "em-utils.h" #include "em-composer-utils.h" #include "em-folder-view.h" @@ -354,7 +353,6 @@ em_filename_make_safe (gchar *string) } } - /* Saving messages... */ static const gchar * @@ -543,7 +541,6 @@ exit: gtk_widget_destroy (file_chooser); } - /** * em_utils_save_part_to_file: * @parent: parent window @@ -2353,7 +2350,6 @@ em_utils_snoop_type(CamelMimePart *part) } else res = name_type; - if (res != name_type) g_free (name_type); @@ -2404,7 +2400,6 @@ em_utils_clear_get_password_canceled_accounts_flag (void) } } - static void error_response(GtkObject *o, gint button, gpointer data) { gtk_widget_destroy((GtkWidget *)o); diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c index 3fd822fbcc..13a41c1888 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 dea8b3ab7c..f2cc7cb57f 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 ef5e8787a6..2efa02e972 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -75,7 +75,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 c54a76abef..70da7b796a 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -802,7 +802,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); g_signal_connect (tree_widget, "hidden-key-event", G_CALLBACK (tree_hidden_key_event_cb), view_widget); diff --git a/mail/mail-config.c b/mail/mail-config.c index d414f75f0c..316957bf38 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -563,7 +563,6 @@ mail_config_clear (void) config_clear_mime_types (); } - void mail_config_write (void) { @@ -1152,7 +1151,6 @@ get_new_signature_filename (void) return NULL; } - ESignature * mail_config_signature_new (const gchar *filename, gboolean script, gboolean html) { diff --git a/mail/mail-config.h b/mail/mail-config.h index 0b431537bd..80a82a2f83 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -41,7 +41,6 @@ typedef struct _MailConfigSignature { gboolean html; } MailConfigSignature; - typedef enum { MAIL_CONFIG_HTTP_NEVER, MAIL_CONFIG_HTTP_SOMETIMES, @@ -131,7 +130,6 @@ void mail_config_save_signatures (void); gchar *mail_config_signature_run_script (const gchar *script); - /* uri's got changed by the store, etc */ void mail_config_uri_renamed (GCompareFunc uri_cmp, const gchar *old, const gchar *new); void mail_config_uri_deleted (GCompareFunc uri_cmp, const gchar *uri); diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 6ab9187e49..50167b7f0a 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -819,7 +819,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 61e7c780f3..9ad326f682 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -156,7 +156,6 @@ end_event_callback (CamelObject *o, gpointer event_data, gpointer error) } } - #ifdef MALLOC_CHECK #include <mcheck.h> @@ -349,7 +348,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 2ffecb5509..118de487bb 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -583,8 +583,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; @@ -2256,7 +2254,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 96b4edf574..7cc1a7e263 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -149,7 +149,6 @@ mail_session_get_type (void) return mail_session_type; } - static gchar * make_key (CamelService *service, const gchar *item) { diff --git a/mail/mail-types.h b/mail/mail-types.h index c5c737eca9..5d2ef80ef2 100644 --- a/mail/mail-types.h +++ b/mail/mail-types.h @@ -23,7 +23,6 @@ G_BEGIN_DECLS - typedef struct _FolderBrowser FolderBrowser; typedef struct _MessageBrowser MessageBrowser; typedef struct _SubscribeDialog SubscribeDialog; diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index ac18f2deb7..0f49f32cae 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -298,7 +298,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) @@ -1111,7 +1110,6 @@ new_rule_clicked(GtkWidget *w, gint button, gpointer data) return; } - g_object_ref(rule); rule_context_add_rule((RuleContext *)context, rule); user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ())); diff --git a/mail/message-list.c b/mail/message-list.c index 2d5b34a270..b222de4bb1 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -705,7 +705,6 @@ message_list_select_all (MessageList *message_list) e_selection_model_select_all (etsm); } - typedef struct thread_select_info { MessageList *ml; GPtrArray *paths; @@ -1067,7 +1066,6 @@ static const gchar *score_map[] = { N_("Highest"), }; - static gchar * ml_value_to_string (ETreeModel *etm, gint col, gconstpointer value, gpointer data) { @@ -2535,7 +2533,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); @@ -2667,7 +2664,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. */ @@ -3206,7 +3202,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) { @@ -4216,7 +4211,6 @@ regen_list_done (struct _regen_list_msg *m) if (m->ml->priv->destroyed) return; - if (!m->complete) return; @@ -4481,14 +4475,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 <config.h> #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 bf596c17da..9293205fb3 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); |