From a35603766331792d7a6af2d55a18aa92783c8a6d Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Wed, 23 Jul 2003 15:01:26 +0000 Subject: Fix type warnings (folder_browser_toggle_caret_mode): Remove unused * folder-browser.c (message_list_drag_data_get): Fix type warnings (folder_browser_toggle_caret_mode): Remove unused variable. * folder-browser-ui.c (basename): remove unused function * mail-account-gui.c (mail_account_gui_build_extra_conf): Fix warnings * mail-callbacks.c (empty_trash): Remove unused variable. * mail-display.c: #include gal/widgets/e-gui-utils.h for e_auto_kill_popup_menu_on_selection_done * mail-importer.c: #include e-util/e-path.h for e_path_to_physical * mail-session.c (main_play_sound): don't declare filename to be const and then free it. * mail-vfolder.c (vfolder_edit_rule, vfolder_gui_add_rule): Fix casts * message-list.c (build_flat_diff): Fix a typo in the non-BROKEN_ETREE code svn path=/trunk/; revision=21903 --- mail/ChangeLog | 26 ++++++++++++++++++++++++++ mail/folder-browser-ui.c | 13 ------------- mail/folder-browser.c | 13 ++++++------- mail/mail-account-gui.c | 6 +++--- mail/mail-callbacks.c | 1 - mail/mail-display.c | 1 + mail/mail-importer.c | 1 + mail/mail-session.c | 2 +- mail/mail-vfolder.c | 4 ++-- mail/message-list.c | 2 +- 10 files changed, 41 insertions(+), 28 deletions(-) diff --git a/mail/ChangeLog b/mail/ChangeLog index b9ace9de54..c571c9965a 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,29 @@ +2003-07-23 Dan Winship + + * folder-browser.c (message_list_drag_data_get): Fix type warnings + (folder_browser_toggle_caret_mode): Remove unused variable. + + * folder-browser-ui.c (basename): remove unused function + + * mail-account-gui.c (mail_account_gui_build_extra_conf): Fix + warnings + + * mail-callbacks.c (empty_trash): Remove unused variable. + + * mail-display.c: #include gal/widgets/e-gui-utils.h for + e_auto_kill_popup_menu_on_selection_done + + * mail-importer.c: #include e-util/e-path.h for e_path_to_physical + + * mail-session.c (main_play_sound): don't declare filename to be + const and then free it. + + * mail-vfolder.c (vfolder_edit_rule, vfolder_gui_add_rule): Fix + casts + + * message-list.c (build_flat_diff): Fix a typo in the + non-BROKEN_ETREE code + 2003-07-16 Jeffrey Stedfast * mail-format.c (handle_multipart_encrypted): We don't have diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c index a63cce43d1..9ccdb2db79 100644 --- a/mail/folder-browser-ui.c +++ b/mail/folder-browser-ui.c @@ -461,19 +461,6 @@ folder_browser_ui_message_list_unfocus (FolderBrowser *fb) "sensitive", "0", NULL);*/ } -static const char * -basename (const char *path) -{ - const char *base; - - if (!(base = strrchr (path, '/'))) - base = path; - else - base++; - - return base; -} - static void folder_browser_setup_property_menu (FolderBrowser *fb, BonoboUIComponent *uic) { diff --git a/mail/folder-browser.c b/mail/folder-browser.c index 8a15cc4135..a886cfe77d 100644 --- a/mail/folder-browser.c +++ b/mail/folder-browser.c @@ -319,7 +319,7 @@ message_list_drag_data_get (ETree *tree, int row, ETreePath path, int col, CamelMimeMessage *message; CamelMimeFilter *filter; CamelStream *fstream; - CamelStream *stream; + CamelStreamFilter *stream; char *uri_list; int fd; @@ -365,20 +365,20 @@ message_list_drag_data_get (ETree *tree, int row, ETreePath path, int col, stream = camel_stream_filter_new_with_stream (fstream); filter = camel_mime_filter_from_new (); - camel_stream_filter_add (CAMEL_STREAM_FILTER (stream), filter); + camel_stream_filter_add (stream, filter); camel_object_unref (filter); camel_stream_write (fstream, "From - \n", 8); - camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream); + camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), CAMEL_STREAM (stream)); camel_object_unref (message); - camel_stream_flush (stream); + camel_stream_flush (CAMEL_STREAM (stream)); for (i = 1; i < uids->len; i++) { message = camel_folder_get_message (fb->folder, uids->pdata[i], NULL); camel_stream_write (fstream, "From - \n", 8); - camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), stream); + camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message), CAMEL_STREAM (stream)); camel_object_unref (message); - camel_stream_flush (stream); + camel_stream_flush (CAMEL_STREAM (stream)); g_free (uids->pdata[i]); } @@ -1389,7 +1389,6 @@ folder_browser_toggle_caret_mode(BonoboUIComponent *component, const char * state, gpointer user_data) { - FolderBrowser *fb = user_data; GConfClient *gconf; if (type != Bonobo_UIComponent_STATE_CHANGED) diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index a3df16a1f5..f33c026edf 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -946,11 +946,11 @@ mail_account_gui_build_extra_conf (MailAccountGui *gui, const char *url_string) data = entries[i].value; enable = *data++ == 'y'; g_return_if_fail (*data == ':'); - min = strtod (++data, &data); + min = strtod (data + 1, &data); g_return_if_fail (*data == ':'); - def = strtod (++data, &data); + def = strtod (data + 1, &data); g_return_if_fail (*data == ':'); - max = strtod (++data, NULL); + max = strtod (data + 1, NULL); if (url) { const char *val; diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 9945301125..56c32ad662 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -3193,7 +3193,6 @@ empty_trash (BonoboUIComponent *uih, void *user_data, const char *path) { CamelProvider *provider; EAccountList *accounts; - CamelFolder *vtrash; FolderBrowser *fb; CamelException ex; EAccount *account; diff --git a/mail/mail-display.c b/mail/mail-display.c index 4a81e5ae59..9ba07bcc5c 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include diff --git a/mail/mail-importer.c b/mail/mail-importer.c index 746bf0055c..193726aa1e 100644 --- a/mail/mail-importer.c +++ b/mail/mail-importer.c @@ -34,6 +34,7 @@ #include #include #include +#include #include "mail-importer.h" #include "mail-local.h" diff --git a/mail/mail-session.c b/mail/mail-session.c index e946b7e1ed..29c5754dd1 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -766,7 +766,7 @@ get_folder (CamelFilterDriver *d, const char *uri, void *data, CamelException *e static void -main_play_sound (CamelFilterDriver *driver, const char *filename, gpointer user_data) +main_play_sound (CamelFilterDriver *driver, char *filename, gpointer user_data) { if (filename && *filename) gnome_sound_play (filename); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index b04c55ce04..05eaa174c6 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -878,7 +878,7 @@ vfolder_edit_rule(const char *uri) GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); - gtk_container_set_border_width ((GtkWindow *) gd, 6); + gtk_container_set_border_width ((GtkContainer *) gd, 6); gtk_box_set_spacing ((GtkBox *) gd->vbox, 6); gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK); g_object_set(gd, "allow_shrink", FALSE, "allow_grow", TRUE, NULL); @@ -972,7 +972,7 @@ vfolder_gui_add_rule(VfolderRule *rule) GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response(gd, GTK_RESPONSE_OK); - gtk_container_set_border_width ((GtkWindow *) gd, 6); + gtk_container_set_border_width ((GtkContainer *) gd, 6); gtk_box_set_spacing ((GtkBox *) gd->vbox, 6); g_object_set(gd, "allow_shrink", FALSE, "allow_grow", TRUE, NULL); gtk_window_set_default_size (GTK_WINDOW (gd), 500, 500); diff --git a/mail/message-list.c b/mail/message-list.c index d69981fbb6..a23d7ccbeb 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2011,7 +2011,7 @@ build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes) e_tree_model_pre_change (ml->model); e_tree_model_node_data_changed (ml->model, node); - message_list_change_first_visible_parent (ml, node) + message_list_change_first_visible_parent (ml, node); } } -- cgit v1.2.3