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
This commit is contained in:
Dan Winship
2003-07-23 15:01:26 +00:00
parent f5ed342cd3
commit a356037663
10 changed files with 41 additions and 28 deletions

View File

@ -1,3 +1,29 @@
2003-07-23 Dan Winship <danw@ximian.com>
* 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 <fejj@ximian.com>
* mail-format.c (handle_multipart_encrypted): We don't have

View File

@ -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)
{

View File

@ -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)

View File

@ -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;

View File

@ -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;

View File

@ -53,6 +53,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk-pixbuf/gdk-pixbuf-loader.h>
#include <gal/util/e-util.h>
#include <gal/widgets/e-gui-utils.h>
#include <gal/widgets/e-popup-menu.h>
#include <gtkhtml/gtkhtml.h>

View File

@ -34,6 +34,7 @@
#include <camel/camel-mime-message.h>
#include <camel/camel-stream-mem.h>
#include <camel/camel-exception.h>
#include <e-util/e-path.h>
#include "mail-importer.h"
#include "mail-local.h"

View File

@ -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);

View File

@ -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);

View File

@ -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);
}
}