aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog4
-rw-r--r--mail/Makefile.am2
-rw-r--r--mail/folder-browser.c15
3 files changed, 11 insertions, 10 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 7852d7fb96..d3435640ae 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-10 JP Rosevear <jpr@ximian.com>
+
+ * Makefile.am: Typo
+
2001-07-10 Peter Williams <peterw@ximian.com>
* mail-format.c (attachment_header): Took the logic of whether or not
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 8558e93a8b..b29861960c 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -144,7 +144,7 @@ $(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl
$(ORBIT_IDL) -I $(srcdir) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` \
-I `$(GNOME_CONFIG) --datadir`/idl $(srcdir)/Mail.idl
-EXTRA_DIST =
+EXTRA_DIST = \
Mail.idl \
$(glade_DATA) \
$(oaf_in_files) \
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index 892af9ae0e..2afbe445f5 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -1217,9 +1217,6 @@ enum {
CAN_RESEND = 128,
};
-#define SEPARATOR { "", NULL, (NULL), NULL, 0 }
-#define TERMINATOR { NULL, NULL, (NULL), NULL, 0 }
-
#define MLIST_VFOLDER (3)
#define MLIST_FILTER (8)
@@ -1237,7 +1234,7 @@ static EPopupMenu filter_menu[] = {
GTK_SIGNAL_FUNC (vfolder_mlist), NULL,
SELECTION_SET | IS_MAILING_LIST },
- SEPARATOR,
+ E_POPUP_SEPARATOR,
{ N_("Filter on Sub_ject"), NULL,
GTK_SIGNAL_FUNC (filter_subject), NULL,
@@ -1252,7 +1249,7 @@ static EPopupMenu filter_menu[] = {
GTK_SIGNAL_FUNC (filter_mlist), NULL,
SELECTION_SET | IS_MAILING_LIST },
- TERMINATOR
+ E_POPUP_TERMINATOR
};
@@ -1266,7 +1263,7 @@ static EPopupMenu context_menu[] = {
{ N_("_Print"), NULL,
GTK_SIGNAL_FUNC (print_msg), NULL, 0 },
- SEPARATOR,
+ E_POPUP_SEPARATOR,
{ N_("_Reply to Sender"), NULL,
GTK_SIGNAL_FUNC (reply_to_sender), NULL, 0 },
@@ -1284,7 +1281,7 @@ static EPopupMenu context_menu[] = {
{ N_("Mark as _Important"), NULL,
GTK_SIGNAL_FUNC (mark_as_important), NULL, 0 },
- SEPARATOR,
+ E_POPUP_SEPARATOR,
{ N_("_Move to Folder..."), NULL,
GTK_SIGNAL_FUNC (move_msg), NULL, 0 },
@@ -1295,7 +1292,7 @@ static EPopupMenu context_menu[] = {
{ N_("_Undelete"), NULL,
GTK_SIGNAL_FUNC (undelete_msg), NULL, CAN_UNDELETE },
- SEPARATOR,
+ E_POPUP_SEPARATOR,
{ N_("Add Sender to Address Book"), NULL,
GTK_SIGNAL_FUNC (addrbook_sender), NULL, 0 },
@@ -1309,7 +1306,7 @@ static EPopupMenu context_menu[] = {
{ N_("Create Ru_le From Message"), NULL,
GTK_SIGNAL_FUNC (NULL), filter_menu, SELECTION_SET },
- TERMINATOR
+ E_POPUP_TERMINATOR
};