Change a lot of http:// URLs to https://.

Most of our sites are now HTTPS-only. Update URLs accordingly. Update
other URLs while we're at it. Remove or comment out dead links.

Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33
Reviewed-on: https://code.wireshark.org/review/7621
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

2 files changed, 8 insertions, 24 deletions

diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index a931741104..bf31fec78a 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -391,7 +391,7 @@ static void selected_ptree_info_answered_cb(gpointer dialog _U_, gint btn, gpoin
     case(ESD_BTN_OK):
         if (cfile.finfo_selected) {
             /* open wiki page using the protocol abbreviation */
-            selected_proto_url = g_strdup_printf("http://wiki.wireshark.org/Protocols/%s", proto_abbrev);
+            selected_proto_url = g_strdup_printf("https://wiki.wireshark.org/Protocols/%s", proto_abbrev);
             browser_open_url(selected_proto_url);
             g_free(selected_proto_url);
         }
@@ -470,7 +470,7 @@ static void selected_ptree_ref_answered_cb(gpointer dialog _U_, gint btn, gpoint
     case(ESD_BTN_OK):
         if (cfile.finfo_selected) {
             /* open reference page using the protocol abbreviation */
-            selected_proto_url = g_strdup_printf("http://www.wireshark.org/docs/dfref/%c/%s", proto_abbrev[0], proto_abbrev);
+            selected_proto_url = g_strdup_printf("https://www.wireshark.org/docs/dfref/%c/%s", proto_abbrev[0], proto_abbrev);
             browser_open_url(selected_proto_url);
             g_free(selected_proto_url);
         }
@@ -1177,7 +1177,7 @@ print_usage(gboolean for_help_option) {
         output = stdout;
         fprintf(output, "Wireshark %s\n"
             "Interactively dump and analyze network traffic.\n"
-            "See http://www.wireshark.org for more information.\n",
+            "See https://www.wireshark.org for more information.\n",
             get_ws_vcs_version_info());
     } else {
         output = stderr;
@@ -2106,7 +2106,7 @@ check_and_warn_user_startup(gchar *cf_name _U_)
         "This could be dangerous.\n\n"
         "If you're running Wireshark this way in order to perform live capture, "
         "you may want to be aware that there is a better way documented at\n"
-        "http://wiki.wireshark.org/CaptureSetup/CapturePrivileges", cur_user, cur_group);
+        "https://wiki.wireshark.org/CaptureSetup/CapturePrivileges", cur_user, cur_group);
         g_free(cur_user);
         g_free(cur_group);
         simple_dialog_check_set(priv_warning_dialog, "Don't show this message again.");
diff --git a/ui/gtk/main_welcome.c b/ui/gtk/main_welcome.c
index cf1eb41746..0ba63b2cc9 100644
--- a/ui/gtk/main_welcome.c
+++ b/ui/gtk/main_welcome.c
@@ -495,7 +495,7 @@ typedef struct _recent_item_status {
 /*
  * Fetch the status of a file.
  * This function might be called as a thread. We can't use any drawing
- * routines here: http://developer.gnome.org/gdk/2.24/gdk-Threads.html
+ * routines here: https://developer.gnome.org/gdk3/stable/gdk3-Threads.html
  */
 static void *
 get_recent_item_status(void *data)
@@ -1096,25 +1096,9 @@ fill_capture_box(void)
                                   "must be installed; see\n"
                                   "\n"
 #if GTK_CHECK_VERSION(2,18,0)
-                                  "        <a href=\"http://www.winpcap.org/\">http://www.winpcap.org/</a>\n"
+                                  "        <a href=\"https://www.winpcap.org/\">https://www.winpcap.org/</a>\n"
 #else
-                                  "        http://www.winpcap.org/\n"
-#endif
-                                  "\n"
-                                  "or the mirror at\n"
-                                  "\n"
-#if GTK_CHECK_VERSION(2,18,0)
-                                  "        <a href=\"http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\">http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/</a>\n"
-#else
-                                  "        http://www.mirrors.wiretapped.net/security/packet-capture/winpcap/\n"
-#endif
-                                  "\n"
-                                  "or the mirror at\n"
-                                  "\n"
-#if GTK_CHECK_VERSION(2,18,0)
-                                  "        <a href=\"http://winpcap.cs.pu.edu.tw/\">http://winpcap.cs.pu.edu.tw/</a>\n"
-#else
-                                  "        http://winpcap.cs.pu.edu.tw/\n"
+                                  "        https://www.winpcap.org/\n"
 #endif
                                   "\n"
                                   "for a downloadable version of WinPcap "
@@ -1452,7 +1436,7 @@ get_welcome_window(void)
 }
 
 /*
- * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
  *
  * Local variables:
  * c-basic-offset: 4