diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-03-10 10:46:50 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-03-10 19:30:50 +0000 |
commit | cac102eee3db8d498b1e2d91ee2b49cfe4f531e4 (patch) | |
tree | 7c96252e392c297c813265f031ecf637bde7f623 /ui | |
parent | 7f61e90eebddb7244c66bf94c970a5fd44781cb2 (diff) |
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>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/capture.c | 6 | ||||
-rw-r--r-- | ui/gtk/main.c | 8 | ||||
-rw-r--r-- | ui/gtk/main_welcome.c | 24 | ||||
-rw-r--r-- | ui/help_url.c | 22 | ||||
-rw-r--r-- | ui/qt/main_welcome.ui | 8 |
5 files changed, 26 insertions, 42 deletions
diff --git a/ui/capture.c b/ui/capture.c index 1a9543db42..64f28dbf50 100644 --- a/ui/capture.c +++ b/ui/capture.c @@ -302,7 +302,7 @@ capture_input_read_all(capture_session *cap_session, gboolean is_tempfile, "\n" "Help about capturing can be found at\n" "\n" -" http://wiki.wireshark.org/CaptureSetup" +" https://wiki.wireshark.org/CaptureSetup" #ifdef _WIN32 "\n\n" "Wireless (Wi-Fi/WLAN):\n" @@ -592,7 +592,7 @@ capture_input_closed(capture_session *cap_session, gchar *msg) "\n" "Help about capturing can be found at\n" "\n" - " http://wiki.wireshark.org/CaptureSetup" + " https://wiki.wireshark.org/CaptureSetup" #ifdef _WIN32 "\n\n" "Wireless (Wi-Fi/WLAN):\n" @@ -799,7 +799,7 @@ capture_stat_stop(if_stat_cache_t *sc) { #endif /* HAVE_LIBPCAP */ /* - * Editor modelines - http://www.wireshark.org/tools/modelines.html + * Editor modelines - https://www.wireshark.org/tools/modelines.html * * Local Variables: * c-basic-offset: 2 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 diff --git a/ui/help_url.c b/ui/help_url.c index 0f9520a1b1..9cf9aa0592 100644 --- a/ui/help_url.c +++ b/ui/help_url.c @@ -73,40 +73,40 @@ topic_online_url(topic_action_e action) { switch(action) { case(ONLINEPAGE_HOME): - return "http://www.wireshark.org"; + return "https://www.wireshark.org"; break; case(ONLINEPAGE_WIKI): - return "http://wiki.wireshark.org"; + return "https://wiki.wireshark.org"; break; case(ONLINEPAGE_DOWNLOAD): - return "http://www.wireshark.org/download.html"; + return "https://www.wireshark.org/download.html"; break; case(ONLINEPAGE_USERGUIDE): - return "http://www.wireshark.org/docs/wsug_html_chunked/"; + return "https://www.wireshark.org/docs/wsug_html_chunked/"; break; case(ONLINEPAGE_FAQ): return "http://www.wireshark.org/faq.html"; break; case(ONLINEPAGE_ASK): - return "http://ask.wireshark.org"; + return "https://ask.wireshark.org"; break; case(ONLINEPAGE_SAMPLE_FILES): - return "http://wiki.wireshark.org/SampleCaptures"; + return "https://wiki.wireshark.org/SampleCaptures"; break; case(ONLINEPAGE_CAPTURE_SETUP): - return "http://wiki.wireshark.org/CaptureSetup"; + return "https://wiki.wireshark.org/CaptureSetup"; break; case(ONLINEPAGE_NETWORK_MEDIA): - return "http://wiki.wireshark.org/CaptureSetup/NetworkMedia"; + return "https://wiki.wireshark.org/CaptureSetup/NetworkMedia"; break; case(ONLINEPAGE_SAMPLE_CAPTURES): - return "http://wiki.wireshark.org/SampleCaptures"; + return "https://wiki.wireshark.org/SampleCaptures"; break; case(ONLINEPAGE_SECURITY): - return "http://wiki.wireshark.org/Security"; + return "https://wiki.wireshark.org/Security"; break; case(ONLINEPAGE_CHIMNEY): - return "http://wiki.wireshark.org/CaptureSetup/Offloading#chimney"; + return "https://wiki.wireshark.org/CaptureSetup/Offloading#chimney"; break; default: return NULL; diff --git a/ui/qt/main_welcome.ui b/ui/qt/main_welcome.ui index c59c32e96c..8efaa9330b 100644 --- a/ui/qt/main_welcome.ui +++ b/ui/qt/main_welcome.ui @@ -232,19 +232,19 @@ a:hover { <body> <table><tr> -<th><a href="http://www.wireshark.org/docs/wsug_html_chunked/">User's Guide</a></th> +<th><a href="https://www.wireshark.org/docs/wsug_html_chunked/">User's Guide</a></th> <td style="padding-left: 8px; padding-right: 8px;">·</td> -<th><a href="http://wiki.wireshark.org/">Wiki</a></th> +<th><a href="https://wiki.wireshark.org/">Wiki</a></th> <td style="padding-left: 8px; padding-right: 8px;">·</td> -<th><a href="http://ask.wireshark.org/">Questions and Answers</a></th> +<th><a href="https://ask.wireshark.org/">Questions and Answers</a></th> <td style="padding-left: 8px; padding-right: 8px;">·</td> -<th><a href="http://www.wireshark.org/lists/">Mailing Lists</a></th> +<th><a href="https://www.wireshark.org/lists/">Mailing Lists</a></th> </tr></table> </body></html></string> |