зеркало из https://github.com/mozilla/gecko-dev.git
Mailto landing (ifdef MOZ_MAIL_COMPOSE).
Also, add a FULL_STATIC define to the Makefile to allow the option of compiling a truly static binary (e.g. to test for unresolveds).
This commit is contained in:
Родитель
7800cbaa97
Коммит
8ffa051d80
|
@ -89,7 +89,6 @@ REQUIRES =\
|
||||||
js \
|
js \
|
||||||
libfont \
|
libfont \
|
||||||
mariner \
|
mariner \
|
||||||
msg \
|
|
||||||
plds \
|
plds \
|
||||||
nspr20 \
|
nspr20 \
|
||||||
parse \
|
parse \
|
||||||
|
@ -113,6 +112,18 @@ REQUIRES += \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef MOZ_MAIL_NEWS
|
||||||
|
REQUIRES += \
|
||||||
|
msg \
|
||||||
|
$(NULL)
|
||||||
|
else
|
||||||
|
ifdef MOZ_MAIL_COMPOSE
|
||||||
|
REQUIRES += \
|
||||||
|
mailto \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
REQUIRES += \
|
REQUIRES += \
|
||||||
xfeicons \
|
xfeicons \
|
||||||
progress \
|
progress \
|
||||||
|
@ -175,6 +186,13 @@ CSRCS += \
|
||||||
mailcompose.c \
|
mailcompose.c \
|
||||||
movemail.c \
|
movemail.c \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
else
|
||||||
|
ifdef MOZ_MAIL_COMPOSE
|
||||||
|
CSRCS += \
|
||||||
|
mailattach.c \
|
||||||
|
mailcompose.c \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifndef NO_UNIX_ASYNC_DNS
|
ifndef NO_UNIX_ASYNC_DNS
|
||||||
|
@ -246,9 +264,12 @@ ifeq ($(OS_ARCH),AIX)
|
||||||
NSPR_LIB =
|
NSPR_LIB =
|
||||||
else
|
else
|
||||||
# XXX To a DSO...
|
# XXX To a DSO...
|
||||||
#NSPR_LIB = $(DIST)/lib/libplds21.a $(DIST)/lib/libplc21.a $(DIST)/lib/libmsgc21.a $(DIST)/lib/libnspr21.a
|
ifdef FULL_STATIC_BUILD
|
||||||
|
NSPR_LIB = $(DIST)/lib/libplds21.a $(DIST)/lib/libplc21.a $(DIST)/lib/libmsgc21.a $(DIST)/lib/libnspr21.a
|
||||||
|
else
|
||||||
BASIC_DSOS += -lplds21 -lplc21 -lmsgc21 -lnspr21
|
BASIC_DSOS += -lplds21 -lplc21 -lmsgc21 -lnspr21
|
||||||
endif
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef DBMALLOC
|
ifdef DBMALLOC
|
||||||
NSPR_LIB += $(DIST)/lib/libdbmalloc.a
|
NSPR_LIB += $(DIST)/lib/libdbmalloc.a
|
||||||
|
@ -348,9 +369,17 @@ endif
|
||||||
BASIC_LIBS_2 += \
|
BASIC_LIBS_2 += \
|
||||||
$(DIST)/lib/libldap.a \
|
$(DIST)/lib/libldap.a \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Do we need libns_mime.a here if MOZ_MAIL_COMPOSE and MOZ_SECURITY?
|
||||||
|
#ifdef MOZ_MAIL_COMPOSE
|
||||||
|
#ifdef MOZ_SECURITY
|
||||||
|
#BASIC_LIBS += \
|
||||||
|
# $(DIST)/lib/libns_mime.a \
|
||||||
|
# $(NULL)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
BASIC_LIBS += \
|
BASIC_LIBS += \
|
||||||
$(DIST)/lib/libmisc.a \
|
$(DIST)/lib/libmisc.a \
|
||||||
$(DIST)/lib/libprgrss.a \
|
$(DIST)/lib/libprgrss.a \
|
||||||
|
@ -377,6 +406,13 @@ BASIC_LIBS += $(DIST)/lib/libaddr.a \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef MOZ_MAIL_COMPOSE
|
||||||
|
BASIC_LIBS += $(DIST)/lib/libmailto.a \
|
||||||
|
$(DIST)/lib/libmime.a \
|
||||||
|
$(DIST)/lib/libsmtpurl.a \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef MOZ_MAIL_NEWS
|
ifdef MOZ_MAIL_NEWS
|
||||||
BASIC_LIBS += $(DIST)/lib/libnntpurl.a \
|
BASIC_LIBS += $(DIST)/lib/libnntpurl.a \
|
||||||
$(DIST)/lib/libsmtpurl.a \
|
$(DIST)/lib/libsmtpurl.a \
|
||||||
|
@ -493,13 +529,19 @@ endif # !MOZ_OJI
|
||||||
endif # !MOZ_JAVA
|
endif # !MOZ_JAVA
|
||||||
|
|
||||||
# XXX To a DSO...
|
# XXX To a DSO...
|
||||||
#BASIC_LIBS += $(DIST)/lib/libzlib.a
|
ifdef FULL_STATIC_BUILD
|
||||||
|
BASIC_LIBS += $(DIST)/lib/libzlib.a
|
||||||
|
else
|
||||||
BASIC_DSOS += -lzlib
|
BASIC_DSOS += -lzlib
|
||||||
|
endif
|
||||||
|
|
||||||
ifndef NO_MOCHA
|
ifndef NO_MOCHA
|
||||||
# XXX To a DSO...
|
# XXX To a DSO...
|
||||||
#BASIC_LIBS += $(DIST)/lib/libjs.a $(DIST)/lib/libjsj.a
|
ifndef FULL_STATIC_BUILD
|
||||||
|
BASIC_LIBS += $(DIST)/lib/libjs.a $(DIST)/lib/libjsj.a
|
||||||
|
else
|
||||||
BASIC_DSOS += -ljs -ljsj
|
BASIC_DSOS += -ljs -ljsj
|
||||||
|
endif
|
||||||
BASIC_LIBS += $(DIST)/lib/libmocha.a
|
BASIC_LIBS += $(DIST)/lib/libmocha.a
|
||||||
ifdef DOM
|
ifdef DOM
|
||||||
# the DOM code calls back into layout.
|
# the DOM code calls back into layout.
|
||||||
|
@ -590,10 +632,14 @@ DEFINES += -DUSE_WINNING_FILE_SELECTION
|
||||||
endif
|
endif
|
||||||
|
|
||||||
INCLUDES += -Isrc -I. -I$(DEPTH)/dist/public/nls -I$(DEPTH)/dist/public/security \
|
INCLUDES += -Isrc -I. -I$(DEPTH)/dist/public/nls -I$(DEPTH)/dist/public/security \
|
||||||
-I$(DEPTH)/lib/libmsg -I$(DEPTH)/dist/public/ldap \
|
-I$(DEPTH)/dist/public/ldap \
|
||||||
-I$(DEPTH)/modules/libimg/public \
|
-I$(DEPTH)/modules/libimg/public \
|
||||||
-I$(DEPTH)/l10n/us
|
-I$(DEPTH)/l10n/us
|
||||||
|
|
||||||
|
ifdef MOZ_MAIL_NEWS
|
||||||
|
INCLUDES += -Isrc -I. -I$(DEPTH)/lib/libmsg
|
||||||
|
endif
|
||||||
|
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
#
|
#
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
#include "xp_file.h"
|
#include "xp_file.h"
|
||||||
#include "addrbk.h"
|
#include "addrbk.h"
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
|
||||||
|
|
||||||
/* list of DIR_Server
|
/* list of DIR_Server
|
||||||
*/
|
*/
|
||||||
|
@ -59,10 +58,12 @@ extern XP_List* FE_GetDirServers()
|
||||||
char tmp[256];
|
char tmp[256];
|
||||||
XP_List* m_directories = XP_ListNew();
|
XP_List* m_directories = XP_ListNew();
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
/* database file is not html anymore ...
|
/* database file is not html anymore ...
|
||||||
*/
|
*/
|
||||||
PR_snprintf(tmp, sizeof (tmp), "abook.nab");
|
PR_snprintf(tmp, sizeof (tmp), "abook.nab");
|
||||||
DIR_GetServerPreferences (&m_directories, tmp);
|
DIR_GetServerPreferences (&m_directories, tmp);
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
return m_directories;
|
return m_directories;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,6 +72,7 @@ ABook* FE_GetAddressBook(MSG_Pane *pane)
|
||||||
return AddrBook;
|
return AddrBook;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
void FE_InitAddrBook()
|
void FE_InitAddrBook()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -142,10 +144,14 @@ void FE_CloseAddrBook() {
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
extern XP_List* FE_GetDirServers()
|
#if 0
|
||||||
|
/* compiler complains about definition vs. previous def at
|
||||||
|
line 154 in file '../../include/dirprefs.h. Dunno why, they're identical.
|
||||||
|
*/
|
||||||
|
extern XP_List* FE_GetDirServers(void)
|
||||||
{
|
{
|
||||||
return 0 ;
|
return 0 ;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -767,7 +767,7 @@ fe_MakeViewSourceStream (int format_out, void *data_obj,
|
||||||
return stream;
|
return stream;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
|
|
||||||
/* Mailing documents
|
/* Mailing documents
|
||||||
*/
|
*/
|
||||||
|
@ -810,7 +810,7 @@ fe_mailto_cb (Widget widget, XtPointer closure, XtPointer call_data)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
void
|
void
|
||||||
fe_print_cb (Widget widget, XtPointer closure, XtPointer call_data)
|
fe_print_cb (Widget widget, XtPointer closure, XtPointer call_data)
|
||||||
|
|
|
@ -3473,7 +3473,7 @@ fe_GetSynchronousURL (MWContext *context,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
|
|
||||||
/* Sending mail
|
/* Sending mail
|
||||||
*/
|
*/
|
||||||
|
@ -3483,6 +3483,7 @@ void fe_mail_text_modify_cb (Widget, XtPointer, XtPointer);
|
||||||
Boolean
|
Boolean
|
||||||
fe_CheckDeferredMail (void)
|
fe_CheckDeferredMail (void)
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
struct fe_MWContext_cons* rest;
|
struct fe_MWContext_cons* rest;
|
||||||
Boolean haveQueuedMail = False;
|
Boolean haveQueuedMail = False;
|
||||||
int numMsgs = 0;
|
int numMsgs = 0;
|
||||||
|
@ -3525,6 +3526,7 @@ fe_CheckDeferredMail (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
/* return True means no mail - weird, but consistent
|
/* return True means no mail - weird, but consistent
|
||||||
* with fe_CheckUnsentMail below. We can change them
|
* with fe_CheckUnsentMail below. We can change them
|
||||||
* later.
|
* later.
|
||||||
|
@ -4483,7 +4485,7 @@ fe_mail_text_modify_cb (Widget text, XtPointer client_data,
|
||||||
/* MSG_MessageBodyEdited(CONTEXT_DATA(context)->comppane); */
|
/* MSG_MessageBodyEdited(CONTEXT_DATA(context)->comppane); */
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
#define cite_abort 0
|
#define cite_abort 0
|
||||||
#define cite_protect_me_from_myself 1
|
#define cite_protect_me_from_myself 1
|
||||||
|
|
|
@ -219,10 +219,12 @@ extern void fe_showHistory(Widget toplevel);
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#ifdef MOZ_MAIL_NEWS
|
||||||
extern MWContext* fe_showInbox(Widget toplevel, void *parent_frame, Chrome *chromespec, XP_Bool with_reuse, XP_Bool getNewMail);
|
extern MWContext* fe_showInbox(Widget toplevel, void *parent_frame, Chrome *chromespec, XP_Bool with_reuse, XP_Bool getNewMail);
|
||||||
extern MWContext* fe_showNewsgroups(Widget toplevel, void *parent_frame, Chrome *chromespec);
|
extern MWContext* fe_showNewsgroups(Widget toplevel, void *parent_frame, Chrome *chromespec);
|
||||||
extern Widget fe_MailComposeWin_Create(MWContext* context, Widget parent);
|
|
||||||
extern void fe_showConference(Widget w, char *email, short use, char *coolAddr);
|
extern void fe_showConference(Widget w, char *email, short use, char *coolAddr);
|
||||||
extern void FE_InitAddrBook();
|
extern void FE_InitAddrBook();
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
|
extern Widget fe_MailComposeWin_Create(MWContext* context, Widget parent);
|
||||||
|
#endif
|
||||||
|
|
||||||
extern int XFE_COLORMAP_WARNING_TO_IGNORE;
|
extern int XFE_COLORMAP_WARNING_TO_IGNORE;
|
||||||
|
|
||||||
|
@ -2480,9 +2482,9 @@ main
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
fe_mailNewsPrefs = MSG_CreatePrefs();
|
fe_mailNewsPrefs = MSG_CreatePrefs();
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
/* Full Circle initialization */
|
/* Full Circle initialization */
|
||||||
#ifdef MOZ_FULLCIRCLE
|
#ifdef MOZ_FULLCIRCLE
|
||||||
|
@ -3185,7 +3187,7 @@ main
|
||||||
*/
|
*/
|
||||||
URL_Struct *url = NET_CreateURLStruct (argv [i], NET_DONT_RELOAD);
|
URL_Struct *url = NET_CreateURLStruct (argv [i], NET_DONT_RELOAD);
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
if (!XP_STRNCASECMP (argv[i], "mailto:", 7))
|
if (!XP_STRNCASECMP (argv[i], "mailto:", 7))
|
||||||
type = MWContextMessageComposition;
|
type = MWContextMessageComposition;
|
||||||
else if (!XP_STRNCASECMP (argv[i], "addrbk:", 7))
|
else if (!XP_STRNCASECMP (argv[i], "addrbk:", 7))
|
||||||
|
@ -4137,7 +4139,7 @@ fe_clean_old_init_files (Widget toplevel)
|
||||||
|
|
||||||
#endif /* !OLD_UNIX_FILES */
|
#endif /* !OLD_UNIX_FILES */
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Message Composition
|
* Message Composition
|
||||||
|
@ -4210,7 +4212,7 @@ static struct {
|
||||||
{"subject", Off(mcSubject), MSG_SUBJECT_HEADER_MASK, 0},
|
{"subject", Off(mcSubject), MSG_SUBJECT_HEADER_MASK, 0},
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
void resize(Widget w, XtPointer clientData, XtPointer callData)
|
void resize(Widget w, XtPointer clientData, XtPointer callData)
|
||||||
{
|
{
|
||||||
|
@ -4230,7 +4232,7 @@ void expose(Widget w, XtPointer clientData, XtPointer callData)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
|
|
||||||
WidgetList
|
WidgetList
|
||||||
fe_create_composition_widgets(MWContext* context, Widget pane, int *numkids)
|
fe_create_composition_widgets(MWContext* context, Widget pane, int *numkids)
|
||||||
|
@ -4411,7 +4413,7 @@ FE_MsgShowHeaders (MSG_Pane* comppane, MSG_HEADER_SET headers)
|
||||||
#undef ISLABEL
|
#undef ISLABEL
|
||||||
#undef Off
|
#undef Off
|
||||||
|
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
#ifdef JAVA
|
#ifdef JAVA
|
||||||
|
|
||||||
|
|
|
@ -257,10 +257,13 @@ static struct pref_map pref_map[] = {
|
||||||
{"mail.identity.useremail", FIELD_OFFSET(email_address), read_str, write_str},
|
{"mail.identity.useremail", FIELD_OFFSET(email_address), read_str, write_str},
|
||||||
{"mail.identity.organization", FIELD_OFFSET(organization), read_str, write_str},
|
{"mail.identity.organization", FIELD_OFFSET(organization), read_str, write_str},
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
{"mail.identity.reply_to", FIELD_OFFSET(reply_to_address), read_str, write_str, },
|
{"mail.identity.reply_to", FIELD_OFFSET(reply_to_address), read_str, write_str, },
|
||||||
{"mail.signature_file", FIELD_OFFSET(signature_file), read_path, write_path, },
|
{"mail.signature_file", FIELD_OFFSET(signature_file), read_path, write_path, },
|
||||||
{"mail.attach_vcard", FIELD_OFFSET(attach_address_card), read_bool, write_bool},
|
{"mail.attach_vcard", FIELD_OFFSET(attach_address_card), read_bool, write_bool},
|
||||||
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
{"mail.addr_book.lastnamefirst", FIELD_OFFSET(addr_book_lastname_first), read_bool, write_bool},
|
{"mail.addr_book.lastnamefirst", FIELD_OFFSET(addr_book_lastname_first), read_bool, write_bool},
|
||||||
/*
|
/*
|
||||||
* This is no good on machines where ints are less than four bytes.
|
* This is no good on machines where ints are less than four bytes.
|
||||||
|
@ -299,7 +302,11 @@ static struct pref_map pref_map[] = {
|
||||||
{"mailnews.reuse_message_window", FIELD_OFFSET(reuse_msg_window), read_bool, write_bool},
|
{"mailnews.reuse_message_window", FIELD_OFFSET(reuse_msg_window), read_bool, write_bool},
|
||||||
{"mailnews.reuse_thread_window", FIELD_OFFSET(reuse_thread_window), read_bool, write_bool},
|
{"mailnews.reuse_thread_window", FIELD_OFFSET(reuse_thread_window), read_bool, write_bool},
|
||||||
{"mailnews.message_in_thread_window", FIELD_OFFSET(msg_in_thread_window), read_bool, write_bool},
|
{"mailnews.message_in_thread_window", FIELD_OFFSET(msg_in_thread_window), read_bool, write_bool},
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
{"mailnews.wraplength", FIELD_OFFSET(msg_wrap_length), read_int, write_int},
|
{"mailnews.wraplength", FIELD_OFFSET(msg_wrap_length), read_int, write_int},
|
||||||
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
{"mailnews.nicknames_only", FIELD_OFFSET(expand_addr_nicknames_only), read_bool, write_bool},
|
{"mailnews.nicknames_only", FIELD_OFFSET(expand_addr_nicknames_only), read_bool, write_bool},
|
||||||
{"mailnews.reply_on_top", FIELD_OFFSET(reply_on_top), read_int, write_int},
|
{"mailnews.reply_on_top", FIELD_OFFSET(reply_on_top), read_int, write_int},
|
||||||
{"mailnews.reply_with_extra_lines", FIELD_OFFSET(reply_with_extra_lines), read_int, write_int},
|
{"mailnews.reply_with_extra_lines", FIELD_OFFSET(reply_with_extra_lines), read_int, write_int},
|
||||||
|
@ -337,11 +344,14 @@ static struct pref_map pref_map[] = {
|
||||||
{"network.proxy.type", FIELD_OFFSET(proxy_mode), read_int, write_int},
|
{"network.proxy.type", FIELD_OFFSET(proxy_mode), read_int, write_int},
|
||||||
{"network.proxy.autoconfig_url", FIELD_OFFSET(proxy_url), read_str, write_str},
|
{"network.proxy.autoconfig_url", FIELD_OFFSET(proxy_url), read_str, write_str},
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
{"news.default_cc", FIELD_OFFSET(news_bcc), read_str, write_str},
|
{"news.default_cc", FIELD_OFFSET(news_bcc), read_str, write_str},
|
||||||
{"news.default_fcc", FIELD_OFFSET(news_fcc), read_path, write_path, },
|
{"news.default_fcc", FIELD_OFFSET(news_fcc), read_path, write_path, },
|
||||||
{"news.cc_self", FIELD_OFFSET(newsbccself_p), read_bool, write_bool},
|
{"news.cc_self", FIELD_OFFSET(newsbccself_p), read_bool, write_bool},
|
||||||
{"news.use_fcc", FIELD_OFFSET(newsfcc_p), read_bool, write_bool},
|
{"news.use_fcc", FIELD_OFFSET(newsfcc_p), read_bool, write_bool},
|
||||||
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
{"news.directory", FIELD_OFFSET(newsrc_directory), read_path, write_path, },
|
{"news.directory", FIELD_OFFSET(newsrc_directory), read_path, write_path, },
|
||||||
{"news.notify.on", FIELD_OFFSET(news_notify_on), read_bool, write_bool},
|
{"news.notify.on", FIELD_OFFSET(news_notify_on), read_bool, write_bool},
|
||||||
{"news.max_articles", FIELD_OFFSET(news_max_articles), read_int, write_int},
|
{"news.max_articles", FIELD_OFFSET(news_max_articles), read_int, write_int},
|
||||||
|
@ -440,11 +450,13 @@ static struct pref_map pref_map[] = {
|
||||||
{"custtoolbar.Address_Book.Address_Book_Toolbar.position", FIELD_OFFSET(address_book_address_book_toolbar_position), read_int, write_int},
|
{"custtoolbar.Address_Book.Address_Book_Toolbar.position", FIELD_OFFSET(address_book_address_book_toolbar_position), read_int, write_int},
|
||||||
{"custtoolbar.Address_Book.Address_Book_Toolbar.showing", FIELD_OFFSET(address_book_address_book_toolbar_showing), read_bool, write_bool},
|
{"custtoolbar.Address_Book.Address_Book_Toolbar.showing", FIELD_OFFSET(address_book_address_book_toolbar_showing), read_bool, write_bool},
|
||||||
{"custtoolbar.Address_Book.Address_Book_Toolbar.open", FIELD_OFFSET(address_book_address_book_toolbar_open), read_bool, write_bool},
|
{"custtoolbar.Address_Book.Address_Book_Toolbar.open", FIELD_OFFSET(address_book_address_book_toolbar_open), read_bool, write_bool},
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
{"custtoolbar.Compose_Message.Message_Toolbar.position", FIELD_OFFSET(compose_message_message_toolbar_position), read_int, write_int},
|
{"custtoolbar.Compose_Message.Message_Toolbar.position", FIELD_OFFSET(compose_message_message_toolbar_position), read_int, write_int},
|
||||||
{"custtoolbar.Compose_Message.Message_Toolbar.showing", FIELD_OFFSET(compose_message_message_toolbar_showing), read_bool, write_bool},
|
{"custtoolbar.Compose_Message.Message_Toolbar.showing", FIELD_OFFSET(compose_message_message_toolbar_showing), read_bool, write_bool},
|
||||||
{"custtoolbar.Compose_Message.Message_Toolbar.open", FIELD_OFFSET(compose_message_message_toolbar_open), read_bool, write_bool},
|
{"custtoolbar.Compose_Message.Message_Toolbar.open", FIELD_OFFSET(compose_message_message_toolbar_open), read_bool, write_bool},
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
{"custtoolbar.Composer.Composition_Toolbar.position", FIELD_OFFSET(composer_composition_toolbar_position), read_int, write_int},
|
{"custtoolbar.Composer.Composition_Toolbar.position", FIELD_OFFSET(composer_composition_toolbar_position), read_int, write_int},
|
||||||
{"custtoolbar.Composer.Composition_Toolbar.showing", FIELD_OFFSET(composer_composition_toolbar_showing), read_bool, write_bool},
|
{"custtoolbar.Composer.Composition_Toolbar.showing", FIELD_OFFSET(composer_composition_toolbar_showing), read_bool, write_bool},
|
||||||
|
@ -457,10 +469,11 @@ static struct pref_map pref_map[] = {
|
||||||
{"browser.win_width", FIELD_OFFSET(browser_win_width), read_int, write_int},
|
{"browser.win_width", FIELD_OFFSET(browser_win_width), read_int, write_int},
|
||||||
{"browser.win_height",FIELD_OFFSET(browser_win_height), read_int, write_int},
|
{"browser.win_height",FIELD_OFFSET(browser_win_height), read_int, write_int},
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
{"mail.compose.win_width", FIELD_OFFSET(mail_compose_win_width), read_int, write_int},
|
{"mail.compose.win_width", FIELD_OFFSET(mail_compose_win_width), read_int, write_int},
|
||||||
{"mail.compose.win_height",FIELD_OFFSET(mail_compose_win_height), read_int, write_int},
|
{"mail.compose.win_height",FIELD_OFFSET(mail_compose_win_height), read_int, write_int},
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
|
|
||||||
{"editor.win_width", FIELD_OFFSET(editor_win_width), read_int, write_int},
|
{"editor.win_width", FIELD_OFFSET(editor_win_width), read_int, write_int},
|
||||||
{"editor.win_height",FIELD_OFFSET(editor_win_height), read_int, write_int},
|
{"editor.win_height",FIELD_OFFSET(editor_win_height), read_int, write_int},
|
||||||
|
@ -1311,7 +1324,7 @@ XFE_OldReadPrefs(char * filename, XFE_GlobalPrefs *prefs)
|
||||||
/* COLORS
|
/* COLORS
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
/* COMPOSITION
|
/* COMPOSITION
|
||||||
*/
|
*/
|
||||||
else if (!XP_STRCASECMP("8BIT_MAIL_AND_NEWS", name))
|
else if (!XP_STRCASECMP("8BIT_MAIL_AND_NEWS", name))
|
||||||
|
@ -1338,7 +1351,7 @@ XFE_OldReadPrefs(char * filename, XFE_GlobalPrefs *prefs)
|
||||||
}
|
}
|
||||||
else if (!XP_STRCASECMP("MAIL_AUTOQUOTE_REPLY", name))
|
else if (!XP_STRCASECMP("MAIL_AUTOQUOTE_REPLY", name))
|
||||||
prefs->autoquote_reply = BOOLP (value);
|
prefs->autoquote_reply = BOOLP (value);
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
/* DIRECTORIES
|
/* DIRECTORIES
|
||||||
*/
|
*/
|
||||||
|
@ -1392,12 +1405,12 @@ XFE_OldReadPrefs(char * filename, XFE_GlobalPrefs *prefs)
|
||||||
StrAllocCopy (prefs->email_address, value);
|
StrAllocCopy (prefs->email_address, value);
|
||||||
else if (!XP_STRCASECMP("ORGANIZATION", name))
|
else if (!XP_STRCASECMP("ORGANIZATION", name))
|
||||||
StrAllocCopy (prefs->organization, value);
|
StrAllocCopy (prefs->organization, value);
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
else if (!XP_STRCASECMP("SIGNATURE_FILE", name))
|
else if (!XP_STRCASECMP("SIGNATURE_FILE", name))
|
||||||
StrAllocCopy (prefs->signature_file, value);
|
StrAllocCopy (prefs->signature_file, value);
|
||||||
else if (!XP_STRCASECMP("SIGNATURE_DATE", name))
|
else if (!XP_STRCASECMP("SIGNATURE_DATE", name))
|
||||||
prefs->signature_date = (time_t) atol (value);
|
prefs->signature_date = (time_t) atol (value);
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
/* IMAGES
|
/* IMAGES
|
||||||
*/
|
*/
|
||||||
|
@ -1763,10 +1776,10 @@ XFE_OldReadPrefs(char * filename, XFE_GlobalPrefs *prefs)
|
||||||
}
|
}
|
||||||
|
|
||||||
FROB(cache_dir)
|
FROB(cache_dir)
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
FROB(mail_fcc)
|
FROB(mail_fcc)
|
||||||
FROB(news_fcc)
|
FROB(news_fcc)
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
FROB(tmp_dir)
|
FROB(tmp_dir)
|
||||||
FROB(bookmark_file)
|
FROB(bookmark_file)
|
||||||
FROB(history_file)
|
FROB(history_file)
|
||||||
|
@ -1778,8 +1791,10 @@ XFE_OldReadPrefs(char * filename, XFE_GlobalPrefs *prefs)
|
||||||
/* spider end */
|
/* spider end */
|
||||||
FROB(global_mailcap_file)
|
FROB(global_mailcap_file)
|
||||||
FROB(private_mailcap_file)
|
FROB(private_mailcap_file)
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
FROB(signature_file)
|
FROB(signature_file)
|
||||||
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
FROB(mail_directory)
|
FROB(mail_directory)
|
||||||
FROB(movemail_program)
|
FROB(movemail_program)
|
||||||
FROB(newsrc_directory)
|
FROB(newsrc_directory)
|
||||||
|
|
|
@ -305,14 +305,15 @@ typedef struct _XFE_GlobalPrefs
|
||||||
XP_Bool msg_in_thread_window;
|
XP_Bool msg_in_thread_window;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ----- Mail & News/Identity -----
|
* ----- Mail & News/Identity -----
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
char *real_name;
|
char *real_name;
|
||||||
char *email_address;
|
char *email_address;
|
||||||
char *organization;
|
char *organization;
|
||||||
#ifdef MOZ_MAIL_NEWS
|
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
char *signature_file;
|
char *signature_file;
|
||||||
char *reply_to_address;
|
char *reply_to_address;
|
||||||
XP_Bool attach_address_card;
|
XP_Bool attach_address_card;
|
||||||
|
@ -337,7 +338,9 @@ typedef struct _XFE_GlobalPrefs
|
||||||
char *news_bcc;
|
char *news_bcc;
|
||||||
char *mail_fcc;
|
char *mail_fcc;
|
||||||
char *news_fcc;
|
char *news_fcc;
|
||||||
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
/*
|
/*
|
||||||
* ----- Mail & News/Mail Server -----
|
* ----- Mail & News/Mail Server -----
|
||||||
*/
|
*/
|
||||||
|
@ -670,11 +673,13 @@ typedef struct _XFE_GlobalPrefs
|
||||||
int32 address_book_address_book_toolbar_position;
|
int32 address_book_address_book_toolbar_position;
|
||||||
XP_Bool address_book_address_book_toolbar_showing;
|
XP_Bool address_book_address_book_toolbar_showing;
|
||||||
XP_Bool address_book_address_book_toolbar_open;
|
XP_Bool address_book_address_book_toolbar_open;
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
int32 compose_message_message_toolbar_position;
|
int32 compose_message_message_toolbar_position;
|
||||||
XP_Bool compose_message_message_toolbar_showing;
|
XP_Bool compose_message_message_toolbar_showing;
|
||||||
XP_Bool compose_message_message_toolbar_open;
|
XP_Bool compose_message_message_toolbar_open;
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
int32 composer_composition_toolbar_position;
|
int32 composer_composition_toolbar_position;
|
||||||
XP_Bool composer_composition_toolbar_showing;
|
XP_Bool composer_composition_toolbar_showing;
|
||||||
|
@ -687,10 +692,10 @@ typedef struct _XFE_GlobalPrefs
|
||||||
int32 browser_win_width;
|
int32 browser_win_width;
|
||||||
int32 browser_win_height;
|
int32 browser_win_height;
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
int32 mail_compose_win_width;
|
int32 mail_compose_win_width;
|
||||||
int32 mail_compose_win_height;
|
int32 mail_compose_win_height;
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
int32 editor_win_width;
|
int32 editor_win_width;
|
||||||
int32 editor_win_height;
|
int32 editor_win_height;
|
||||||
|
|
|
@ -27,7 +27,9 @@
|
||||||
#include "ABListSearchView.h"
|
#include "ABListSearchView.h"
|
||||||
#include "ComposeFolderView.h"
|
#include "ComposeFolderView.h"
|
||||||
#include "ComposeAttachFolderView.h"
|
#include "ComposeAttachFolderView.h"
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
#include "LdapSearchView.h"
|
#include "LdapSearchView.h"
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
#include "xfe.h"
|
#include "xfe.h"
|
||||||
#include "icondata.h"
|
#include "icondata.h"
|
||||||
#include "msgcom.h"
|
#include "msgcom.h"
|
||||||
|
@ -127,6 +129,13 @@ fe_MailComposeAddress_CreateManaged(MWContext* context, Widget parent);
|
||||||
|
|
||||||
extern XtAppContext fe_XtAppContext;
|
extern XtAppContext fe_XtAppContext;
|
||||||
|
|
||||||
|
#ifndef MOZ_MAIL_NEWS
|
||||||
|
int DIR_GetComposeNameCompletionAddressBook(XP_List*, DIR_Server**)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
// Constructor
|
// Constructor
|
||||||
XFE_AddressFolderView::XFE_AddressFolderView(
|
XFE_AddressFolderView::XFE_AddressFolderView(
|
||||||
XFE_Component *toplevel_component,
|
XFE_Component *toplevel_component,
|
||||||
|
@ -154,7 +163,6 @@ XFE_AddressFolderView::XFE_AddressFolderView(
|
||||||
setupAddressHeadings();
|
setupAddressHeadings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Boolean
|
Boolean
|
||||||
XFE_AddressFolderView::isCommandEnabled(CommandType, void*, XFE_CommandInfo*)
|
XFE_AddressFolderView::isCommandEnabled(CommandType, void*, XFE_CommandInfo*)
|
||||||
{
|
{
|
||||||
|
@ -347,6 +355,7 @@ void XFE_AddressFolderView::addrMsgCB(ABAddrMsgCBProcStruc* clientData)
|
||||||
False);
|
False);
|
||||||
}/* XFE_AddressFolderView::addrMsgCB */
|
}/* XFE_AddressFolderView::addrMsgCB */
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
XFE_CALLBACK_DEFN(XFE_AddressFolderView, openAddrBk)(XFE_NotificationCenter */*obj*/,
|
XFE_CALLBACK_DEFN(XFE_AddressFolderView, openAddrBk)(XFE_NotificationCenter */*obj*/,
|
||||||
void */*clientData*/,
|
void */*clientData*/,
|
||||||
void */*callData*/)
|
void */*callData*/)
|
||||||
|
@ -357,15 +366,17 @@ XFE_CALLBACK_DEFN(XFE_AddressFolderView, openAddrBk)(XFE_NotificationCenter */*o
|
||||||
m_contextData);
|
m_contextData);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
void
|
void
|
||||||
XFE_AddressFolderView::doCommand(CommandType command, void *, XFE_CommandInfo*)
|
XFE_AddressFolderView::doCommand(CommandType command, void *, XFE_CommandInfo*)
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
if (command == xfeCmdAddresseePicker)
|
if (command == xfeCmdAddresseePicker)
|
||||||
fe_showAddrMSGDlg(getToplevel()->getBaseWidget(),
|
fe_showAddrMSGDlg(getToplevel()->getBaseWidget(),
|
||||||
XFE_AddressFolderView::addrMsgCallback, this,
|
XFE_AddressFolderView::addrMsgCallback, this,
|
||||||
m_contextData);
|
m_contextData);
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
}
|
}
|
||||||
|
|
||||||
// Outlinable Interface starts here
|
// Outlinable Interface starts here
|
||||||
|
@ -1221,6 +1232,8 @@ XFE_AddressFolderView::changedItem(char *pString, int* iconType,
|
||||||
extern "C" char * xfe_ExpandName(char * pString, int* iconID, short* xxx,
|
extern "C" char * xfe_ExpandName(char * pString, int* iconID, short* xxx,
|
||||||
ABook *pAddrBook, DIR_Server *pDirServer)
|
ABook *pAddrBook, DIR_Server *pDirServer)
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
|
|
||||||
#if !defined(MOZ_NEWADDR)
|
#if !defined(MOZ_NEWADDR)
|
||||||
ABID entryID;
|
ABID entryID;
|
||||||
ABID field;
|
ABID field;
|
||||||
|
@ -1260,6 +1273,8 @@ extern "C" char * xfe_ExpandName(char * pString, int* iconID, short* xxx,
|
||||||
if (fullname) return fullname;
|
if (fullname) return fullname;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1414,6 +1429,7 @@ XFE_AddressFolderView::AddressDropCb(Widget,void* cd,
|
||||||
void
|
void
|
||||||
XFE_AddressFolderView::addressDropCb(fe_dnd_Source *source)
|
XFE_AddressFolderView::addressDropCb(fe_dnd_Source *source)
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
XDEBUG(printf("XFE_AddressFolderView::addressDropCb()\n"));
|
XDEBUG(printf("XFE_AddressFolderView::addressDropCb()\n"));
|
||||||
|
|
||||||
switch (source->type) {
|
switch (source->type) {
|
||||||
|
@ -1449,6 +1465,7 @@ XFE_AddressFolderView::addressDropCb(fe_dnd_Source *source)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -1457,6 +1474,7 @@ XFE_AddressFolderView::processAddressBookDrop(XFE_Outliner *outliner,
|
||||||
ABook *abBook,
|
ABook *abBook,
|
||||||
AddressPane *abPane)
|
AddressPane *abPane)
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
// Make sure insert happens at end of list - drag-over will have moved
|
// Make sure insert happens at end of list - drag-over will have moved
|
||||||
// text field position around under mouse.
|
// text field position around under mouse.
|
||||||
SEND_STATUS fieldStatus=::TO;
|
SEND_STATUS fieldStatus=::TO;
|
||||||
|
@ -1570,8 +1588,10 @@ XFE_AddressFolderView::processAddressBookDrop(XFE_Outliner *outliner,
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
void
|
void
|
||||||
XFE_AddressFolderView::processLDAPDrop(fe_dnd_Source* source)
|
XFE_AddressFolderView::processLDAPDrop(fe_dnd_Source* source)
|
||||||
{
|
{
|
||||||
|
@ -1603,3 +1623,4 @@ XFE_AddressFolderView::processLDAPDrop(fe_dnd_Source* source)
|
||||||
m_clearAddressee = True;
|
m_clearAddressee = True;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
|
@ -101,8 +101,10 @@ public:
|
||||||
virtual void Flippyfunc(const OutlineFlippyFuncData *data);
|
virtual void Flippyfunc(const OutlineFlippyFuncData *data);
|
||||||
Boolean removeDataAt(int line);
|
Boolean removeDataAt(int line);
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
// For address book button
|
// For address book button
|
||||||
XFE_CALLBACK_DECL(openAddrBk)
|
XFE_CALLBACK_DECL(openAddrBk)
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
void setHeader(int line, MSG_HEADER_SET header);
|
void setHeader(int line, MSG_HEADER_SET header);
|
||||||
int getHeader(int line);
|
int getHeader(int line);
|
||||||
|
|
|
@ -45,9 +45,11 @@ XFE_AttachmentMenu::XFE_AttachmentMenu(Widget w, XFE_Frame *frame)
|
||||||
|
|
||||||
XP_ASSERT(m_submenu);
|
XP_ASSERT(m_submenu);
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
frame->registerInterest(XFE_MsgView::messageHasChanged,
|
frame->registerInterest(XFE_MsgView::messageHasChanged,
|
||||||
this,
|
this,
|
||||||
(XFE_FunctionNotification)attachmentsHaveChanged_cb);
|
(XFE_FunctionNotification)attachmentsHaveChanged_cb);
|
||||||
|
#endif
|
||||||
|
|
||||||
m_attachmentData = NULL;
|
m_attachmentData = NULL;
|
||||||
|
|
||||||
|
@ -57,9 +59,11 @@ XFE_AttachmentMenu::XFE_AttachmentMenu(Widget w, XFE_Frame *frame)
|
||||||
|
|
||||||
XFE_AttachmentMenu::~XFE_AttachmentMenu()
|
XFE_AttachmentMenu::~XFE_AttachmentMenu()
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
m_parentFrame->unregisterInterest(XFE_MsgView::messageHasChanged,
|
m_parentFrame->unregisterInterest(XFE_MsgView::messageHasChanged,
|
||||||
this,
|
this,
|
||||||
(XFE_FunctionNotification)attachmentsHaveChanged_cb);
|
(XFE_FunctionNotification)attachmentsHaveChanged_cb);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -948,6 +948,7 @@ int XFE_ComposeAttachDrop::processTargets(Atom *targets,const char **data,int nu
|
||||||
|
|
||||||
void XFE_ComposeAttachFolderView::processMessageDrop(fe_dnd_Source *source)
|
void XFE_ComposeAttachFolderView::processMessageDrop(fe_dnd_Source *source)
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
XFE_ThreadView *threadView=(XFE_ThreadView*)source->closure;
|
XFE_ThreadView *threadView=(XFE_ThreadView*)source->closure;
|
||||||
XFE_Outliner *outliner=threadView->getOutliner();
|
XFE_Outliner *outliner=threadView->getOutliner();
|
||||||
const int *selectedList;
|
const int *selectedList;
|
||||||
|
@ -975,6 +976,7 @@ void XFE_ComposeAttachFolderView::processMessageDrop(fe_dnd_Source *source)
|
||||||
XP_FREE(items[i]);
|
XP_FREE(items[i]);
|
||||||
delete items;
|
delete items;
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -451,6 +451,7 @@ XFE_ComposeFrame::isCommandEnabled(CommandType cmd, void *cd, XFE_CommandInfo* i
|
||||||
void
|
void
|
||||||
XFE_ComposeFrame::doCommand(CommandType cmd, void *cd, XFE_CommandInfo* info)
|
XFE_ComposeFrame::doCommand(CommandType cmd, void *cd, XFE_CommandInfo* info)
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
if (cmd == xfeCmdSearchAddress)
|
if (cmd == xfeCmdSearchAddress)
|
||||||
{
|
{
|
||||||
fe_showLdapSearch(XfeAncestorFindApplicationShell(getBaseWidget()), this,
|
fe_showLdapSearch(XfeAncestorFindApplicationShell(getBaseWidget()), this,
|
||||||
|
@ -459,7 +460,9 @@ XFE_ComposeFrame::doCommand(CommandType cmd, void *cd, XFE_CommandInfo* info)
|
||||||
// NOTE... [ we need to intercept these commands in order to be
|
// NOTE... [ we need to intercept these commands in order to be
|
||||||
// [ able to do the "right thing" in the ComposeView
|
// [ able to do the "right thing" in the ComposeView
|
||||||
//
|
//
|
||||||
else {
|
else
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
{
|
||||||
if ( cmd == xfeCmdPaste ||
|
if ( cmd == xfeCmdPaste ||
|
||||||
cmd == xfeCmdCut ||
|
cmd == xfeCmdCut ||
|
||||||
cmd == xfeCmdCopy ||
|
cmd == xfeCmdCopy ||
|
||||||
|
|
|
@ -148,7 +148,9 @@ extern LO_AnchorData *last_documented_anchor_data;
|
||||||
|
|
||||||
MenuSpec XFE_Frame::new_menu_spec[] = {
|
MenuSpec XFE_Frame::new_menu_spec[] = {
|
||||||
{ xfeCmdOpenBrowser, PUSHBUTTON },
|
{ xfeCmdOpenBrowser, PUSHBUTTON },
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
{ xfeCmdComposeMessage, PUSHBUTTON },
|
{ xfeCmdComposeMessage, PUSHBUTTON },
|
||||||
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
#ifdef EDITOR
|
#ifdef EDITOR
|
||||||
MENU_SEPARATOR,
|
MENU_SEPARATOR,
|
||||||
MENU_PUSHBUTTON(xfeCmdNewBlank),
|
MENU_PUSHBUTTON(xfeCmdNewBlank),
|
||||||
|
@ -257,7 +259,7 @@ MenuSpec XFE_Frame::window_menu_spec[] = {
|
||||||
// Is there is a reason why this is here? It's the same as new_menu_spec
|
// Is there is a reason why this is here? It's the same as new_menu_spec
|
||||||
MenuSpec XFE_Frame::new_submenu_spec[] = {
|
MenuSpec XFE_Frame::new_submenu_spec[] = {
|
||||||
{ xfeCmdOpenBrowser, PUSHBUTTON },
|
{ xfeCmdOpenBrowser, PUSHBUTTON },
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
{ xfeCmdComposeMessage, PUSHBUTTON },
|
{ xfeCmdComposeMessage, PUSHBUTTON },
|
||||||
#endif
|
#endif
|
||||||
#ifdef EDITOR
|
#ifdef EDITOR
|
||||||
|
@ -391,6 +393,7 @@ MenuSpec XFE_Frame::reply_submenu_spec[] = {
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
MenuSpec XFE_Frame::compose_message_submenu_spec[] = {
|
MenuSpec XFE_Frame::compose_message_submenu_spec[] = {
|
||||||
{ xfeCmdComposeMessagePlain, PUSHBUTTON },
|
{ xfeCmdComposeMessagePlain, PUSHBUTTON },
|
||||||
{ xfeCmdComposeMessageHTML, PUSHBUTTON },
|
{ xfeCmdComposeMessageHTML, PUSHBUTTON },
|
||||||
|
@ -402,6 +405,7 @@ MenuSpec XFE_Frame::compose_article_submenu_spec[] = {
|
||||||
{ xfeCmdComposeArticleHTML, PUSHBUTTON },
|
{ xfeCmdComposeArticleHTML, PUSHBUTTON },
|
||||||
{ NULL }
|
{ NULL }
|
||||||
};
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
MenuSpec XFE_Frame::next_submenu_spec[] = {
|
MenuSpec XFE_Frame::next_submenu_spec[] = {
|
||||||
{ xfeCmdNextMessage, PUSHBUTTON },
|
{ xfeCmdNextMessage, PUSHBUTTON },
|
||||||
|
@ -3175,10 +3179,12 @@ XFE_Frame::isCommandEnabled(CommandType cmd,
|
||||||
|| cmd == xfeCmdToggleMenubar
|
|| cmd == xfeCmdToggleMenubar
|
||||||
|| cmd == xfeCmdToggleNavigationToolbar
|
|| cmd == xfeCmdToggleNavigationToolbar
|
||||||
|| cmd == xfeCmdWindowListRaiseItem
|
|| cmd == xfeCmdWindowListRaiseItem
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
|| cmd == xfeCmdComposeMessage
|
|| cmd == xfeCmdComposeMessage
|
||||||
|| cmd == xfeCmdComposeMessageHTML
|
|| cmd == xfeCmdComposeMessageHTML
|
||||||
|| cmd == xfeCmdComposeMessagePlain
|
|| cmd == xfeCmdComposeMessagePlain
|
||||||
|
#endif
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
|| cmd == xfeCmdOpenAddressBook
|
|| cmd == xfeCmdOpenAddressBook
|
||||||
|| cmd == xfeCmdOpenInbox
|
|| cmd == xfeCmdOpenInbox
|
||||||
|| cmd == xfeCmdOpenInboxAndGetNewMessages
|
|| cmd == xfeCmdOpenInboxAndGetNewMessages
|
||||||
|
@ -3438,7 +3444,7 @@ XFE_Frame::doCommand(CommandType cmd, void *calldata, XFE_CommandInfo* info)
|
||||||
else
|
else
|
||||||
hide();
|
hide();
|
||||||
}
|
}
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
else if ( cmd == xfeCmdComposeMessage)
|
else if ( cmd == xfeCmdComposeMessage)
|
||||||
{
|
{
|
||||||
if (info) {
|
if (info) {
|
||||||
|
@ -3459,6 +3465,8 @@ XFE_Frame::doCommand(CommandType cmd, void *calldata, XFE_CommandInfo* info)
|
||||||
CONTEXT_DATA(m_context)->stealth_cmd = (fe_globalPrefs.send_html_msg == True) ;
|
CONTEXT_DATA(m_context)->stealth_cmd = (fe_globalPrefs.send_html_msg == True) ;
|
||||||
MSG_Mail(m_context);
|
MSG_Mail(m_context);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
else if (cmd == xfeCmdOpenInbox)
|
else if (cmd == xfeCmdOpenInbox)
|
||||||
{
|
{
|
||||||
fe_showInbox(m_toplevelWidget, this, NULL, fe_globalPrefs.reuse_thread_window, False);
|
fe_showInbox(m_toplevelWidget, this, NULL, fe_globalPrefs.reuse_thread_window, False);
|
||||||
|
@ -3763,10 +3771,12 @@ XFE_Frame::handlesCommand(CommandType cmd,
|
||||||
|| cmd == xfeCmdFloatingTaskBarAlwaysOnTop
|
|| cmd == xfeCmdFloatingTaskBarAlwaysOnTop
|
||||||
|| cmd == xfeCmdFloatingTaskBarClose
|
|| cmd == xfeCmdFloatingTaskBarClose
|
||||||
#endif
|
#endif
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
|| cmd == xfeCmdComposeMessage
|
|| cmd == xfeCmdComposeMessage
|
||||||
|| cmd == xfeCmdComposeMessageHTML
|
|| cmd == xfeCmdComposeMessageHTML
|
||||||
|| cmd == xfeCmdComposeMessagePlain
|
|| cmd == xfeCmdComposeMessagePlain
|
||||||
|
#endif
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
|| cmd == xfeCmdEditMailFilterRules
|
|| cmd == xfeCmdEditMailFilterRules
|
||||||
|| cmd == xfeCmdOpenAddressBook
|
|| cmd == xfeCmdOpenAddressBook
|
||||||
|| cmd == xfeCmdOpenFolders
|
|| cmd == xfeCmdOpenFolders
|
||||||
|
@ -3806,12 +3816,14 @@ XFE_Frame::commandToString(CommandType cmd,
|
||||||
if (handler != NULL)
|
if (handler != NULL)
|
||||||
return handler->getLabel(this, info);
|
return handler->getLabel(this, info);
|
||||||
|
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
if (cmd == xfeCmdComposeMessage)
|
if (cmd == xfeCmdComposeMessage)
|
||||||
{
|
{
|
||||||
char *res;
|
char *res;
|
||||||
res = "composeMessage";
|
res = "composeMessage";
|
||||||
return stringFromResource(res);
|
return stringFromResource(res);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
else if (cmd == xfeCmdToggleMenubar)
|
else if (cmd == xfeCmdToggleMenubar)
|
||||||
{
|
{
|
||||||
char *res = NULL;
|
char *res = NULL;
|
||||||
|
|
|
@ -550,7 +550,7 @@ XFE_HTMLView::doCommand(CommandType cmd, void *callData, XFE_CommandInfo* info)
|
||||||
getToplevel()->notifyInterested(XFE_View::chromeNeedsUpdating);
|
getToplevel()->notifyInterested(XFE_View::chromeNeedsUpdating);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
else if (IS_CMD(xfeCmdSendPage))
|
else if (IS_CMD(xfeCmdSendPage))
|
||||||
{
|
{
|
||||||
fe_mailto_cb (CONTEXT_WIDGET (m_contextData),
|
fe_mailto_cb (CONTEXT_WIDGET (m_contextData),
|
||||||
|
@ -1200,11 +1200,13 @@ XFE_HTMLView::isCommandEnabled(CommandType cmd, void *calldata, XFE_CommandInfo*
|
||||||
// Save the frame with focus
|
// Save the frame with focus
|
||||||
return hasSubViews() == True;
|
return hasSubViews() == True;
|
||||||
}
|
}
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
else if (IS_CMD(xfeCmdSendPage)
|
else if (IS_CMD(xfeCmdSendPage)
|
||||||
|| IS_CMD(xfeCmdSendLink))
|
|| IS_CMD(xfeCmdSendLink))
|
||||||
{
|
{
|
||||||
return True; // should this always be enabled?
|
return True; // should this always be enabled?
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS) || MOZ_MAIL_COMPOSE */
|
||||||
else if (IS_CMD(xfeCmdCut))
|
else if (IS_CMD(xfeCmdCut))
|
||||||
{
|
{
|
||||||
return fe_can_cut(m_contextData);
|
return fe_can_cut(m_contextData);
|
||||||
|
|
|
@ -122,33 +122,36 @@ static _name_and_group_t _iconGroups[] =
|
||||||
#ifdef MOZ_MAIL_NEWS
|
#ifdef MOZ_MAIL_NEWS
|
||||||
// Mail/News
|
// Mail/News
|
||||||
{ "GetMsg", &MNTB_GetMsg_group },
|
{ "GetMsg", &MNTB_GetMsg_group },
|
||||||
{ "Compose", &MNTB_Compose_group },
|
|
||||||
{ "Addgroup", &MNTB_AddGroup_group },
|
{ "Addgroup", &MNTB_AddGroup_group },
|
||||||
|
{ "Compose", &MNTB_Compose_group },
|
||||||
{ "Reply", &MNTB_Reply_group },
|
{ "Reply", &MNTB_Reply_group },
|
||||||
{ "ReplyAll", &MNTB_ReplyAll_group },
|
{ "ReplyAll", &MNTB_ReplyAll_group },
|
||||||
{ "Forward", &MNTB_Forward_group },
|
{ "Forward", &MNTB_Forward_group },
|
||||||
{ "File", &MNTB_File_group },
|
{ "File", &MNTB_File_group },
|
||||||
{ "Trash", &MNTB_Trash_group },
|
{ "Trash", &MNTB_Trash_group },
|
||||||
{ "Next", &MNTB_Next_group },
|
|
||||||
{ "Prev", &MNTB_Prev_group },
|
{ "Prev", &MNTB_Prev_group },
|
||||||
{ "NewFolder", &MNTB_NewFolder_group },
|
{ "NewFolder", &MNTB_NewFolder_group },
|
||||||
{ "MarkRead", &MNTB_MarkRead_group },
|
{ "MarkRead", &MNTB_MarkRead_group },
|
||||||
|
|
||||||
// Compose
|
|
||||||
{ "Send", &MNC_Send_group },
|
|
||||||
{ "Quote", &MNC_Quote_group },
|
|
||||||
{ "Address", &MNC_Address_group },
|
|
||||||
{ "Attach", &MNC_Attach_group },
|
|
||||||
{ "SpellCheck", &MNC_SpellCheck_group },
|
|
||||||
{ "Save", &MNC_Save_group },
|
|
||||||
{ "Directory", &MNC_Directory_group },
|
|
||||||
|
|
||||||
// Address Book
|
// Address Book
|
||||||
{ "NewPerson", &MNAB_NewPerson_group },
|
{ "NewPerson", &MNAB_NewPerson_group },
|
||||||
{ "NewList", &MNAB_NewList_group },
|
{ "NewList", &MNAB_NewList_group },
|
||||||
{ "Properties", &MNAB_Properties_group },
|
{ "Properties", &MNAB_Properties_group },
|
||||||
{ "Call", &MNAB_Call_group },
|
{ "Call", &MNAB_Call_group },
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE)
|
||||||
|
// Compose
|
||||||
|
{ "Send", &MNC_Send_group },
|
||||||
|
{ "Next", &MNTB_Next_group },
|
||||||
|
{ "Quote", &MNC_Quote_group },
|
||||||
|
{ "Address", &MNC_Address_group },
|
||||||
|
{ "Attach", &MNC_Attach_group },
|
||||||
|
{ "SpellCheck", &MNC_SpellCheck_group },
|
||||||
|
{ "Save", &MNC_Save_group },
|
||||||
|
{ "Directory", &MNC_Directory_group },
|
||||||
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE */
|
||||||
|
|
||||||
#ifdef EDITOR
|
#ifdef EDITOR
|
||||||
// Editor
|
// Editor
|
||||||
{ "New", &ed_new_group },
|
{ "New", &ed_new_group },
|
||||||
|
|
|
@ -128,16 +128,28 @@ ICONGROUP(MNTB_ReplyAll)
|
||||||
ICONGROUP(MNTB_Forward)
|
ICONGROUP(MNTB_Forward)
|
||||||
ICONGROUP(MNTB_File)
|
ICONGROUP(MNTB_File)
|
||||||
ICONGROUP(MNTB_Trash)
|
ICONGROUP(MNTB_Trash)
|
||||||
ICONGROUP(MNTB_Next)
|
|
||||||
ICONGROUP(MNTB_Prev)
|
ICONGROUP(MNTB_Prev)
|
||||||
ICONGROUP(MNTB_MarkRead)
|
ICONGROUP(MNTB_MarkRead)
|
||||||
|
|
||||||
/* Message Center */
|
/* Message Center */
|
||||||
ICONGROUP(MNTB_NewFolder)
|
ICONGROUP(MNTB_NewFolder)
|
||||||
|
|
||||||
|
/* Address Book. */
|
||||||
|
ICONGROUP(MNAB_NewPerson) // New Card.
|
||||||
|
ICONGROUP(MNAB_NewList)
|
||||||
|
ICONGROUP(MNAB_Properties)
|
||||||
|
/* MNTB_Compose */
|
||||||
|
/* MNC_Directory */
|
||||||
|
ICONGROUP(MNAB_Call)
|
||||||
|
/* MNTB_Trash */
|
||||||
|
|
||||||
|
#endif /* MOZ_MAIL_NEWS || !WANT_GROUPS */
|
||||||
|
|
||||||
|
#if defined(MOZ_MAIL_NEWS) || defined(MOZ_MAIL_COMPOSE) || !defined(WANT_GROUPS)
|
||||||
HG10282
|
HG10282
|
||||||
|
|
||||||
/* Compose Window. */
|
/* Compose Window. */
|
||||||
|
ICONGROUP(MNTB_Next)
|
||||||
ICONGROUP(MNC_Send)
|
ICONGROUP(MNC_Send)
|
||||||
/* MNTB_File */
|
/* MNTB_File */
|
||||||
ICONGROUP(MNC_Quote)
|
ICONGROUP(MNC_Quote)
|
||||||
|
@ -155,16 +167,7 @@ ICONGROUP(MN_CollectSmall)
|
||||||
ICONGROUP(MN_Collect)
|
ICONGROUP(MN_Collect)
|
||||||
/* TB_Stop */
|
/* TB_Stop */
|
||||||
|
|
||||||
|
#endif /* MOZ_MAIL_NEWS || MOZ_MAIL_COMPOSE || !WANT_GROUPS */
|
||||||
/* Address Book. */
|
|
||||||
ICONGROUP(MNAB_NewPerson) // New Card.
|
|
||||||
ICONGROUP(MNAB_NewList)
|
|
||||||
ICONGROUP(MNAB_Properties)
|
|
||||||
/* MNTB_Compose */
|
|
||||||
/* MNC_Directory */
|
|
||||||
ICONGROUP(MNAB_Call)
|
|
||||||
/* MNTB_Trash */
|
|
||||||
#endif /* !MOZ_MAIL_NEWS || !WANT_GROUPS */
|
|
||||||
|
|
||||||
#if defined(EDITOR) || !defined(WANT_GROUPS)
|
#if defined(EDITOR) || !defined(WANT_GROUPS)
|
||||||
/* Editor */
|
/* Editor */
|
||||||
|
|
|
@ -31,7 +31,9 @@ const char* XFE_MNListView::changeFocus = "XFE_MNListView::changeFocus";
|
||||||
|
|
||||||
extern int XFE_INBOX_DOESNT_EXIST;
|
extern int XFE_INBOX_DOESNT_EXIST;
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
extern "C" void fe_showMailFilterDlg(Widget toplevel, MWContext *context, MSG_Pane *pane);
|
extern "C" void fe_showMailFilterDlg(Widget toplevel, MWContext *context, MSG_Pane *pane);
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
XFE_MNListView::XFE_MNListView(XFE_Component *toplevel_component,
|
XFE_MNListView::XFE_MNListView(XFE_Component *toplevel_component,
|
||||||
XFE_View *parent_view, MWContext *context, MSG_Pane *p)
|
XFE_View *parent_view, MWContext *context, MSG_Pane *p)
|
||||||
|
@ -103,6 +105,7 @@ XFE_MNListView::isCommandEnabled(CommandType cmd, void *calldata, XFE_CommandInf
|
||||||
if (msg_cmd != (MSG_CommandType)~0)
|
if (msg_cmd != (MSG_CommandType)~0)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
if (IS_CMD(xfeCmdAddNewsgroup) || IS_CMD(xfeCmdInviteToNewsgroup)) {
|
if (IS_CMD(xfeCmdAddNewsgroup) || IS_CMD(xfeCmdInviteToNewsgroup)) {
|
||||||
return !XP_IsContextBusy(m_contextData);
|
return !XP_IsContextBusy(m_contextData);
|
||||||
}
|
}
|
||||||
|
@ -123,7 +126,9 @@ XFE_MNListView::isCommandEnabled(CommandType cmd, void *calldata, XFE_CommandInf
|
||||||
(MSG_ViewIndex*)&count,
|
(MSG_ViewIndex*)&count,
|
||||||
0, &selectable, NULL, NULL, NULL);
|
0, &selectable, NULL, NULL, NULL);
|
||||||
}/* else */
|
}/* else */
|
||||||
else if (count == 0 ||
|
else
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
if (count == 0 ||
|
||||||
(m_pane && MSG_GetNumLines(m_pane) == 0))
|
(m_pane && MSG_GetNumLines(m_pane) == 0))
|
||||||
{
|
{
|
||||||
MSG_CommandStatus(m_pane, msg_cmd,
|
MSG_CommandStatus(m_pane, msg_cmd,
|
||||||
|
@ -140,6 +145,7 @@ XFE_MNListView::isCommandEnabled(CommandType cmd, void *calldata, XFE_CommandInf
|
||||||
return selectable;
|
return selectable;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
else if (IS_CMD(xfeCmdEditMailFilterRules)
|
else if (IS_CMD(xfeCmdEditMailFilterRules)
|
||||||
||IS_CMD(xfeCmdSearch))
|
||IS_CMD(xfeCmdSearch))
|
||||||
{
|
{
|
||||||
|
@ -173,6 +179,7 @@ XFE_MNListView::isCommandEnabled(CommandType cmd, void *calldata, XFE_CommandInf
|
||||||
}/* if */
|
}/* if */
|
||||||
return enabled;
|
return enabled;
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
else if (IS_CMD(xfeCmdSelectAll))
|
else if (IS_CMD(xfeCmdSelectAll))
|
||||||
{
|
{
|
||||||
return True; // not sure I feel comfortable with such extremes
|
return True; // not sure I feel comfortable with such extremes
|
||||||
|
@ -189,6 +196,7 @@ XFE_MNListView::doCommand(CommandType cmd, void *calldata,
|
||||||
XFE_CommandInfo* info)
|
XFE_CommandInfo* info)
|
||||||
{
|
{
|
||||||
#define IS_CMD(command) cmd == (command)
|
#define IS_CMD(command) cmd == (command)
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
if (IS_CMD(xfeCmdSelectAll))
|
if (IS_CMD(xfeCmdSelectAll))
|
||||||
{
|
{
|
||||||
m_outliner->selectAllItems();
|
m_outliner->selectAllItems();
|
||||||
|
@ -198,6 +206,7 @@ XFE_MNListView::doCommand(CommandType cmd, void *calldata,
|
||||||
fe_showMailFilterDlg(getToplevel()->getBaseWidget(),m_contextData,m_pane);
|
fe_showMailFilterDlg(getToplevel()->getBaseWidget(),m_contextData,m_pane);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
{
|
{
|
||||||
XFE_MNView::doCommand(cmd, calldata, info);
|
XFE_MNView::doCommand(cmd, calldata, info);
|
||||||
}
|
}
|
||||||
|
@ -221,7 +230,9 @@ XFE_MNListView::commandToString(CommandType cmd, void *calldata, XFE_CommandInfo
|
||||||
|
|
||||||
if (msg_cmd != (MSG_CommandType)~0)
|
if (msg_cmd != (MSG_CommandType)~0)
|
||||||
{
|
{
|
||||||
if (IS_CMD(xfeCmdGetNewMessages)) {
|
if (0) ;
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
|
else if (IS_CMD(xfeCmdGetNewMessages)) {
|
||||||
int num_inboxes = MSG_GetFoldersWithFlag(XFE_MNView::getMaster(),
|
int num_inboxes = MSG_GetFoldersWithFlag(XFE_MNView::getMaster(),
|
||||||
MSG_FOLDER_FLAG_INBOX,
|
MSG_FOLDER_FLAG_INBOX,
|
||||||
NULL, 0);
|
NULL, 0);
|
||||||
|
@ -233,6 +244,7 @@ XFE_MNListView::commandToString(CommandType cmd, void *calldata, XFE_CommandInfo
|
||||||
return NULL;
|
return NULL;
|
||||||
}/* if */
|
}/* if */
|
||||||
}/* else */
|
}/* else */
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
else if (MSG_CommandStatus(m_pane, msg_cmd,
|
else if (MSG_CommandStatus(m_pane, msg_cmd,
|
||||||
(MSG_ViewIndex*)selected,
|
(MSG_ViewIndex*)selected,
|
||||||
count, NULL, NULL,
|
count, NULL, NULL,
|
||||||
|
@ -249,6 +261,7 @@ XFE_MNListView::commandToString(CommandType cmd, void *calldata, XFE_CommandInfo
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
else if (msg_nav != (MSG_MotionType)~0)
|
else if (msg_nav != (MSG_MotionType)~0)
|
||||||
{
|
{
|
||||||
if (count < 1
|
if (count < 1
|
||||||
|
@ -265,6 +278,7 @@ XFE_MNListView::commandToString(CommandType cmd, void *calldata, XFE_CommandInfo
|
||||||
else
|
else
|
||||||
return (char*)display_string;
|
return (char*)display_string;
|
||||||
else
|
else
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
return XFE_MNView::commandToString(cmd, calldata, info);
|
return XFE_MNView::commandToString(cmd, calldata, info);
|
||||||
#undef IS_CMD
|
#undef IS_CMD
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,21 +20,21 @@
|
||||||
Created: Chris Toshok <toshok@netscape.com>, 7-Aug-96.
|
Created: Chris Toshok <toshok@netscape.com>, 7-Aug-96.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "MozillaApp.h"
|
#include "MozillaApp.h"
|
||||||
#include "ViewGlue.h"
|
#include "ViewGlue.h"
|
||||||
#include "Frame.h"
|
#include "Frame.h"
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
|
||||||
#include "MNView.h"
|
#include "MNView.h"
|
||||||
|
#include "ComposeFrame.h"
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
#include "MNListView.h"
|
#include "MNListView.h"
|
||||||
#include "MailDownloadFrame.h"
|
#include "MailDownloadFrame.h"
|
||||||
#include "NewsPromptDialog.h"
|
#include "NewsPromptDialog.h"
|
||||||
#include "ComposeFrame.h"
|
|
||||||
#include "ABListSearchView.h"
|
#include "ABListSearchView.h"
|
||||||
#include "ThreadView.h"
|
#include "ThreadView.h"
|
||||||
#include "dirprefs.h"
|
#include "dirprefs.h"
|
||||||
#endif
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
#include "Outlinable.h"
|
#include "Outlinable.h"
|
||||||
#include "Outliner.h"
|
#include "Outliner.h"
|
||||||
|
@ -57,7 +57,6 @@
|
||||||
|
|
||||||
#include "xpgetstr.h"
|
#include "xpgetstr.h"
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
|
||||||
|
|
||||||
extern int XFE_MAIL_PRIORITY_NONE;
|
extern int XFE_MAIL_PRIORITY_NONE;
|
||||||
extern int XFE_MAIL_PRIORITY_LOWEST;
|
extern int XFE_MAIL_PRIORITY_LOWEST;
|
||||||
|
@ -69,11 +68,19 @@ extern int XFE_MAIL_SPOOL_UNKNOWN;
|
||||||
extern int XFE_UNABLE_TO_OPEN;
|
extern int XFE_UNABLE_TO_OPEN;
|
||||||
extern int XFE_NO_KEEP_ON_SERVER_WITH_MOVEMAIL;
|
extern int XFE_NO_KEEP_ON_SERVER_WITH_MOVEMAIL;
|
||||||
|
|
||||||
extern int XFE_COULDNT_FORK_FOR_MOVEMAIL;
|
extern int XFE_COULDNT_FORK_FOR_DELIVERY;
|
||||||
extern int XFE_PROBLEMS_EXECUTING;
|
extern int XFE_PROBLEMS_EXECUTING;
|
||||||
extern int XFE_TERMINATED_ABNORMALLY;
|
extern int XFE_TERMINATED_ABNORMALLY;
|
||||||
extern int XFE_APP_EXITED_WITH_STATUS;
|
extern int XFE_APP_EXITED_WITH_STATUS;
|
||||||
extern int XFE_COULDNT_FORK_FOR_DELIVERY;
|
|
||||||
|
MSG_Master *XFE_MNView::m_master = NULL;
|
||||||
|
MSG_Prefs *XFE_MNView::m_prefs = NULL;
|
||||||
|
|
||||||
|
const char *
|
||||||
|
XFE_MNView::bannerNeedsUpdating = "XFE_MNView::bannerNeedsUpdating";
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
|
extern int XFE_COULDNT_FORK_FOR_MOVEMAIL;
|
||||||
|
|
||||||
extern int XFE_GET_NEXT_N_MSGS;
|
extern int XFE_GET_NEXT_N_MSGS;
|
||||||
|
|
||||||
|
@ -81,9 +88,6 @@ extern int XFE_MARKBYDATE_CAPTION;
|
||||||
extern int XFE_MARKBYDATE;
|
extern int XFE_MARKBYDATE;
|
||||||
extern int XFE_DATE_MUST_BE_MM_DD_YY;
|
extern int XFE_DATE_MUST_BE_MM_DD_YY;
|
||||||
|
|
||||||
MSG_Master *XFE_MNView::m_master = NULL;
|
|
||||||
MSG_Prefs *XFE_MNView::m_prefs = NULL;
|
|
||||||
|
|
||||||
MSG_BIFF_STATE XFE_MNView::m_biffstate = MSG_BIFF_Unknown;
|
MSG_BIFF_STATE XFE_MNView::m_biffstate = MSG_BIFF_Unknown;
|
||||||
|
|
||||||
fe_icon XFE_MNView::inboxIcon = { 0 };
|
fe_icon XFE_MNView::inboxIcon = { 0 };
|
||||||
|
@ -139,7 +143,6 @@ static void fe_incdone(void* closure, XP_Bool result);
|
||||||
static XP_Bool fe_run_movemail (MWContext *context, const char *from, const char *to);
|
static XP_Bool fe_run_movemail (MWContext *context, const char *from, const char *to);
|
||||||
extern "C" char* fe_mn_getmailbox(void);
|
extern "C" char* fe_mn_getmailbox(void);
|
||||||
|
|
||||||
const char * XFE_MNView::bannerNeedsUpdating = "XFE_MNView::bannerNeedsUpdating";
|
|
||||||
const char * XFE_MNView::foldersHaveChanged = "XFE_MNView::foldersHaveChanged";
|
const char * XFE_MNView::foldersHaveChanged = "XFE_MNView::foldersHaveChanged";
|
||||||
const char * XFE_MNView::newsgroupsHaveChanged = "XFE_MNView::newsgroupsHaveChanged";
|
const char * XFE_MNView::newsgroupsHaveChanged = "XFE_MNView::newsgroupsHaveChanged";
|
||||||
const char * XFE_MNView::folderChromeNeedsUpdating = "XFE_MNView::folderChromeNeedsUpdating";
|
const char * XFE_MNView::folderChromeNeedsUpdating = "XFE_MNView::folderChromeNeedsUpdating";
|
||||||
|
@ -149,6 +152,7 @@ const char * XFE_MNView::folderDeleted = "XFE_MNView::folderDeleted";
|
||||||
|
|
||||||
XP_Bool XFE_MNView::m_messageDownloadInProgress = False;
|
XP_Bool XFE_MNView::m_messageDownloadInProgress = False;
|
||||||
int XFE_MNView::m_numFolderBeingLoaded = 0; // Indicate how many folder are loaded
|
int XFE_MNView::m_numFolderBeingLoaded = 0; // Indicate how many folder are loaded
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
|
|
||||||
XFE_MNView::XFE_MNView(XFE_Component *toplevel_component,
|
XFE_MNView::XFE_MNView(XFE_Component *toplevel_component,
|
||||||
|
@ -165,19 +169,22 @@ XFE_MNView::XFE_MNView(XFE_Component *toplevel_component,
|
||||||
// initialize the mail master
|
// initialize the mail master
|
||||||
getMaster();
|
getMaster();
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
XFE_MozillaApp::theApp()->registerInterest(
|
XFE_MozillaApp::theApp()->registerInterest(
|
||||||
XFE_MozillaApp::biffStateChanged,
|
XFE_MozillaApp::biffStateChanged,
|
||||||
this,
|
this,
|
||||||
(XFE_FunctionNotification) updateBiffState_cb);
|
(XFE_FunctionNotification) updateBiffState_cb);
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
}
|
}
|
||||||
|
|
||||||
XFE_MNView::~XFE_MNView()
|
XFE_MNView::~XFE_MNView()
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
XFE_MozillaApp::theApp()->unregisterInterest(
|
XFE_MozillaApp::theApp()->unregisterInterest(
|
||||||
XFE_MozillaApp::biffStateChanged,
|
XFE_MozillaApp::biffStateChanged,
|
||||||
this,
|
this,
|
||||||
(XFE_FunctionNotification)updateBiffState_cb);
|
(XFE_FunctionNotification)updateBiffState_cb);
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -393,6 +400,7 @@ char *
|
||||||
XFE_MNView::commandToString(CommandType cmd, void * calldata, XFE_CommandInfo* info)
|
XFE_MNView::commandToString(CommandType cmd, void * calldata, XFE_CommandInfo* info)
|
||||||
{
|
{
|
||||||
#define IS_CMD(command) cmd == (command)
|
#define IS_CMD(command) cmd == (command)
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
if (IS_CMD(xfeCmdNewFolder))
|
if (IS_CMD(xfeCmdNewFolder))
|
||||||
{
|
{
|
||||||
if (m_displayingNewsgroup)
|
if (m_displayingNewsgroup)
|
||||||
|
@ -436,11 +444,13 @@ XFE_MNView::commandToString(CommandType cmd, void * calldata, XFE_CommandInfo* i
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
return XFE_View::commandToString(cmd, calldata, info);
|
return XFE_View::commandToString(cmd, calldata, info);
|
||||||
|
|
||||||
#undef IS_CMD
|
#undef IS_CMD
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
void
|
void
|
||||||
XFE_MNView::markReadByDate()
|
XFE_MNView::markReadByDate()
|
||||||
{
|
{
|
||||||
|
@ -638,13 +648,12 @@ XFE_MNView::getNewMail()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
XP_Bool
|
||||||
XFE_MNView::paneChanged(XP_Bool /*asynchronous*/,
|
XFE_MNView::isDisplayingNews()
|
||||||
MSG_PANE_CHANGED_NOTIFY_CODE notify_code,
|
|
||||||
int32 /*value*/)
|
|
||||||
{
|
{
|
||||||
notifyInterested(XFE_MNView::bannerNeedsUpdating, (void*)notify_code);
|
return m_displayingNewsgroup;
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
MSG_Master *
|
MSG_Master *
|
||||||
XFE_MNView::getMaster()
|
XFE_MNView::getMaster()
|
||||||
|
@ -661,20 +670,26 @@ XFE_MNView::getMaster()
|
||||||
void
|
void
|
||||||
XFE_MNView::destroyMasterAndShutdown()
|
XFE_MNView::destroyMasterAndShutdown()
|
||||||
{
|
{
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
MWContext *biffcontext = XP_FindContextOfType(NULL, MWContextBiff);
|
MWContext *biffcontext = XP_FindContextOfType(NULL, MWContextBiff);
|
||||||
XP_ASSERT(biffcontext);
|
XP_ASSERT(biffcontext);
|
||||||
MSG_BiffCleanupContext(biffcontext);
|
MSG_BiffCleanupContext(biffcontext);
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
if (m_master)
|
if (m_master)
|
||||||
MSG_DestroyMaster(m_master);
|
MSG_DestroyMaster(m_master);
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
MSG_ShutdownMsgLib();
|
MSG_ShutdownMsgLib();
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
}
|
}
|
||||||
|
|
||||||
XP_Bool
|
void
|
||||||
XFE_MNView::isDisplayingNews()
|
XFE_MNView::paneChanged(XP_Bool /*asynchronous*/,
|
||||||
|
MSG_PANE_CHANGED_NOTIFY_CODE notify_code,
|
||||||
|
int32 /*value*/)
|
||||||
{
|
{
|
||||||
return m_displayingNewsgroup;
|
notifyInterested(XFE_MNView::bannerNeedsUpdating, (void*)notify_code);
|
||||||
}
|
}
|
||||||
|
|
||||||
Boolean
|
Boolean
|
||||||
|
@ -726,6 +741,7 @@ XFE_MNView::doCommand(CommandType cmd, void *calldata, XFE_CommandInfo* info)
|
||||||
CONTEXT_DATA(m_contextData)->stealth_cmd = (fe_globalPrefs.send_html_msg == True) ;
|
CONTEXT_DATA(m_contextData)->stealth_cmd = (fe_globalPrefs.send_html_msg == True) ;
|
||||||
MSG_Command(m_pane, commandToMsgCmd(cmd), NULL, 0);
|
MSG_Command(m_pane, commandToMsgCmd(cmd), NULL, 0);
|
||||||
}
|
}
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
else if (cmd == xfeCmdCleanUpDisk)
|
else if (cmd == xfeCmdCleanUpDisk)
|
||||||
{
|
{
|
||||||
if (MSG_CleanupNeeded(getMaster()))
|
if (MSG_CleanupNeeded(getMaster()))
|
||||||
|
@ -741,6 +757,7 @@ XFE_MNView::doCommand(CommandType cmd, void *calldata, XFE_CommandInfo* info)
|
||||||
progressFrame->cleanUpNews();
|
progressFrame->cleanUpNews();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
XFE_View::doCommand(cmd, calldata, info);
|
XFE_View::doCommand(cmd, calldata, info);
|
||||||
|
@ -749,6 +766,7 @@ XFE_MNView::doCommand(CommandType cmd, void *calldata, XFE_CommandInfo* info)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
MSG_BIFF_STATE
|
MSG_BIFF_STATE
|
||||||
XFE_MNView::getBiffState()
|
XFE_MNView::getBiffState()
|
||||||
{
|
{
|
||||||
|
@ -792,6 +810,7 @@ FE_UpdateBiff(MSG_BIFF_STATE state)
|
||||||
XFE_MozillaApp::theApp()->notifyInterested(XFE_MozillaApp::biffStateChanged,
|
XFE_MozillaApp::theApp()->notifyInterested(XFE_MozillaApp::biffStateChanged,
|
||||||
(void*)state);
|
(void*)state);
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
extern "C" void
|
extern "C" void
|
||||||
FE_UpdateToolbar (MWContext *context)
|
FE_UpdateToolbar (MWContext *context)
|
||||||
|
@ -850,6 +869,7 @@ FE_DestroyMailCompositionContext(MWContext* context)
|
||||||
cf->destroyWhenAllConnectionsComplete();
|
cf->destroyWhenAllConnectionsComplete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
extern "C" MWContext*
|
extern "C" MWContext*
|
||||||
FE_GetAddressBookContext(MSG_Pane* pane, XP_Bool /*viewnow*/)
|
FE_GetAddressBookContext(MSG_Pane* pane, XP_Bool /*viewnow*/)
|
||||||
{
|
{
|
||||||
|
@ -945,12 +965,14 @@ FE_ListChangeFinished(MSG_Pane* pane, XP_Bool asynchronous,
|
||||||
|
|
||||||
outliner->listChangeFinished(asynchronous, notify, where, num, MSG_GetNumLines(pane));
|
outliner->listChangeFinished(asynchronous, notify, where, num, MSG_GetNumLines(pane));
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
MSG_Master *
|
MSG_Master *
|
||||||
fe_getMNMaster()
|
fe_getMNMaster()
|
||||||
{
|
{
|
||||||
return XFE_MNView::getMaster();
|
return XFE_MNView::getMaster();
|
||||||
}
|
}
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
|
|
||||||
static void
|
static void
|
||||||
fe_incdone(void* closure, XP_Bool result)
|
fe_incdone(void* closure, XP_Bool result)
|
||||||
|
@ -1129,6 +1151,7 @@ fe_run_movemail (MWContext *context, const char *from, const char *to)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
/* If we're set up to deliver mail/news by running a program rather
|
/* If we're set up to deliver mail/news by running a program rather
|
||||||
than by talking to SMTP/NNTP, this does it.
|
than by talking to SMTP/NNTP, this does it.
|
||||||
|
@ -1268,6 +1291,13 @@ msg_DeliverMessageExternally(MWContext *context, const char *msg_file)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
extern "C" MSG_Master*
|
||||||
|
FE_GetMaster() {
|
||||||
|
return fe_getMNMaster();
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
extern "C" XP_Bool
|
extern "C" XP_Bool
|
||||||
FE_NewsDownloadPrompt(MWContext *context,
|
FE_NewsDownloadPrompt(MWContext *context,
|
||||||
int32 numMessagesToDownload,
|
int32 numMessagesToDownload,
|
||||||
|
@ -1290,9 +1320,4 @@ FE_NewsDownloadPrompt(MWContext *context,
|
||||||
return ret_val;
|
return ret_val;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern "C" MSG_Master*
|
|
||||||
FE_GetMaster() {
|
|
||||||
return fe_getMNMaster();
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // MOZ_MAIL_NEWS
|
#endif // MOZ_MAIL_NEWS
|
||||||
|
|
|
@ -58,24 +58,27 @@ public:
|
||||||
XFE_CommandInfo* i = NULL);
|
XFE_CommandInfo* i = NULL);
|
||||||
|
|
||||||
|
|
||||||
|
static const char *bannerNeedsUpdating; // notify the parent frame that the MNBanner needs updating.
|
||||||
|
|
||||||
|
// these next two are useful in updating more than one window's chrome.
|
||||||
|
static const char *folderChromeNeedsUpdating;
|
||||||
|
static const char *MNChromeNeedsUpdating;
|
||||||
|
|
||||||
|
static MSG_Master *getMaster();
|
||||||
|
|
||||||
|
static void destroyMasterAndShutdown(); // only do this if we're shutting down the application
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
XP_Bool isDisplayingNews();
|
XP_Bool isDisplayingNews();
|
||||||
|
|
||||||
static MSG_BIFF_STATE getBiffState();
|
static MSG_BIFF_STATE getBiffState();
|
||||||
static void setBiffState(MSG_BIFF_STATE state);
|
static void setBiffState(MSG_BIFF_STATE state);
|
||||||
|
|
||||||
static MSG_Master *getMaster();
|
|
||||||
static void destroyMasterAndShutdown(); // only do this if we're shutting down the application
|
|
||||||
|
|
||||||
static const char *bannerNeedsUpdating; // notify the parent frame that the MNBanner needs updating.
|
|
||||||
static const char *foldersHaveChanged;
|
static const char *foldersHaveChanged;
|
||||||
static const char *newsgroupsHaveChanged;
|
static const char *newsgroupsHaveChanged;
|
||||||
static const char *msgWasDeleted; // in case we need to close a frame
|
static const char *msgWasDeleted; // in case we need to close a frame
|
||||||
static const char *folderDeleted; // in case we need to close a frame
|
static const char *folderDeleted; // in case we need to close a frame
|
||||||
|
|
||||||
// these next two are useful in updating more than one window's chrome.
|
|
||||||
static const char *folderChromeNeedsUpdating;
|
|
||||||
static const char *MNChromeNeedsUpdating;
|
|
||||||
|
|
||||||
// icons used in the mail/news outliners and proxy icons
|
// icons used in the mail/news outliners and proxy icons
|
||||||
|
|
||||||
// special folder icons
|
// special folder icons
|
||||||
|
@ -126,18 +129,22 @@ public:
|
||||||
static fe_icon closedSpoolIcon;
|
static fe_icon closedSpoolIcon;
|
||||||
|
|
||||||
static fe_icon collectionsIcon;
|
static fe_icon collectionsIcon;
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
MSG_Pane *m_pane;
|
MSG_Pane *m_pane;
|
||||||
|
|
||||||
/* useful in both the threadview and msgview. */
|
/* useful in both the threadview and msgview. */
|
||||||
XP_Bool m_displayingNewsgroup;
|
XP_Bool m_displayingNewsgroup;
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
static MSG_BIFF_STATE m_biffstate;
|
static MSG_BIFF_STATE m_biffstate;
|
||||||
|
|
||||||
static XP_Bool m_messageDownloadInProgress;
|
static XP_Bool m_messageDownloadInProgress;
|
||||||
static int m_numFolderBeingLoaded; // This is controlled by Thread View only
|
static int m_numFolderBeingLoaded; // This is controlled by Thread View only
|
||||||
// Indicating how many folder being
|
// Indicating how many folder being
|
||||||
// loaded in the meantime
|
// loaded in the meantime
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
|
|
||||||
static MSG_Master *m_master;
|
static MSG_Master *m_master;
|
||||||
static MSG_Prefs *m_prefs;
|
static MSG_Prefs *m_prefs;
|
||||||
|
@ -148,12 +155,14 @@ protected:
|
||||||
|
|
||||||
virtual char *priorityToString(MSG_PRIORITY priority);
|
virtual char *priorityToString(MSG_PRIORITY priority);
|
||||||
|
|
||||||
|
#ifdef MOZ_MAIL_NEWS
|
||||||
virtual void getNewNews();
|
virtual void getNewNews();
|
||||||
virtual void getNewMail();
|
virtual void getNewMail();
|
||||||
virtual void markReadByDate();
|
virtual void markReadByDate();
|
||||||
|
|
||||||
// update the biff desktop icon
|
// update the biff desktop icon
|
||||||
XFE_CALLBACK_DECL(updateBiffState)
|
XFE_CALLBACK_DECL(updateBiffState)
|
||||||
|
#endif /* MOZ_MAIL_NEWS */
|
||||||
};
|
};
|
||||||
|
|
||||||
extern "C" MSG_Master *fe_getMNMaster();
|
extern "C" MSG_Master *fe_getMNMaster();
|
||||||
|
|
|
@ -57,7 +57,6 @@ REQUIRES =\
|
||||||
plugimpl \
|
plugimpl \
|
||||||
raptor \
|
raptor \
|
||||||
netcnvts \
|
netcnvts \
|
||||||
msg \
|
|
||||||
progress \
|
progress \
|
||||||
privacy
|
privacy
|
||||||
|
|
||||||
|
@ -66,6 +65,14 @@ REQUIRES += oji \
|
||||||
ojiimpl
|
ojiimpl
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef MOZ_MAIL_NEWS
|
||||||
|
REQUIRES += msg
|
||||||
|
else
|
||||||
|
ifdef MOZ_MAIL_COMPOSE
|
||||||
|
REQUIRES += mailto
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
CPPSRCS = \
|
CPPSRCS = \
|
||||||
plugin.cpp \
|
plugin.cpp \
|
||||||
BackForwardMenu.cpp \
|
BackForwardMenu.cpp \
|
||||||
|
@ -143,6 +150,33 @@ CPPSRCS += \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef MOZ_MAIL_NEWS
|
||||||
|
MAIL_OR_COMPOSE = 1
|
||||||
|
endif
|
||||||
|
ifdef MOZ_MAIL_COMPOSE
|
||||||
|
MAIL_OR_COMPOSE = 1
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef MAIL_OR_COMPOSE
|
||||||
|
CPPSRCS += \
|
||||||
|
AddressFolderView.cpp \
|
||||||
|
AddressOutliner.cpp \
|
||||||
|
AttachPanel.cpp \
|
||||||
|
AttachmentMenu.cpp \
|
||||||
|
ComposeAttachDialog.cpp \
|
||||||
|
ComposeAttachFolderView.cpp \
|
||||||
|
ComposeFolderView.cpp \
|
||||||
|
ComposeFrame.cpp \
|
||||||
|
ComposeView.cpp \
|
||||||
|
MNView.cpp \
|
||||||
|
MNListView.cpp \
|
||||||
|
OptionFolderView.cpp \
|
||||||
|
ProgressFrame.cpp \
|
||||||
|
TabView.cpp \
|
||||||
|
TextEditorView.cpp \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef MOZ_MAIL_NEWS
|
ifdef MOZ_MAIL_NEWS
|
||||||
CPPSRCS += \
|
CPPSRCS += \
|
||||||
ABComplPickerDlg.cpp \
|
ABComplPickerDlg.cpp \
|
||||||
|
@ -165,57 +199,16 @@ CPPSRCS += \
|
||||||
ABNameGenTab.cpp \
|
ABNameGenTab.cpp \
|
||||||
AddrBookFrame.cpp \
|
AddrBookFrame.cpp \
|
||||||
AddrBookView.cpp \
|
AddrBookView.cpp \
|
||||||
AddressFolderView.cpp \
|
|
||||||
AddressOutliner.cpp \
|
|
||||||
AdvSearchDialog.cpp \
|
AdvSearchDialog.cpp \
|
||||||
AttachPanel.cpp \
|
|
||||||
AttachmentMenu.cpp \
|
|
||||||
ComposeAttachDialog.cpp \
|
|
||||||
ComposeAttachFolderView.cpp \
|
|
||||||
ComposeFolderView.cpp \
|
|
||||||
ComposeFrame.cpp \
|
|
||||||
ComposeView.cpp \
|
|
||||||
EditHdrDialog.cpp \
|
EditHdrDialog.cpp \
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
|
|
||||||
ifdef EDITOR
|
|
||||||
CPPSRCS += \
|
|
||||||
EditorDrop.cpp \
|
|
||||||
EditorFrame.cpp \
|
|
||||||
EditorToolbar.cpp \
|
|
||||||
EditorView.cpp \
|
|
||||||
EditRecentMenu.cpp \
|
|
||||||
EditTableDialog.cpp \
|
|
||||||
EmbeddedEditorView.cpp \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MOZ_MAIL_NEWS
|
|
||||||
CPPSRCS += \
|
|
||||||
FolderDropdown.cpp \
|
FolderDropdown.cpp \
|
||||||
FolderFrame.cpp \
|
FolderFrame.cpp \
|
||||||
FolderPromptDialog.cpp \
|
FolderPromptDialog.cpp \
|
||||||
FolderMenu.cpp \
|
FolderMenu.cpp \
|
||||||
FolderView.cpp \
|
FolderView.cpp \
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MOZ_LDAP
|
|
||||||
CPPSRCS += \
|
|
||||||
LdapSearchFrame.cpp \
|
|
||||||
LdapSearchView.cpp \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MOZ_MAIL_NEWS
|
|
||||||
CPPSRCS += \
|
|
||||||
MNBanner.cpp \
|
MNBanner.cpp \
|
||||||
MNListView.cpp \
|
|
||||||
MNSearchFrame.cpp \
|
MNSearchFrame.cpp \
|
||||||
MNSearchView.cpp \
|
MNSearchView.cpp \
|
||||||
MNView.cpp \
|
|
||||||
MailDownloadFrame.cpp \
|
MailDownloadFrame.cpp \
|
||||||
MailFilterDlg.cpp \
|
MailFilterDlg.cpp \
|
||||||
MailFilterRulesDlg.cpp \
|
MailFilterRulesDlg.cpp \
|
||||||
|
@ -228,37 +221,18 @@ CPPSRCS += \
|
||||||
NewsServerDialog.cpp \
|
NewsServerDialog.cpp \
|
||||||
NewsServerPropDialog.cpp \
|
NewsServerPropDialog.cpp \
|
||||||
NewsgroupPropDialog.cpp \
|
NewsgroupPropDialog.cpp \
|
||||||
OptionFolderView.cpp \
|
|
||||||
PrefsDialogMServer.cpp \
|
PrefsDialogMServer.cpp \
|
||||||
PrefsDialogNServer.cpp \
|
PrefsDialogNServer.cpp \
|
||||||
PrefsMailFolderDlg.cpp \
|
PrefsMailFolderDlg.cpp \
|
||||||
PrefsPageAddress.cpp \
|
PrefsPageAddress.cpp \
|
||||||
PrefsPageMessages.cpp \
|
PrefsPageMessages.cpp \
|
||||||
PrefsPageNServer.cpp \
|
PrefsPageNServer.cpp \
|
||||||
ProgressFrame.cpp \
|
|
||||||
SubUpgradeDialog.cpp \
|
SubUpgradeDialog.cpp \
|
||||||
TabView.cpp \
|
|
||||||
XmLFolderDialog.cpp \
|
XmLFolderDialog.cpp \
|
||||||
XmLFolderView.cpp \
|
XmLFolderView.cpp \
|
||||||
ViewDashBDlg.cpp \
|
ViewDashBDlg.cpp \
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef EDITOR
|
|
||||||
CPPSRCS += \
|
|
||||||
PrefsDialogEditor.cpp \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MOZ_MAIL_NEWS
|
|
||||||
CPPSRCS += \
|
|
||||||
PropertySheetDialog.cpp \
|
PropertySheetDialog.cpp \
|
||||||
PropertySheetView.cpp \
|
PropertySheetView.cpp \
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MOZ_MAIL_NEWS
|
|
||||||
CPPSRCS += \
|
|
||||||
ReadAttachDrag.cpp \
|
ReadAttachDrag.cpp \
|
||||||
ReadAttachPanel.cpp \
|
ReadAttachPanel.cpp \
|
||||||
SearchRuleView.cpp \
|
SearchRuleView.cpp \
|
||||||
|
@ -268,6 +242,35 @@ CPPSRCS += \
|
||||||
SubTabView.cpp \
|
SubTabView.cpp \
|
||||||
SubscribeDialog.cpp \
|
SubscribeDialog.cpp \
|
||||||
SubscribeView.cpp \
|
SubscribeView.cpp \
|
||||||
|
ThreadFrame.cpp \
|
||||||
|
ThreadView.cpp \
|
||||||
|
$(NULL)
|
||||||
|
|
||||||
|
ifdef USE_3PANE
|
||||||
|
CPPSRCS += \
|
||||||
|
ThreePaneView.cpp \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef EDITOR
|
||||||
|
CPPSRCS += \
|
||||||
|
EditorDrop.cpp \
|
||||||
|
EditorFrame.cpp \
|
||||||
|
EditorToolbar.cpp \
|
||||||
|
EditorView.cpp \
|
||||||
|
EditRecentMenu.cpp \
|
||||||
|
EditTableDialog.cpp \
|
||||||
|
EmbeddedEditorView.cpp \
|
||||||
|
PrefsDialogEditor.cpp \
|
||||||
|
SpellHandler.cpp \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef MOZ_LDAP
|
||||||
|
CPPSRCS += \
|
||||||
|
LdapSearchFrame.cpp \
|
||||||
|
LdapSearchView.cpp \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -292,41 +295,16 @@ ifdef XFE_FILE_BOOKMARK_IN_LINK_CONTEXT_MENU
|
||||||
DEFINES += -DXFE_FILE_BOOKMARK_IN_LINK_CONTEXT_MENU
|
DEFINES += -DXFE_FILE_BOOKMARK_IN_LINK_CONTEXT_MENU
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef MOZ_MAIL_NEWS
|
|
||||||
CPPSRCS += \
|
|
||||||
TextEditorView.cpp \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MOZ_MAIL_NEWS
|
|
||||||
CPPSRCS += \
|
|
||||||
ThreadFrame.cpp \
|
|
||||||
ThreadView.cpp \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
ifdef USE_3PANE
|
|
||||||
CPPSRCS += \
|
|
||||||
ThreePaneView.cpp \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef EDITOR
|
|
||||||
CPPSRCS += \
|
|
||||||
SpellHandler.cpp \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
CSRCS = commands.c
|
CSRCS = commands.c
|
||||||
|
|
||||||
include $(DEPTH)/config/rules.mk
|
include $(DEPTH)/config/rules.mk
|
||||||
|
|
||||||
INCLUDES += -I$(OBJDIR) -I.. -I../DtWidgets -I$(DEPTH)/modules/libreg/include \
|
INCLUDES += -I$(OBJDIR) -I.. -I../DtWidgets -I$(DEPTH)/modules/libreg/include \
|
||||||
-I$(DEPTH)/lib/libmsg -I$(DEPTH)/dist/public/security -I$(DEPTH)/dist/public/ldap
|
-I$(DEPTH)/dist/public/security
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
ifdef MOZ_MAIL_NEWS
|
||||||
#CFLAGS += -DEDITOR
|
INCLUDES += -I$(DEPTH)/lib/libmsg -I$(DEPTH)/dist/public/ldap
|
||||||
#endif
|
endif
|
||||||
|
|
||||||
DEFINES += -DNEW_DECODERS -DDELAYED_MENU_CREATION -DNETCASTER_ZAXIS_HACKERY
|
DEFINES += -DNEW_DECODERS -DDELAYED_MENU_CREATION -DNETCASTER_ZAXIS_HACKERY
|
||||||
DEFINES += -DUSE_MAGIC_TOOLBAR
|
DEFINES += -DUSE_MAGIC_TOOLBAR
|
||||||
|
|
|
@ -2739,7 +2739,6 @@ FE_UsersOrganization (void)
|
||||||
return cached_org;
|
return cached_org;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef MOZ_MAIL_NEWS
|
|
||||||
const char *
|
const char *
|
||||||
FE_UsersSignature (void)
|
FE_UsersSignature (void)
|
||||||
{
|
{
|
||||||
|
@ -2810,7 +2809,6 @@ FE_UsersSignature (void)
|
||||||
|
|
||||||
return signature;
|
return signature;
|
||||||
}
|
}
|
||||||
#endif /* MOZ_MAIL_NEWS */
|
|
||||||
|
|
||||||
|
|
||||||
int32
|
int32
|
||||||
|
|
Загрузка…
Ссылка в новой задаче