aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/mail-display.c4
-rw-r--r--mail/mail-format.c3
-rw-r--r--mail/mail-ops.c1
-rw-r--r--mail/message-list.c2
5 files changed, 13 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 967113f7bf..22f641e13d 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2000-08-09 Christopher James Lahey <clahey@helixcode.com>
+
+ * mail-display.c, mail-format.c, mail-ops.c: Fixed some warnings.
+
+ * message-list.c: Fix the call to e_popup_menu_run to match the
+ new signature.
+
2000-08-09 Ettore Perazzoli <ettore@helixcode.com>
* folder-browser-factory.c (control_activate): Create a "print
diff --git a/mail/mail-display.c b/mail/mail-display.c
index 3603cfb41f..31f8cb0a71 100644
--- a/mail/mail-display.c
+++ b/mail/mail-display.c
@@ -98,7 +98,7 @@ static char *
make_safe_filename (const char *prefix, CamelMimePart *part)
{
GMimeContentField *type;
- const char *name;
+ const char *name = NULL;
char *safe, *p;
type = camel_mime_part_get_content_type (part);
@@ -124,7 +124,7 @@ make_safe_filename (const char *prefix, CamelMimePart *part)
return safe;
}
-CamelMimePart *
+static CamelMimePart *
part_for_url (const char *url, CamelMimeMessage *message)
{
GHashTable *urls;
diff --git a/mail/mail-format.c b/mail/mail-format.c
index e90dc50826..a96619631f 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1047,7 +1047,8 @@ handle_multipart_encrypted (CamelMimePart *part, const char *mime_type,
CamelDataWrapper *wrapper =
camel_medium_get_content_object (CAMEL_MEDIUM (part));
CamelMultipart *mp;
- char *ciphertext, *passphrase, *plaintext;
+ char *ciphertext, *passphrase;
+ char *plaintext = NULL;
CamelException ex;
g_return_val_if_fail (CAMEL_IS_MULTIPART (wrapper), FALSE);
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index be8fd3ee5d..355493d97e 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -36,6 +36,7 @@
#include "filter/filter-editor.h"
#include "filter/filter-driver.h"
#include "widgets/e-table/e-table.h"
+#include "mail-local.h"
/* FIXME: is there another way to do this? */
#include "Evolution.h"
diff --git a/mail/message-list.c b/mail/message-list.c
index b1c0e050d2..34cf89664a 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -997,7 +997,7 @@ on_right_click (ETableScrolled *table, gint row, gint col, GdkEvent *event, Mess
{ NULL, NULL, NULL, 0 }
};
- e_popup_menu_run (menu, (GdkEventButton *)event, (fb->folder == drafts_folder) ? 0 : 1, fb);
+ e_popup_menu_run (menu, (GdkEventButton *)event, (fb->folder == drafts_folder) ? 0 : 1, 0, fb);
return TRUE;
}