add link to the Claws site's FAQ page in Help menu
authorPaul Mangan <paul@claws-mail.org>
Thu, 17 Jul 2003 08:55:55 +0000 (08:55 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 17 Jul 2003 08:55:55 +0000 (08:55 +0000)
ChangeLog.claws
configure.ac
src/common/defs.h
src/mainwindow.c
src/manual.c
src/manual.h

index 3db0ce8..fc24cc3 100644 (file)
@@ -1,3 +1,15 @@
+2003-07-17 [paul]      0.9.3claws16
+
+       * src/common/defs.h
+         src/mainwindow.c
+         src/manual.[ch]
+               add link to the Claws site's FAQ page, after the suggestion
+               and patch by Fred Marton <Fred.Marton@uni-bayreuth.de>
+               Move url strings to defs.h
+               
+       * src/mainwindow.c
+               fix typo to prevent "unknown menu entry" warnings
+
 2003-07-17 [alfons]    0.9.3claws15
 
        * src/folderview.[ch]
index 758768b..828f398 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws15
+EXTRA_VERSION=claws16
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 688c750..1cd4d9a 100644 (file)
 #define MANUAL_HTML_INDEX      "sylpheed.html"
 #define FAQ_HTML_INDEX         "sylpheed-faq.html"
 #define HOMEPAGE_URI           "http://claws.sylpheed.org/"
+#define SYLDOC_URI             "http://sylpheeddoc.sourceforge.net/"
+#define SYLDOC_MANUAL_HTML_INDEX "manual/manual.html"
+#define SYLDOC_FAQ_HTML_INDEX  "faq/faq.html"
+#define CLAWS_FAQ_URI          "http://sylpheed-claws.sourceforge.net/phpwiki/index.php"
 #define FOLDER_LIST            "folderlist.xml"
 #define CACHE_FILE             ".sylpheed_cache"
 #define MARK_FILE              ".sylpheed_mark"
index 540befa..5be5d41 100644 (file)
@@ -699,6 +699,8 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_Help/_FAQ (Local)"),             NULL, manual_open_cb, MANUAL_FAQ_LOCAL, NULL},
        {N_("/_Help/_FAQ (Sylpheed Doc Homepage)"),
                                                NULL, manual_open_cb, MANUAL_FAQ_SYLDOC, NULL},
+       {N_("/_Help/_Claws FAQ (Claws Documentation)"),
+                                               NULL, manual_open_cb, MANUAL_FAQ_CLAWS, NULL},
        {N_("/_Help/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Help/_About"),                   NULL, about_show, 0, NULL}
 };
@@ -1530,7 +1532,7 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                SensitiveCond cond;
        } entry[] = {
                {"/File/Folder"                               , M_UNLOCKED},
-               {"/File/Add mailbox..."                       , M_UNLOCKED},
+               {"/File/Add mailbox"                          , M_UNLOCKED},
 
                 {"/File/Add mailbox/MH..."                   , M_UNLOCKED},
                {"/File/Add mailbox/mbox..."                  , M_UNLOCKED},
index 981c734..a1677af 100644 (file)
@@ -142,16 +142,20 @@ void manual_open(ManualType type)
 
                case MANUAL_MANUAL_SYLDOC:
                        lang_str = get_syldoc_language();
-                       uri = g_strconcat("http://sylpheeddoc.sourceforge.net/", lang_str, "/manual/manual.html", NULL);
+                       uri = g_strconcat(SYLDOC_URI, lang_str, SYLDOC_MANUAL_HTML_INDEX, NULL);
                        g_free(lang_str);
                        break;
 
                case MANUAL_FAQ_SYLDOC:
                        lang_str = get_syldoc_language();
-                       uri = g_strconcat("http://sylpheeddoc.sourceforge.net/", lang_str, "/faq/faq.html", NULL);
+                       uri = g_strconcat(SYLDOC_URI, lang_str, SYLDOC_FAQ_HTML_INDEX, NULL);
                        g_free(lang_str);
                        break;
 
+               case MANUAL_FAQ_CLAWS:
+                       uri = g_strconcat(CLAWS_FAQ_URI, NULL);
+                       break;
+
                default:
                        break;
        }
index 8b6d330..6736e9f 100644 (file)
@@ -26,6 +26,7 @@ typedef enum
        MANUAL_MANUAL_SYLDOC,
        MANUAL_FAQ_LOCAL,
        MANUAL_FAQ_SYLDOC,
+       MANUAL_FAQ_CLAWS,
 } ManualType;
 
 gboolean manual_available      (ManualType type);