Changeset 898

Timestamp:

Dec 31, 2007, 1:41:15 AM (18 years ago)

Author:

Gregg Young

Message:

Add option to not use <mailto:> wrapper (it doesn't work with the old pmmail); Cleanup of mailrun code; Replaced dunno.ico with a new version from David

Location:

trunk/dll

Files:

• fm3dlg.h (modified) (1 diff)
• fm3dll.h (modified) (1 diff)
• fm3res.dlg (modified) (1 diff)
• icons/dunno.ico (modified) ( previous)
• init.c (modified) (2 diffs)
• newview.c (modified) (4 diffs)
• notebook.c (modified) (2 diffs)

trunk/dll/fm3dlg.h

@@ -673 +673 @@
 
 #define CFGH_FRAME                                                                      25344
+#define CFGH_NOMAILTOMAILRUN                                                            25345
 #define CFGH_HTTPRUN                                                                    25346
 #define CFGH_FTPRUN                                                                     25347

trunk/dll/fm3dll.h

@@ -1415 +1415 @@
   fFM2Deletes, fAutoAddAllDirs, fConfirmTarget, fChangeTarget,
   fFirstTime, fShowTarget, fNoFinger, fDrivebarHelp, fCheckMM,
-  fSubjectLengthMax, fNoLargeFileSupport,
+  fSubjectLengthMax, fNoLargeFileSupport, fNoMailtoMailRun,
   fHttpRunWPSDefault, fFtpRunWPSDefault, fLibPathStrictMailRun,
   fLibPathStrictHttpRun, fLibPathStrictFtpRun;

trunk/dll/fm3res.dlg

@@ -1962 +1962 @@
         AUTOCHECKBOX    "Use WPS default for run ftp",
                         CFGH_FTPRUNWPSDEFAULT, 4, 110, 156, 10
+        AUTOCHECKBOX    "Don't use <mailto> wrapper",
+                        CFGH_NOMAILTOMAILRUN, 4, 98, 156, 10
         AUTOCHECKBOX    "Use LIBPATHSTRICT for run http",
                         CFGH_LIBPATHSTRICTHTTPRUN, 162, 122, 156, 10

trunk/dll/init.c

@@ -1206 +1206 @@
   PrfQueryProfileData(fmprof, appname, "HttpRunDir", httprundir, &size);
   size = sizeof(mailrundir);
-  PrfQueryProfileData(fmprof, appname, "MailRun", mailrun, &size);
+  PrfQueryProfileData(fmprof, appname, "MailRunDir", mailrundir, &size);
   size = sizeof(lasttoolbox);
   PrfQueryProfileData(fmprof, FM3Str, "LastToolBox", lasttoolbox,
@@ -1218 +1218 @@
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, appname, "LibPathStrictMailRun", &fLibPathStrictMailRun,
+                      &size);
+  size = sizeof(BOOL);
+  PrfQueryProfileData(fmprof, appname, "NoMailtoMailRun", &fNoMailtoMailRun,
                       &size);
   size = sizeof(BOOL);

trunk/dll/newview.c

@@ -154 +154 @@
   remove_first_occurence_of_character("\n", pszSrc);
   if (!strstr(pszSrc, " ")){
-    if (!stristr(pszSrc, "<mailto:")) {
+    if (!stristr(pszSrc, "<mailto:") && !fNoMailtoMailRun) {
       strip_lead_char("<", pszSrc);
       strip_trail_char(">", pszSrc);
@@ -163 +163 @@
     }
     else {
+      strip_lead_char("<", pszSrc);
+      strip_trail_char(">", pszSrc);
       return pszSrc;
     }
@@ -179 +181 @@
     pszCharCounter++;
   *pszCharCounter = 0;
-  if (!stristr(pszSrc, "<mailto:")) {
+  if (!stristr(pszSrc, "<mailto:") && !fNoMailtoMailRun) {
     strip_lead_char("<", pszSrc);
     strip_trail_char(">", pszSrc);
@@ -188 +190 @@
     }
   else {
+    strip_lead_char("<", pszSrc);
+    strip_trail_char(">", pszSrc);
     return pszSrc;
   }

trunk/dll/notebook.c

@@ -544 +544 @@
     WinCheckButton(hwnd, CFGH_LIBPATHSTRICTFTPRUN, fLibPathStrictFtpRun);
     WinCheckButton(hwnd, CFGH_LIBPATHSTRICTMAILRUN, fLibPathStrictMailRun);
+    WinCheckButton(hwnd, CFGH_NOMAILTOMAILRUN, fNoMailtoMailRun);
     return 0;
 
@@ -702 +703 @@
       PrfWriteProfileData(fmprof, appname, "LibPathStrictMailRun",
                           &fLibPathStrictMailRun, sizeof(BOOL));
+      fNoMailtoMailRun = WinQueryButtonCheckstate(hwnd, CFGH_NOMAILTOMAILRUN);
+      PrfWriteProfileData(fmprof, appname, "NoMailtoMailRun",
+                          &fNoMailtoMailRun, sizeof(BOOL));
       break;
     }