From 8771a6de3590d468d1a2c3cfab34955c624f614a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 1 Jun 2009 19:09:19 -0400 Subject: More code cleanup. --- mail/e-searching-tokenizer.c | 10 +++---- mail/em-account-editor.c | 6 ++-- mail/em-composer-utils.c | 6 ++-- mail/em-filter-folder-element.c | 4 +-- mail/em-filter-rule.c | 8 +++--- mail/em-filter-source-element.c | 2 +- mail/em-folder-browser.c | 10 +++---- mail/em-folder-properties.c | 4 +-- mail/em-folder-tree-model.c | 2 +- mail/em-folder-tree.c | 6 ++-- mail/em-folder-utils.c | 6 ++-- mail/em-folder-view.c | 8 +++--- mail/em-format-hook.c | 2 +- mail/em-format-html-display.c | 2 +- mail/em-format-html.c | 6 ++-- mail/em-format-html.h | 2 +- mail/em-format.c | 8 +++--- mail/em-format.h | 2 +- mail/em-html-stream.c | 12 ++++---- mail/em-icon-stream.c | 12 ++++---- mail/em-inline-filter.c | 12 ++++---- mail/em-junk-hook.c | 2 +- mail/em-mailer-prefs.c | 8 +++--- mail/em-message-browser.c | 2 +- mail/em-migrate.c | 62 ++++++++++++++++++++--------------------- mail/em-stripsig-filter.c | 20 ++++++------- mail/em-subscribe-editor.c | 4 +-- mail/em-sync-stream.c | 4 +-- mail/em-sync-stream.h | 4 +-- mail/em-utils.c | 12 ++++---- mail/em-utils.h | 4 +-- mail/em-vfolder-rule.c | 8 +++--- mail/importers/elm-importer.c | 2 +- mail/importers/mail-importer.c | 2 +- mail/importers/pine-importer.c | 8 +++--- mail/mail-component.c | 8 +++--- mail/mail-folder-cache.c | 2 +- mail/mail-mt.c | 6 ++-- mail/mail-send-recv.c | 4 +-- mail/mail-tools.c | 2 +- mail/mail-vfolder.c | 8 +++--- mail/message-list.c | 34 +++++++++++----------- mail/message-list.h | 2 +- mail/message-tag-followup.c | 2 +- 44 files changed, 170 insertions(+), 170 deletions(-) (limited to 'mail') diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c index b0b1db1879..e06885a320 100644 --- a/mail/e-searching-tokenizer.c +++ b/mail/e-searching-tokenizer.c @@ -157,7 +157,7 @@ loop: static const gchar *ignored_tags[] = { "B", "I", "FONT", "TT", "EM", /* and more? */}; -static int +static gint ignore_tag (const gchar *tag) { gchar *t = alloca(strlen(tag)+1), c, *out; @@ -593,7 +593,7 @@ output_match(struct _searcher *s, guint start, guint end) /* output highlight/bold */ if (s->flags & SEARCH_BOLD) { - sprintf(b, "%c", (char)TAG_ESCAPE); + sprintf(b, "%c", (gchar)TAG_ESCAPE); append_token(&s->output, b, -1); } if (s->tags) @@ -621,7 +621,7 @@ output_match(struct _searcher *s, guint start, guint end) /* and close bold if we need to */ if (s->flags & SEARCH_BOLD) { - sprintf(b, "%c", (char)TAG_ESCAPE); + sprintf(b, "%c", (gchar)TAG_ESCAPE); append_token(&s->output, b, -1); } } @@ -638,7 +638,7 @@ output_subpending(struct _searcher *s) } /* returns true if a merge took place */ -static int +static gint merge_subpending(struct _searcher *s, gint offstart, gint offend) { gint i; @@ -831,7 +831,7 @@ searcher_peek_token(struct _searcher *s) return tok; } -static int +static gint searcher_pending(struct _searcher *s) { return !(e_dlist_empty(&s->input) && e_dlist_empty(&s->output)); diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 570858cd68..0016952cff 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -611,7 +611,7 @@ emae_signature_added(ESignatureList *signatures, ESignature *sig, EMAccountEdito gtk_combo_box_set_active(emae->priv->signatures_dropdown, gtk_tree_model_iter_n_children(model, NULL)-1); } -static int +static gint emae_signature_get_iter(EMAccountEditor *emae, ESignature *sig, GtkTreeModel **modelp, GtkTreeIter *iter) { GtkTreeModel *model; @@ -1225,7 +1225,7 @@ emae_path_changed(GtkWidget *widget, EMAccountEditorService *service) emae_service_url_path_changed(service, camel_url_set_path, widget); } -static int +static gint emae_ssl_update(EMAccountEditorService *service, CamelURL *url) { gint id = gtk_combo_box_get_active(service->use_ssl); @@ -2727,7 +2727,7 @@ struct _server_prefill { {"msn", "pop3.email.msn.com", "smtp.email.msn.com", "pop", "never"} }; -static int +static gint check_servers (gchar *server) { gint len = G_N_ELEMENTS(mail_servers), i; diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 19a20b2c1b..4a681c99bc 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -1096,7 +1096,7 @@ forward_non_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, flags |= EM_FORMAT_QUOTE_CITE; for (i = 0; i < messages->len; i++) { - ssize_t len; + gssize len; message = messages->pdata[i]; subject = mail_tool_generate_forward_subject (message); @@ -2200,7 +2200,7 @@ composer_set_body (EMsgComposer *composer, CamelMimeMessage *message, EMFormat * gchar *text, *credits; CamelMimePart *part; GConfClient *gconf; - ssize_t len = 0; + gssize len = 0; gboolean start_bottom; gconf = mail_config_get_gconf_client (); @@ -2259,7 +2259,7 @@ gchar * em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source) { gchar *text, *credits; - ssize_t len = 0; + gssize len = 0; gboolean start_bottom = 0; credits = attribution_format (ATTRIBUTION, message); diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c index 553fba0895..b531780287 100644 --- a/mail/em-filter-folder-element.c +++ b/mail/em-filter-folder-element.c @@ -156,7 +156,7 @@ validate(FilterElement *fe) } } -static int +static gint folder_eq(FilterElement *fe, FilterElement *cm) { return FILTER_ELEMENT_CLASS(parent_class)->eq(fe, cm) @@ -191,7 +191,7 @@ xml_encode(FilterElement *fe) return value; } -static int +static gint xml_decode(FilterElement *fe, xmlNodePtr node) { EMFilterFolderElement *ff = (EMFilterFolderElement *)fe; diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c index 03d0028b6e..47c5e4d0d2 100644 --- a/mail/em-filter-rule.c +++ b/mail/em-filter-rule.c @@ -171,7 +171,7 @@ em_filter_rule_build_action(EMFilterRule *fr, GString *out) g_string_append(out, ")\n"); } -static int +static gint validate(FilterRule *fr) { EMFilterRule *ff =(EMFilterRule *)fr; @@ -190,7 +190,7 @@ validate(FilterRule *fr) return valid; } -static int +static gint list_eq(GList *al, GList *bl) { gint truth = TRUE; @@ -206,7 +206,7 @@ list_eq(GList *al, GList *bl) return truth && al == NULL && bl == NULL; } -static int +static gint filter_eq(FilterRule *fr, FilterRule *cm) { return FILTER_RULE_CLASS(parent_class)->eq(fr, cm) @@ -262,7 +262,7 @@ load_set(xmlNodePtr node, EMFilterRule *ff, RuleContext *rc) } } -static int +static gint xml_decode(FilterRule *fr, xmlNodePtr node, RuleContext *rc) { EMFilterRule *ff =(EMFilterRule *)fr; diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index 126cbe2a50..1fd5a518ad 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -151,7 +151,7 @@ em_filter_source_element_new(void) return (EMFilterSourceElement *)g_object_new(em_filter_source_element_get_type(), NULL, NULL); } -static int +static gint source_eq(FilterElement *fe, FilterElement *cm) { EMFilterSourceElement *fs = (EMFilterSourceElement *)fe, *cs = (EMFilterSourceElement *)cm; diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 50add07fb7..085521febd 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1105,7 +1105,7 @@ static MailMsgInfo vfolder_setup_info = { }; /* sources_uri should be camel uri's */ -static int +static gint vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList *sources_folder, CamelOperation *cancel) { struct _setup_msg *m; @@ -1140,8 +1140,8 @@ emfb_search_search_activated(ESearchBar *esb, EMFolderBrowser *emfb) CamelFolder *folder; CamelStore *store; GPtrArray *folders; - GList *folder_list_account = NULL ; - GList *l, *folder_list = NULL ; + GList *folder_list_account = NULL; + GList *l, *folder_list = NULL; CamelException *ex; ex = camel_exception_new (); @@ -1336,7 +1336,7 @@ emfb_search_search_cleared(ESearchBar *esb) /* ********************************************************************** */ -static int +static gint emfb_list_key_press(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *ev, EMFolderBrowser *emfb) { gboolean state, folder_choose = TRUE; @@ -2224,7 +2224,7 @@ emfb_activate(EMFolderView *emfv, BonoboUIComponent *uic, gint act) bonobo_ui_component_add_listener(uic, "ViewPreview", emfb_view_preview, emfv); /* Stop button */ - state = mail_msg_active((unsigned int)-1); + state = mail_msg_active((guint)-1); bonobo_ui_component_set_prop(uic, "/commands/MailStop", "sensitive", state?"1":"0", NULL); /* HideDeleted */ diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index db8bff5315..429b409b54 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -126,7 +126,7 @@ emfp_free(EConfig *ec, GSList *items, gpointer data) g_free (prop_data); } -static int +static gint add_numbered_row (GtkTable *table, gint row, const gchar *description, const gchar *format, gint num) { gchar *str; @@ -197,7 +197,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, else descr = g_strdup_printf (_("Quota usage")); - procs = (int) ((((double) info->used) / ((double) info->total)) * 100.0 + 0.5); + procs = (gint) ((((double) info->used) / ((double) info->total)) * 100.0 + 0.5); row = add_numbered_row (GTK_TABLE (table), row, descr, "%d%%", procs); diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index f04cf03720..89a0e77b66 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -173,7 +173,7 @@ em_folder_tree_model_class_init (EMFolderTreeModelClass *klass) G_TYPE_STRING); } -static int +static gint sort_cb (GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer user_data) { gchar *aname, *bname; diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 182a40df36..d765c2de7b 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -580,7 +580,7 @@ emft_expand_node (EMFolderTreeModel *model, const gchar *key, EMFolderTree *emft CamelStore *store; const gchar *p; gchar *uid; - size_t n; + gsize n; struct _selected_uri *u; if (!(p = strchr (key, '/'))) @@ -1340,7 +1340,7 @@ tree_autoscroll (EMFolderTree *emft) GdkRectangle rect; GdkWindow *window; gint offset, y; - float value; + gfloat value; /* get the y pointer position relative to the treeview */ window = gtk_tree_view_get_bin_window (priv->treeview); @@ -2256,7 +2256,7 @@ emft_tree_button_press (GtkTreeView *treeview, GdkEventButton *event, EMFolderTr if (event->button != 3 && !(event->button == 1 && event->type == GDK_2BUTTON_PRESS)) return FALSE; - if (!gtk_tree_view_get_path_at_pos (treeview, (int) event->x, (int) event->y, &tree_path, NULL, NULL, NULL)) + if (!gtk_tree_view_get_path_at_pos (treeview, (gint) event->x, (gint) event->y, &tree_path, NULL, NULL, NULL)) return FALSE; /* select/focus the row that was right-clicked or double-clicked */ diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index b9fda4f9b0..f5378684b0 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -434,7 +434,7 @@ em_folder_utils_rename_folder (CamelFolder *folder) const gchar *p; CamelStore *local; gboolean done = FALSE; - size_t base_len; + gsize base_len; local = mail_component_peek_local_store (NULL); @@ -446,7 +446,7 @@ em_folder_utils_rename_folder (CamelFolder *folder) } if ((p = strrchr (folder->full_name, '/'))) - base_len = (size_t) (p - folder->full_name); + base_len = (gsize) (p - folder->full_name); else base_len = 0; @@ -574,7 +574,7 @@ static MailMsgInfo create_folder_info = { }; -static int +static gint emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done) (CamelFolderInfo *fi, gpointer user_data), gpointer user_data) { gchar *name, *namebuf = NULL; diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 4a23dceb03..466dc34a63 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -2425,7 +2425,7 @@ mst_free (struct mst_t *mst) g_free (mst); } -static int +static gint do_mark_seen (gpointer user_data) { struct mst_t *mst = user_data; @@ -2614,7 +2614,7 @@ emfv_list_double_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent em_folder_view_open_selected(emfv); } -static int +static gint emfv_list_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event, EMFolderView *emfv) { emfv_popup(emfv, event, FALSE); @@ -2622,7 +2622,7 @@ emfv_list_right_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent return TRUE; } -static int +static gint emfv_list_key_press(ETree *tree, gint row, ETreePath path, gint col, GdkEvent *ev, EMFolderView *emfv) { GPtrArray *uids; @@ -2807,7 +2807,7 @@ emfv_append_menu (EMPopup *des_emp, GtkMenu *des_menu, EMPopup *src_emp, GtkMenu return des_menu; } -static int +static gint emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const gchar *uri, CamelMimePart *part, EMFolderView *emfv) { GtkMenu *menu = NULL; diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c index ad7cbd7144..61cc515684 100644 --- a/mail/em-format-hook.c +++ b/mail/em-format-hook.c @@ -157,7 +157,7 @@ error: return NULL; } -static int +static gint emfh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index 28e67f0f18..3a75bfb59a 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -481,7 +481,7 @@ efhd_get_uri_puri (GtkWidget *html, GdkEventButton *event, EMFormatHTMLDisplay * g_free (img_url); } -static int +static gint efhd_html_button_press_event (GtkWidget *widget, GdkEventButton *event, EMFormatHTMLDisplay *efhd) { gchar *uri = NULL; diff --git a/mail/em-format-html.c b/mail/em-format-html.c index 9a2c6a184b..c62bd3e569 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -358,7 +358,7 @@ em_format_html_file_part(EMFormatHTML *efh, const gchar *mime_type, const gchar /* all this api is a pain in the bum ... */ EMFormatHTMLPObject * -em_format_html_add_pobject(EMFormatHTML *efh, size_t size, const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func) +em_format_html_add_pobject(EMFormatHTML *efh, gsize size, const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func) { EMFormatHTMLPObject *pobj; @@ -468,7 +468,7 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled) CamelURL *url; CamelContentType *content_type; CamelHttpStream *tmp_stream; - ssize_t n, total = 0, pc_complete = 0, nread = 0; + gssize n, total = 0, pc_complete = 0, nread = 0; gchar buffer[1500]; const gchar *length; @@ -994,7 +994,7 @@ efh_message_external(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part s = d = url; while (*s) { /* FIXME: use camel_isspace */ - if (!isspace ((unsigned char)*s)) + if (!isspace ((guchar)*s)) *d++ = *s; s++; } diff --git a/mail/em-format-html.h b/mail/em-format-html.h index 776a5fb9c9..81a6811de5 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -247,7 +247,7 @@ CamelMimePart * em_format_html_file_part (EMFormatHTML *efh, /* for implementers */ EMFormatHTMLPObject * em_format_html_add_pobject (EMFormatHTML *efh, - size_t size, + gsize size, const gchar *classid, CamelMimePart *part, EMFormatHTMLPObjectFunc func); diff --git a/mail/em-format.c b/mail/em-format.c index ed7d48ea06..99c71ec1e6 100644 --- a/mail/em-format.c +++ b/mail/em-format.c @@ -324,7 +324,7 @@ em_format_fallback_handler(EMFormat *emf, const gchar *mime_type) if (s == NULL) mime = (gchar *)mime_type; else { - size_t len = (s-mime_type)+1; + gsize len = (s-mime_type)+1; mime = alloca(len+2); strncpy(mime, mime_type, len); @@ -359,7 +359,7 @@ em_format_fallback_handler(EMFormat *emf, const gchar *mime_type) * are resolved by forgetting the old PURI in the global index. **/ EMFormatPURI * -em_format_add_puri(EMFormat *emf, size_t size, const gchar *cid, CamelMimePart *part, EMFormatPURIFunc func) +em_format_add_puri(EMFormat *emf, gsize size, const gchar *cid, CamelMimePart *part, EMFormatPURIFunc func) { EMFormatPURI *puri; const gchar *tmp; @@ -1121,8 +1121,8 @@ em_format_format_text(EMFormat *emf, CamelStream *stream, CamelDataWrapper *dw) const gchar *charset = NULL; CamelMimeFilterWindows *windows = NULL; CamelStream *mem_stream = NULL; - size_t size; - size_t max; + gsize size; + gsize max; if (emf->charset) { charset = emf->charset; diff --git a/mail/em-format.h b/mail/em-format.h index 3602e5b75e..35569a4bc4 100644 --- a/mail/em-format.h +++ b/mail/em-format.h @@ -316,7 +316,7 @@ void em_format_class_remove_handler(EMFormatClass *emfc, EMFormatHandler *info); const EMFormatHandler *em_format_fallback_handler(EMFormat *emf, const gchar *mime_type); /* puri is short for pending uri ... really */ -EMFormatPURI *em_format_add_puri(EMFormat *emf, size_t size, const gchar *uri, CamelMimePart *part, EMFormatPURIFunc func); +EMFormatPURI *em_format_add_puri(EMFormat *emf, gsize size, const gchar *uri, CamelMimePart *part, EMFormatPURIFunc func); EMFormatPURI *em_format_find_visible_puri(EMFormat *emf, const gchar *uri); EMFormatPURI *em_format_find_puri(EMFormat *emf, const gchar *uri); void em_format_clear_puri_tree(EMFormat *emf); diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c index a3284ab33e..501a2b7bad 100644 --- a/mail/em-html-stream.c +++ b/mail/em-html-stream.c @@ -38,7 +38,7 @@ static void em_html_stream_class_init (EMHTMLStreamClass *klass); static void em_html_stream_init (CamelObject *object); static void em_html_stream_finalize (CamelObject *object); -static ssize_t emhs_sync_write(CamelStream *stream, const gchar *buffer, size_t n); +static gssize emhs_sync_write(CamelStream *stream, const gchar *buffer, gsize n); static gint emhs_sync_close(CamelStream *stream); static gint emhs_sync_flush(CamelStream *stream); @@ -103,8 +103,8 @@ em_html_stream_finalize (CamelObject *object) } } -static ssize_t -emhs_sync_write(CamelStream *stream, const gchar *buffer, size_t n) +static gssize +emhs_sync_write(CamelStream *stream, const gchar *buffer, gsize n) { EMHTMLStream *emhs = EM_HTML_STREAM (stream); @@ -116,10 +116,10 @@ emhs_sync_write(CamelStream *stream, const gchar *buffer, size_t n) gtk_html_stream_write(emhs->html_stream, buffer, n); - return (ssize_t) n; + return (gssize) n; } -static int +static gint emhs_sync_flush(CamelStream *stream) { EMHTMLStream *emhs = (EMHTMLStream *)stream; @@ -132,7 +132,7 @@ emhs_sync_flush(CamelStream *stream) return 0; } -static int +static gint emhs_sync_close(CamelStream *stream) { EMHTMLStream *emhs = (EMHTMLStream *)stream; diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c index 91dc5e10ca..384d79846f 100644 --- a/mail/em-icon-stream.c +++ b/mail/em-icon-stream.c @@ -50,7 +50,7 @@ static void em_icon_stream_class_init (EMIconStreamClass *klass); static void em_icon_stream_init (CamelObject *object); static void em_icon_stream_finalize (CamelObject *object); -static ssize_t emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n); +static gssize emis_sync_write(CamelStream *stream, const gchar *buffer, gsize n); static gint emis_sync_close(CamelStream *stream); static gint emis_sync_flush(CamelStream *stream); @@ -132,8 +132,8 @@ em_icon_stream_finalize(CamelObject *object) emis_cleanup(emis); } -static ssize_t -emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n) +static gssize +emis_sync_write(CamelStream *stream, const gchar *buffer, gsize n) { EMIconStream *emis = EM_ICON_STREAM (stream); @@ -145,10 +145,10 @@ emis_sync_write(CamelStream *stream, const gchar *buffer, size_t n) return -1; } - return (ssize_t) n; + return (gssize) n; } -static int +static gint emis_sync_flush(CamelStream *stream) { return 0; @@ -190,7 +190,7 @@ emis_fit(GdkPixbuf *pixbuf, gint maxwidth, gint maxheight, gint *scale) return mini; } -static int +static gint emis_sync_close(CamelStream *stream) { EMIconStream *emis = (EMIconStream *)stream; diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index bdacda912e..71d16e98f7 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -39,8 +39,8 @@ static void em_inline_filter_class_init (EMInlineFilterClass *klass); static void em_inline_filter_init (CamelObject *object); static void em_inline_filter_finalize (CamelObject *object); -static void emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace); -static void emif_complete(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace); +static void emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); +static void emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace); static void emif_reset(CamelMimeFilter *f); static CamelMimeFilterClass *parent_class = NULL; @@ -190,8 +190,8 @@ emif_add_part(EMInlineFilter *emif, const gchar *data, gint len) emif->parts = g_slist_append(emif->parts, part); } -static int -emif_scan(CamelMimeFilter *f, gchar *in, size_t len, gint final) +static gint +emif_scan(CamelMimeFilter *f, gchar *in, gsize len, gint final) { EMInlineFilter *emif = (EMInlineFilter *)f; gchar *inptr = in, *inend = in+len; @@ -337,7 +337,7 @@ emif_scan(CamelMimeFilter *f, gchar *in, size_t len, gint final) } static void -emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace) +emif_filter(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { emif_scan(f, in, len, FALSE); @@ -347,7 +347,7 @@ emif_filter(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar ** } static void -emif_complete(CamelMimeFilter *f, gchar *in, size_t len, size_t prespace, gchar **out, size_t *outlen, size_t *outprespace) +emif_complete(CamelMimeFilter *f, gchar *in, gsize len, gsize prespace, gchar **out, gsize *outlen, gsize *outprespace) { emif_scan(f, in, len, TRUE); diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c index a0a2a205ce..d032823bed 100644 --- a/mail/em-junk-hook.c +++ b/mail/em-junk-hook.c @@ -267,7 +267,7 @@ error: return NULL; } -static int +static gint emjh_construct(EPluginHook *eph, EPlugin *ep, xmlNodePtr root) { xmlNodePtr node; diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c index ac6f3db5d9..12b2996b70 100644 --- a/mail/em-mailer-prefs.c +++ b/mail/em-mailer-prefs.c @@ -730,7 +730,7 @@ mark_seen_timeout_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) { gint timeout; - timeout = (int) (gtk_spin_button_get_value (prefs->timeout) * 1000.0); + timeout = (gint) (gtk_spin_button_get_value (prefs->timeout) * 1000.0); gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/mark_seen_timeout", timeout, NULL); } @@ -739,7 +739,7 @@ address_compress_count_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) { gint count; - count = (int) gtk_spin_button_get_value (prefs->address_count); + count = (gint) gtk_spin_button_get_value (prefs->address_count); gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/address_count", count, NULL); } @@ -749,13 +749,13 @@ mlimit_count_changed (GtkSpinButton *spin, EMMailerPrefs *prefs) { gint count; - count = (int) gtk_spin_button_get_value (prefs->mlimit_count); + count = (gint) gtk_spin_button_get_value (prefs->mlimit_count); gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/message_text_part_limit", count, NULL); } static void -spin_button_init (EMMailerPrefs *prefs, GtkSpinButton *spin, const gchar *key, float div, GCallback value_changed) +spin_button_init (EMMailerPrefs *prefs, GtkSpinButton *spin, const gchar *key, gfloat div, GCallback value_changed) { GError *err = NULL; double min, max; diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c index 9299f3754f..fec31575b7 100644 --- a/mail/em-message-browser.c +++ b/mail/em-message-browser.c @@ -195,7 +195,7 @@ emmb_window_size_allocate (GtkWidget *widget, g_object_unref (client); } -static int +static gint emmb_key_press_event_cb (EMMessageBrowser *emmb, GdkEventKey *event) { diff --git a/mail/em-migrate.c b/mail/em-migrate.c index 3d32783298..1428013891 100644 --- a/mail/em-migrate.c +++ b/mail/em-migrate.c @@ -101,7 +101,7 @@ emm_load_xml (const gchar *dirname, const gchar *filename) return doc; } -static int +static gint emm_save_xml (xmlDocPtr doc, const gchar *dirname, const gchar *filename) { gchar *path; @@ -380,7 +380,7 @@ parse_lsub (const gchar *lsub, gchar *dir_sep) return NULL; } -static int +static gint read_imap_storeinfo (struct _account_info_1_0 *si) { FILE *storeinfo; @@ -476,7 +476,7 @@ read_imap_storeinfo (struct _account_info_1_0 *si) return 0; } -static int +static gint load_accounts_1_0 (xmlDocPtr doc) { xmlNodePtr source; @@ -539,7 +539,7 @@ load_accounts_1_0 (xmlDocPtr doc) return 0; } -static int +static gint em_migrate_1_0 (const gchar *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) { accounts_1_0 = g_hash_table_new_full ( @@ -559,7 +559,7 @@ em_migrate_1_0 (const gchar *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr fi } /* 1.2 upgrade functions */ -static int +static gint is_xml1encoded (const gchar *txt) { const guchar *p; @@ -653,7 +653,7 @@ utf8_reencode (const gchar *txt) } } -static int +static gint upgrade_xml_1_2_rec (xmlNodePtr node) { const gchar *value_tags[] = { "string", "address", "regex", "file", "command", NULL }; @@ -721,7 +721,7 @@ upgrade_xml_1_2_rec (xmlNodePtr node) return 0; } -static int +static gint em_upgrade_xml_1_2 (xmlDocPtr doc) { xmlNodePtr root; @@ -963,7 +963,7 @@ static struct { }; /* remaps mail config from bconf to gconf */ -static int +static gint bconf_import(GConfClient *gconf, xmlDocPtr config_xmldb) { xmlNodePtr source; @@ -1017,7 +1017,7 @@ bconf_import(GConfClient *gconf, xmlDocPtr config_xmldb) return 0; } -static int +static gint em_migrate_1_2(const gchar *evolution_dir, xmlDocPtr config_xmldb, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) { GConfClient *gconf; @@ -1180,7 +1180,7 @@ em_migrate_set_progress (double percent) { gchar text[5]; - snprintf (text, sizeof (text), "%d%%", (int) (percent * 100.0f)); + snprintf (text, sizeof (text), "%d%%", (gint) (percent * 100.0f)); gtk_progress_bar_set_fraction (progress, percent); gtk_progress_bar_set_text (progress, text); @@ -1239,7 +1239,7 @@ is_mail_folder (const gchar *metadata) return FALSE; } -static int +static gint get_local_et_expanded (const gchar *dirname) { xmlNodePtr node; @@ -1357,13 +1357,13 @@ static gint open_flags[3] = { O_WRONLY | O_CREAT | O_APPEND, }; -static int +static gint cp (const gchar *src, const gchar *dest, gboolean show_progress, gint mode) { guchar readbuf[65536]; - ssize_t nread, nwritten; + gssize nread, nwritten; gint errnosav, readfd, writefd; - size_t total = 0; + gsize total = 0; struct stat st; struct utimbuf ut; @@ -1439,12 +1439,12 @@ cp (const gchar *src, const gchar *dest, gboolean show_progress, gint mode) #ifndef G_OS_WIN32 -static int +static gint cp_r (const gchar *src, const gchar *dest, const gchar *pattern, gint mode) { GString *srcpath, *destpath; struct dirent *dent; - size_t slen, dlen; + gsize slen, dlen; struct stat st; DIR *dir; @@ -1524,7 +1524,7 @@ mbox_build_filename (GString *path, const gchar *toplevel_dir, const gchar *full } } -static int +static gint em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar *full_name, CamelException *ex) { CamelFolder *old_folder = NULL, *new_folder = NULL; @@ -1556,7 +1556,7 @@ em_migrate_folder(EMMigrateSession *session, const gchar *dirname, const gchar * /* Manually copy local mbox files, its much faster */ if (!strncmp (uri, "mbox:", 5)) { static const gchar *meta_ext[] = { ".summary", ".ibex.index", ".ibex.index.data" }; - size_t slen, dlen; + gsize slen, dlen; FILE *fp; gchar *p; gint mode; @@ -1722,7 +1722,7 @@ fatal: return res; } -static int +static gint em_migrate_dir (EMMigrateSession *session, const gchar *dirname, const gchar *full_name, CamelException *ex) { gchar *path; @@ -1772,7 +1772,7 @@ em_migrate_dir (EMMigrateSession *session, const gchar *dirname, const gchar *fu return res; } -static int +static gint em_migrate_local_folders_1_4 (EMMigrateSession *session, CamelException *ex) { struct dirent *dent; @@ -1967,12 +1967,12 @@ em_upgrade_accounts_1_4 (void) mail_config_save_accounts (); } -static int +static gint em_migrate_pop_uid_caches_1_4 (const gchar *evolution_dir, CamelException *ex) { GString *oldpath, *newpath; struct dirent *dent; - size_t olen, nlen; + gsize olen, nlen; gchar *cache_dir; DIR *dir; gint res = 0; @@ -2046,7 +2046,7 @@ em_migrate_pop_uid_caches_1_4 (const gchar *evolution_dir, CamelException *ex) return res; } -static int +static gint em_migrate_imap_caches_1_4 (const gchar *evolution_dir, CamelException *ex) { gchar *src, *dest; @@ -2069,11 +2069,11 @@ em_migrate_imap_caches_1_4 (const gchar *evolution_dir, CamelException *ex) return 0; } -static int +static gint em_migrate_folder_expand_state_1_4 (const gchar *evolution_dir, CamelException *ex) { GString *srcpath, *destpath; - size_t slen, dlen, rlen; + gsize slen, dlen, rlen; gchar *evo14_mbox_root; struct dirent *dent; struct stat st; @@ -2167,11 +2167,11 @@ em_migrate_folder_expand_state_1_4 (const gchar *evolution_dir, CamelException * return 0; } -static int +static gint em_migrate_folder_view_settings_1_4 (const gchar *evolution_dir, CamelException *ex) { GString *srcpath, *destpath; - size_t slen, dlen, rlen; + gsize slen, dlen, rlen; gchar *evo14_mbox_root; struct dirent *dent; struct stat st; @@ -2207,7 +2207,7 @@ em_migrate_folder_view_settings_1_4 (const gchar *evolution_dir, CamelException while ((dent = readdir (dir))) { gchar *full_name, *inptr, *buf = NULL; const gchar *filename, *ext; - size_t prelen = 0; + gsize prelen = 0; GString *new; if (dent->d_name[0] == '.') @@ -2367,7 +2367,7 @@ e_path_to_physical (const gchar *prefix, const gchar *vpath) return ppath; } -static int +static gint em_migrate_imap_cmeta_1_4(const gchar *evolution_dir, CamelException *ex) { GConfClient *gconf; @@ -2480,7 +2480,7 @@ remove_system_searches(xmlDocPtr searches) } } -static int +static gint em_migrate_1_4 (const gchar *evolution_dir, xmlDocPtr filters, xmlDocPtr vfolders, CamelException *ex) { EMMigrateSession *session; @@ -2600,7 +2600,7 @@ em_update_accounts_2_11 (void) #endif /* !G_OS_WIN32 */ -static int +static gint emm_setup_initial(const gchar *evolution_dir) { GDir *dir; diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c index 1b977e975f..65400027ff 100644 --- a/mail/em-stripsig-filter.c +++ b/mail/em-stripsig-filter.c @@ -34,10 +34,10 @@ static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass); static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass); -static void filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace); -static void filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace); +static void filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace); +static void filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace); static void filter_reset (CamelMimeFilter *filter); @@ -83,8 +83,8 @@ em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass) } static void -strip_signature (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace, gint flush) +strip_signature (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace, gint flush) { EMStripSigFilter *stripsig = (EMStripSigFilter *) filter; register const gchar *inptr = in; @@ -132,15 +132,15 @@ strip_signature (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace } static void -filter_filter (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace) +filter_filter (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, FALSE); } static void -filter_complete (CamelMimeFilter *filter, gchar *in, size_t len, size_t prespace, - gchar **out, size_t *outlen, size_t *outprespace) +filter_complete (CamelMimeFilter *filter, gchar *in, gsize len, gsize prespace, + gchar **out, gsize *outlen, gsize *outprespace) { strip_signature (filter, in, len, prespace, out, outlen, outprespace, TRUE); } diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 95714a948b..eaac3b4d71 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -245,7 +245,7 @@ static MailMsgInfo sub_subscribe_folder_info = { }; /* spath is tree path in string form */ -static int +static gint sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, gint state, const gchar *spath) { struct _zsubscribe_msg *m; @@ -420,7 +420,7 @@ static MailMsgInfo sub_folderinfo_info = { (MailMsgFreeFunc) sub_folderinfo_free }; -static int +static gint sub_queue_fill_level(EMSubscribe *sub, EMSubscribeNode *node) { struct _emse_folderinfo_msg *m; diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index 138932cfc7..7e93b33dde 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -138,7 +138,7 @@ emss_stream_write (CamelStream *stream, const gchar *string, gsize len) return (gssize) len; } -static int +static gint emss_stream_flush (CamelStream *stream) { EMSyncStream *emss = EM_SYNC_STREAM (stream); @@ -154,7 +154,7 @@ emss_stream_flush (CamelStream *stream) return 0; } -static int +static gint emss_stream_close (CamelStream *stream) { EMSyncStream *emss = EM_SYNC_STREAM (stream); diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h index fc687fa462..16cdc272d1 100644 --- a/mail/em-sync-stream.h +++ b/mail/em-sync-stream.h @@ -61,8 +61,8 @@ struct _EMSyncStreamClass { gssize (*sync_write) (CamelStream *stream, const gchar *string, gsize len); - int (*sync_close) (CamelStream *stream); - int (*sync_flush) (CamelStream *stream); + gint (*sync_close) (CamelStream *stream); + gint (*sync_flush) (CamelStream *stream); }; CamelType em_sync_stream_get_type (void); diff --git a/mail/em-utils.c b/mail/em-utils.c index 7204d761c3..207c96718a 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -472,7 +472,7 @@ get_unique_file_names (GSList *parts) /* if we have an extension, then place number before it (at p is ".ext"), otherwise just append number in brackets */ if (p) - new_name = g_strdup_printf ("%.*s(%d)%s", (int) (p - name), name, counter, p); + new_name = g_strdup_printf ("%.*s(%d)%s", (gint) (p - name), name, counter, p); else new_name = g_strdup_printf ("%s(%d)", name, counter); @@ -953,7 +953,7 @@ em_utils_flag_for_followup_completed (GtkWidget *parent, CamelFolder *folder, GP /* This kind of sucks, because for various reasons most callers need to run synchronously in the gui thread, however this could take a long, blocking time, to run */ -static int +static gint em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStream *stream) { CamelStreamFilter *filtered_stream; @@ -998,7 +998,7 @@ em_utils_write_messages_to_stream(CamelFolder *folder, GPtrArray *uids, CamelStr /* This kind of sucks, because for various reasons most callers need to run synchronously in the gui thread, however this could take a long, blocking time, to run */ -static int +static gint em_utils_read_messages_from_stream(CamelFolder *folder, CamelStream *stream) { CamelException *ex = camel_exception_new(); @@ -1533,7 +1533,7 @@ em_utils_folder_is_outbox(CamelFolder *folder, const gchar *uri) void em_utils_adjustment_page(GtkAdjustment *adj, gboolean down) { - float page_size = adj->page_size - adj->step_increment; + gfloat page_size = adj->page_size - adj->step_increment; if (down) { if (adj->value < adj->upper - adj->page_size - page_size) @@ -1606,7 +1606,7 @@ em_utils_get_proxy_uri (const gchar *pUri) * Return Value: The part in displayable html format. **/ gchar * -em_utils_part_to_html(CamelMimePart *part, ssize_t *len, EMFormat *source) +em_utils_part_to_html(CamelMimePart *part, gssize *len, EMFormat *source) { EMFormatQuote *emfq; CamelStreamMem *mem; @@ -1656,7 +1656,7 @@ em_utils_part_to_html(CamelMimePart *part, ssize_t *len, EMFormat *source) * Return value: The html version. **/ gchar * -em_utils_message_to_html(CamelMimeMessage *message, const gchar *credits, guint32 flags, ssize_t *len, EMFormat *source, const gchar *append) +em_utils_message_to_html(CamelMimeMessage *message, const gchar *credits, guint32 flags, gssize *len, EMFormat *source, const gchar *append) { EMFormatQuote *emfq; CamelStreamMem *mem; diff --git a/mail/em-utils.h b/mail/em-utils.h index 76674bea11..19a0da6788 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -91,8 +91,8 @@ void em_utils_adjustment_page(struct _GtkAdjustment *adj, gboolean down); gchar *em_utils_get_proxy_uri (const gchar *uri); /* FIXME: should this have an override charset? */ -gchar *em_utils_part_to_html(struct _CamelMimePart *part, ssize_t *len, struct _EMFormat *source); -gchar *em_utils_message_to_html(struct _CamelMimeMessage *msg, const gchar *credits, guint32 flags, ssize_t *len, struct _EMFormat *source, const gchar *append); +gchar *em_utils_part_to_html(struct _CamelMimePart *part, gssize *len, struct _EMFormat *source); +gchar *em_utils_message_to_html(struct _CamelMimeMessage *msg, const gchar *credits, guint32 flags, gssize *len, struct _EMFormat *source, const gchar *append); void em_utils_expunge_folder (struct _GtkWidget *parent, struct _CamelFolder *folder); void em_utils_empty_trash (struct _GtkWidget *parent); diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index d3090a672d..dea8b3ab7c 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -206,7 +206,7 @@ em_vfolder_rule_next_source(EMVFolderRule *vr, const gchar *last) return NULL; } -static int +static gint validate(FilterRule *fr) { g_return_val_if_fail(fr != NULL, 0); @@ -228,7 +228,7 @@ validate(FilterRule *fr) return FILTER_RULE_CLASS(parent_class)->validate(fr); } -static int +static gint list_eq(GList *al, GList *bl) { gint truth = TRUE; @@ -244,7 +244,7 @@ list_eq(GList *al, GList *bl) return truth && al == NULL && bl == NULL; } -static int +static gint vfolder_eq(FilterRule *fr, FilterRule *cm) { return FILTER_RULE_CLASS(parent_class)->eq(fr, cm) @@ -291,7 +291,7 @@ set_with(EMVFolderRule *vr, const gchar *name) vr->with = 0; } -static int +static gint xml_decode(FilterRule *fr, xmlNodePtr node, struct _RuleContext *f) { xmlNodePtr set, work; diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 6e65418441..1c28e2d82d 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -281,7 +281,7 @@ static MailMsgInfo elm_import_info = { (MailMsgFreeFunc) elm_import_free }; -static int +static gint mail_importer_elm_import(EImport *ei, EImportTarget *target) { struct _elm_import_msg *m; diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index ab5cf18e9b..daecfaee53 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -237,7 +237,7 @@ import_mbox_exec (struct _import_mbox_msg *m) guint32 flags = 0; if (st.st_size > 0) - pc = (int)(100.0 * ((double)camel_mime_parser_tell(mp) / (double)st.st_size)); + pc = (gint)(100.0 * ((double)camel_mime_parser_tell(mp) / (double)st.st_size)); camel_operation_progress(NULL, pc); msg = camel_mime_message_new(); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 0c5b5fd92e..84c29b24c5 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -109,7 +109,7 @@ import_contact(EBook *book, gchar *line) GList *list; /*EContactName *name;*/ EContact *card; - size_t len; + gsize len; card = e_contact_new(); strings = g_strsplit(line, "\t", 5); @@ -168,7 +168,7 @@ import_contacts(void) gchar *name; GString *line; FILE *fp; - size_t offset; + gsize offset; printf("importing pine addressbook\n"); @@ -197,7 +197,7 @@ import_contacts(void) g_string_set_size(line, 256); offset = 0; while (fgets(line->str+offset, 256, fp)) { - size_t len; + gsize len; len = strlen(line->str+offset)+offset; if (line->str[len-1] == '\n') @@ -324,7 +324,7 @@ static MailMsgInfo pine_import_info = { (MailMsgFreeFunc) pine_import_free }; -static int +static gint mail_importer_pine_import(EImport *ei, EImportTarget *target) { struct _pine_import_msg *m; diff --git a/mail/mail-component.c b/mail/mail-component.c index bda9e7ea18..8d72fb590c 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -414,7 +414,7 @@ folder_selected_cb (EMFolderTree *emft, const gchar *path, const gchar *uri, gui } } -static int +static gint check_autosave(gpointer data) { e_msg_composer_check_autosave(NULL); @@ -622,7 +622,7 @@ view_changed_timeout_remove (EComponentView *component_view) } } -static int +static gint view_changed_timeout(gpointer d) { EComponentView *component_view = d; @@ -905,7 +905,7 @@ impl_quit(PortableServer_Servant servant, CORBA_Environment *ev) /* Falls through */ case MC_QUIT_THREADS: /* should we keep cancelling? */ - if (mail_msg_active((unsigned int)-1)) + if (mail_msg_active((guint)-1)) return FALSE; mail_session_shutdown (); @@ -945,7 +945,7 @@ impl__get_userCreatableItems (PortableServer_Servant servant, CORBA_Environment return list; } -static int +static gint create_item(const gchar *type, EMFolderTreeModel *model, const gchar *uri, gpointer tree) { if (strcmp(type, "message") == 0) { diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index a6c4b800ad..6ab9187e49 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -684,7 +684,7 @@ get_folders(CamelFolderInfo *fi, GPtrArray *folders) } } -static int +static gint folder_cmp(gconstpointer ap, gconstpointer bp) { const CamelFolderInfo *a = ((CamelFolderInfo **)ap)[0]; diff --git a/mail/mail-mt.c b/mail/mail-mt.c index f820f78a76..bc94d4538f 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -382,7 +382,7 @@ gint mail_msg_active(guint msgid) gint active; MAIL_MT_LOCK(mail_msg_lock); - if (msgid == (unsigned int)-1) + if (msgid == (guint)-1) active = g_hash_table_size(mail_msg_active_table) > 0; else active = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)) != NULL; @@ -686,7 +686,7 @@ do_async_event(struct _proxy_msg *m) g_mutex_unlock(m->ea->lock); } -static int +static gint idle_async_event(gpointer mm) { do_async_event(mm); @@ -829,7 +829,7 @@ do_call(struct _call_msg *m) case MAIL_CALL_p_ppippp: p1 = va_arg(ap, gpointer ); p2 = va_arg(ap, gpointer ); - i1 = va_arg(ap, int); + i1 = va_arg(ap, gint); p3 = va_arg(ap, gpointer ); p4 = va_arg(ap, gpointer ); p5 = va_arg(ap, gpointer ); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index b26203c6da..f20d71f84e 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -93,7 +93,7 @@ typedef enum { SEND_SEND, /* sender */ SEND_UPDATE, /* imap-like 'just update folder info' */ SEND_INVALID -} send_info_t ; +} send_info_t; typedef enum { SEND_ACTIVE, @@ -254,7 +254,7 @@ dialog_response(GtkDialog *gd, gint button, struct _send_data *data) } } -static int +static gint operation_status_timeout(gpointer data) { struct _send_info *info = data; diff --git a/mail/mail-tools.c b/mail/mail-tools.c index 33c47462f9..d83aace1ea 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -112,7 +112,7 @@ mail_tool_get_local_movemail_path (const guchar *uri, CamelException *ex) safe_uri = (guchar *)g_strdup ((const gchar *)uri); for (c = safe_uri; *c; c++) - if (strchr("/:;=|%&#!*^()\\, ", *c) || !isprint((int) *c)) + if (strchr("/:;=|%&#!*^()\\, ", *c) || !isprint((gint) *c)) *c = '_'; path = g_strdup_printf("%s/spool", mail_component_peek_base_directory(NULL)); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index de79eaa694..ac18f2deb7 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -169,7 +169,7 @@ static MailMsgInfo vfolder_setup_info = { }; /* sources_uri should be camel uri's */ -static int +static gint vfolder_setup(CamelFolder *folder, const gchar *query, GList *sources_uri, GList *sources_folder) { struct _setup_msg *m; @@ -300,7 +300,7 @@ static MailMsgInfo vfolder_adduri_info = { /* uri should be a camel uri */ -static int +static gint vfolder_adduri(const gchar *uri, GList *folders, gint remove) { struct _adduri_msg *m; @@ -331,7 +331,7 @@ mv_find_folder(GList *l, CamelStore *store, const gchar *uri) } /* uri is a camel uri */ -static int +static gint uri_is_ignore(CamelStore *store, const gchar *uri) { EAccountList *accounts; @@ -384,7 +384,7 @@ uri_is_ignore(CamelStore *store, const gchar *uri) } /* so special we never use it */ -static int +static gint uri_is_spethal(CamelStore *store, const gchar *uri) { CamelURL *url; diff --git a/mail/message-list.c b/mail/message-list.c index bfa51250df..2d5b34a270 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -283,7 +283,7 @@ e_mail_address_free (EMailAddress *addr) /* Note: by the time this function is called, the strings have already been normalised which means we can assume all lowercase chars and we can just use strcmp for the final comparison. */ -static int +static gint e_mail_address_compare (gconstpointer address1, gconstpointer address2) { const EMailAddress *addr1 = address1; @@ -345,7 +345,7 @@ e_mail_address_compare (gconstpointer address1, gconstpointer address2) /* Note: by the time this function is called, the strings have already been normalised which means we can assume all lowercase chars and we can just use strcmp for the final comparison. */ -static int +static gint address_compare (gconstpointer address1, gconstpointer address2) { #ifdef SMART_ADDRESS_COMPARE @@ -465,12 +465,12 @@ get_normalised_string (MessageList *message_list, CamelMessageInfo *info, gint c subject += 3; /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; } /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; string = (const gchar *) subject; @@ -851,7 +851,7 @@ message_list_paste(MessageList *ml) /* * SimpleTableModel::col_count */ -static int +static gint ml_column_count (ETreeModel *etm, gpointer data) { return COL_LAST; @@ -1126,7 +1126,7 @@ ml_tree_icon_at (ETreeModel *etm, ETreePath path, gpointer model_data) } /* return true if there are any unread messages in the subtree */ -static int +static gint subtree_unread(MessageList *ml, ETreePath node) { CamelMessageInfo *info; @@ -1221,7 +1221,7 @@ sanitize_recipients (const gchar *string) return g_string_free (recipients, FALSE); } -static int +static gint get_all_labels (CamelMessageInfo *msg_info, gchar **label_str, gboolean get_tags) { GString *str; @@ -1299,7 +1299,7 @@ get_trimmed_subject (CamelMessageInfo *info) subject += 3; /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; } @@ -1311,13 +1311,13 @@ get_trimmed_subject (CamelMessageInfo *info) found_mlist = TRUE; /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; } } while (found_mlist); /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) + while (*subject && isspace ((gint) *subject)) subject++; return subject; @@ -2841,7 +2841,7 @@ build_subtree (MessageList *ml, ETreePath parent, CamelFolderThreadNode *c, gint /* compares a thread tree node with the etable tree node to see if they point to the same object */ -static int +static gint node_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp) { CamelMessageInfo *info; @@ -2856,7 +2856,7 @@ node_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp) #ifndef BROKEN_ETREE /* debug function - compare the two trees to see if they are the same */ -static int +static gint tree_equal(ETreeModel *etm, ETreePath ap, CamelFolderThreadNode *bp) { CamelMessageInfo *info; @@ -2981,7 +2981,7 @@ build_subtree_diff(MessageList *ml, ETreePath parent, ETreePath path, CamelFolde gpointer olduid, oldrow; /* if this is a message row, check/update the row id map */ if (g_hash_table_lookup_extended(ml->uid_rowmap, camel_message_info_uid(bp->message), &olduid, &oldrow)) { - if ((int)oldrow != (*row)) { + if ((gint)oldrow != (*row)) { g_hash_table_insert(ml->uid_rowmap, olduid, (gpointer)(*row)); } } else { @@ -3724,7 +3724,7 @@ message_list_ensure_message (MessageList *ml, const gchar *uid) } /* returns the number of messages displayable *after* expression hiding has taken place */ -unsigned int +guint message_list_length (MessageList *ml) { return ml->hide_unhidden; @@ -3752,7 +3752,7 @@ glib_crapback(gpointer key, gpointer data, gpointer x) } /* returns 0 or 1 depending if there are hidden messages */ -unsigned int +guint message_list_hidden(MessageList *ml) { guint hidden = 0; @@ -3815,7 +3815,7 @@ message_list_hide_uids (MessageList *ml, GPtrArray *uids) uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); g_hash_table_insert (ml->hidden, uid, uid); - for ( ; i < uids->len; i++) { + for (; i < uids->len; i++) { if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) { uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); g_hash_table_insert (ml->hidden, uid, uid); @@ -4482,7 +4482,7 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca } -double +gdouble message_list_get_scrollbar_position (MessageList *ml) { return gtk_range_get_value ((GtkRange *) ((GtkScrolledWindow *) ml)->vscrollbar); diff --git a/mail/message-list.h b/mail/message-list.h index 02bd486920..04a937047a 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -234,7 +234,7 @@ void message_list_ensure_message (MessageList *ml, const gchar *uid); void message_list_save_state (MessageList *ml); -double message_list_get_scrollbar_position (MessageList *ml); +gdouble message_list_get_scrollbar_position (MessageList *ml); void message_list_set_scrollbar_position (MessageList *ml, double pos); #define MESSAGE_LIST_LOCK(m, l) g_mutex_lock(((MessageList *)m)->l) diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index b59154c47e..bf596c17da 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -212,7 +212,7 @@ completed_toggled (GtkToggleButton *button, gpointer user_data) followup->completed_date = 0; } -static int +static gint get_week_start_day (void) { GConfClient *gconf; -- cgit v1.2.3