callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some g_return_if_fail()s to protect from crashes until the code to

Browse Source 
* mail-callbacks.c: (various)
	* folder-browser.c (filter_mlist):
	* mail-autofilter.c (filter_gui_add_from_message):
	* mail-vfolder.c (vfolder_gui_add_from_message): Add some
	g_return_if_fail()s to protect from crashes until the code to
	enable/disable commands based on how many messages are selected is
	done.

svn path=/trunk/; revision=6840
This commit is contained in:
Dan Winship
2000-12-07 19:19:48 +00:00
parent 1dd2597727
commit 97f16d13a4
5 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mail/ChangeLog
View File

@ -1,3 +1,13 @@
2000-12-07 Dan Winship <danw@helixcode.com>
* mail-callbacks.c: (various)
* folder-browser.c (filter_mlist):
* mail-autofilter.c (filter_gui_add_from_message):
* mail-vfolder.c (vfolder_gui_add_from_message): Add some
g_return_if_fail()s to protect from crashes until the code to
enable/disable commands based on how many messages are selected is
done.
2000-12-06 Jeffrey Stedfast <fejj@helixcode.com>
* mail-vfolder.c (vfolder_gui_add_rule): Make the vfolder editor

2
mail/folder-browser.c
View File

@ -427,6 +427,8 @@ filter_mlist (GtkWidget *w, FolderBrowser *fb)
char *header_value;
const char *header_name;
g_return_if_fail (fb->mail_display->current_message != NULL);
name = mail_mlist_magic_detect_list (fb->mail_display->current_message, &header_name, &header_value);
if (name == NULL)
return;

2
mail/mail-autofilter.c
View File

@ -272,6 +272,8 @@ filter_gui_add_from_message (CamelMimeMessage *msg, int flags)
char *userrules, *systemrules;
FilterRule *rule;
extern char *evolution_dir;
g_return_if_fail (msg != NULL);
fc = filter_context_new ();
userrules = g_strdup_printf ("%s/filters.xml", evolution_dir);

14
mail/mail-callbacks.c
View File

@ -425,13 +425,9 @@ mail_reply (CamelFolder *folder, CamelMimeMessage *msg, const char *uid, gboolea
EMsgComposer *composer;
struct post_send_data *psd;
/* FIXME: I just don't feel like implementing the folder-browser-passing
* garbage. */
/* FIXME: We really need some way to get the folder_browser into this
function */
if (!check_send_configuration (NULL) || !folder ||
!msg || !uid)
return;
g_return_if_fail (folder != NULL);
g_return_if_fail (msg != NULL);
g_return_if_fail (uid != NULL);
psd = g_new (struct post_send_data, 1);
psd->folder = folder;
@ -491,7 +487,9 @@ forward_message (FolderBrowser *fb, gboolean attach)
GPtrArray *uids;
cursor_msg = fb->mail_display->current_message;
if (!check_send_configuration (fb) || !cursor_msg)
g_return_if_fail (cursor_msg != NULL);
if (!check_send_configuration (fb))
return;
composer = e_msg_composer_new ();

2
mail/mail-vfolder.c
View File

@ -310,6 +310,8 @@ vfolder_gui_add_from_message(CamelMimeMessage *msg, int flags, const char *sourc
{
VfolderRule *rule;
g_return_if_fail (msg != NULL);
rule = (VfolderRule*)vfolder_rule_from_message(context, msg, flags, source);
vfolder_gui_add_rule(rule);
}