From e013c5ec7f175f4e12f20f201d639e64609960de Mon Sep 17 00:00:00 2001
From: Guy Harris <gharris@sonic.net>
Date: Fri, 2 Oct 2020 19:17:00 -0700
Subject: Clean up URLs.

Add ui/urls.h to define some URLs on various of our websites.  Use the
GitLab URL for the wiki.  Add a macro to generate wiki URLs.

Update wiki URLs in comments etc.

Use the #defined URL for the docs page in
WelcomePage::on_helpLabel_clicked; that removes the last user of
topic_online_url(), so get rid of it and swallow it up into
topic_action_url().
---
 tshark.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tshark.c')

diff --git a/tshark.c b/tshark.c
index a08b9b64d7..d3e78fff3a 100644
--- a/tshark.c
+++ b/tshark.c
@@ -43,6 +43,7 @@
 
 #include <ui/clopts_common.h>
 #include <ui/cmdarg_err.h>
+#include <ui/urls.h>
 #include <wsutil/filesystem.h>
 #include <wsutil/file_util.h>
 #include <wsutil/socket.h>
@@ -2064,7 +2065,7 @@ main(int argc, char *argv[])
               "Sorry, but TShark has to terminate now.\n"
               "\n"
               "More information and workarounds can be found at\n"
-              "https://wiki.wireshark.org/KnownBugs/OutOfMemory\n");
+              WS_WIKI_URL("KnownBugs/OutOfMemory") "\n");
       status = PROCESS_FILE_ERROR;
     }
     ENDTRY;
@@ -2573,7 +2574,7 @@ capture(void)
             "Sorry, but TShark has to terminate now.\n"
             "\n"
             "More information and workarounds can be found at\n"
-            "https://wiki.wireshark.org/KnownBugs/OutOfMemory\n");
+             WS_WIKI_URL("KnownBugs/OutOfMemory") "\n");
     abort();
   }
   ENDTRY;
-- 
cgit v1.2.3