diff --git a/CMakeLists.txt b/CMakeLists.txt index b5c3f06..a39d9d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20) -project(prozgui VERSION 2.4.2 LANGUAGES C CXX) +project(prozgui VERSION 2.4.3 LANGUAGES C CXX) include(GNUInstallDirs) find_package(Threads REQUIRED) diff --git a/docs/FAQ b/docs/FAQ index 5965a01..3f6b97b 100644 --- a/docs/FAQ +++ b/docs/FAQ @@ -248,7 +248,7 @@ contact me. _*Q*: Where is the homepage for ProZilla... -*A*: http://www.prozilla.genesys.ro is the ProZilla homepage +*A*: https://prozilla.disconnected-by-peer.at is the ProZilla homepage where you can get the latest versions and updates about ProZilla. 6.2 Bugs / Where do I post bugs? @@ -261,4 +261,3 @@ wellcome them. - diff --git a/man/prozgui.1 b/man/prozgui.1 index 5919f9f..be466a2 100644 --- a/man/prozgui.1 +++ b/man/prozgui.1 @@ -83,7 +83,7 @@ Calin Damian .br David L. Matthews .br -Pablo Iranzo Gómez +Pablo Iranzo Gómez .br Ruben Boer .br @@ -102,4 +102,4 @@ Gustavo Noronha Silva .br Uwe Hermann .SH "SEE ALSO" -\fIHomepage:\fR http://prozilla.genesys.ro/ +\fIHomepage:\fR https://prozilla.disconnected-by-peer.at diff --git a/po/de.po b/po/de.po index 4edf1e9..ea79a0f 100644 --- a/po/de.po +++ b/po/de.po @@ -282,8 +282,8 @@ msgid "Eric Lassauge - French Translation" msgstr "Eric Lassauge – Französische Ãœbersetzung" #: src/we.cxx:4358 -msgid "Webpage - http://prozilla.genesys.ro/" -msgstr "Webseite – http://prozilla.genesys.ro/" +msgid "Webpage - https://prozilla.disconnected-by-peer.at" +msgstr "Webseite – https://prozilla.disconnected-by-peer.at" #: src/we.cxx:4652 msgid "Please enter the URL" diff --git a/po/es.po b/po/es.po index b5c86c9..febc7d7 100644 --- a/po/es.po +++ b/po/es.po @@ -279,8 +279,8 @@ msgid "Eric Lassauge - French Translation" msgstr "Eric Lassauge - Traducción al francés" #: src/we.cxx:4358 -msgid "Webpage - http://prozilla.genesys.ro/" -msgstr "Página web: http://prozilla.genesys.ro/" +msgid "Webpage - https://prozilla.disconnected-by-peer.at" +msgstr "Página web: https://prozilla.disconnected-by-peer.at" #: src/we.cxx:4652 msgid "Please enter the URL" diff --git a/po/fr.po b/po/fr.po index 0e67932..0c7946a 100644 --- a/po/fr.po +++ b/po/fr.po @@ -279,8 +279,8 @@ msgid "Eric Lassauge - French Translation" msgstr "Eric Lassauge - Traduction en français" #: src/we.cxx:4358 -msgid "Webpage - http://prozilla.genesys.ro/" -msgstr "Site web - http://prozilla.genesys.ro/" +msgid "Webpage - https://prozilla.disconnected-by-peer.at" +msgstr "Site web - https://prozilla.disconnected-by-peer.at" #: src/we.cxx:4652 msgid "Please enter the URL" diff --git a/po/it.po b/po/it.po index d1515e0..5fc4c36 100644 --- a/po/it.po +++ b/po/it.po @@ -279,8 +279,8 @@ msgid "Eric Lassauge - French Translation" msgstr "Eric Lassauge - Traduzione francese" #: src/we.cxx:4358 -msgid "Webpage - http://prozilla.genesys.ro/" -msgstr "Webpage - http://prozilla.genesys.ro/" +msgid "Webpage - https://prozilla.disconnected-by-peer.at" +msgstr "Webpage - https://prozilla.disconnected-by-peer.at" #: src/we.cxx:4652 msgid "Please enter the URL" diff --git a/po/nl.po b/po/nl.po index bf107dc..565b5da 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,8 @@ msgstr "" "Project-Id-Version: prozgui 2.4.2\n" "POT-Creation-Date: 2003-02-18 05:45+0600\n" "PO-Revision-Date: 2026-07-14 19:00+0200\n" -"Last-Translator: ProZilla Translation Team \n" +"Last-Translator: ProZilla Translation Team \n" "Language-Team: nl\n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -279,8 +280,8 @@ msgid "Eric Lassauge - French Translation" msgstr "Eric Lassauge - Franse vertaling" #: src/we.cxx:4358 -msgid "Webpage - http://prozilla.genesys.ro/" -msgstr "Webpagina - http://prozilla.genesys.ro/" +msgid "Webpage - https://prozilla.disconnected-by-peer.at" +msgstr "Webpagina - https://prozilla.disconnected-by-peer.at" #: src/we.cxx:4652 msgid "Please enter the URL" diff --git a/po/prozgui.pot b/po/prozgui.pot index 3d961be..ab44c0d 100644 --- a/po/prozgui.pot +++ b/po/prozgui.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: prozgui 2.4.1\n" +"Project-Id-Version: prozgui 2.4.3\n" "POT-Creation-Date: 2003-02-18 05:45+0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -269,7 +269,7 @@ msgid "Eric Lassauge - French Translation" msgstr "" #: src/we.cxx:4358 -msgid "Webpage - http://prozilla.genesys.ro/" +msgid "Webpage - https://prozilla.disconnected-by-peer.at" msgstr "" #: src/we.cxx:4652 diff --git a/po/pt_BR.po b/po/pt_BR.po index 4d28d88..7618c72 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -278,8 +278,8 @@ msgid "Eric Lassauge - French Translation" msgstr "Eric Lassauge - Tradução Francesa" #: src/we.cxx:4358 -msgid "Webpage - http://prozilla.genesys.ro/" -msgstr "Página - http://prozilla.genesys.ro/" +msgid "Webpage - https://prozilla.disconnected-by-peer.at" +msgstr "Página - https://prozilla.disconnected-by-peer.at" #: src/we.cxx:4652 msgid "Please enter the URL" diff --git a/po/ro.po b/po/ro.po index b70811a..127f735 100644 --- a/po/ro.po +++ b/po/ro.po @@ -279,8 +279,8 @@ msgid "Eric Lassauge - French Translation" msgstr "Eric Lassage - Traducere în franceză" #: src/we.cxx:4358 -msgid "Webpage - http://prozilla.genesys.ro/" -msgstr "Pagina web - http://prozilla.genesys.ro/" +msgid "Webpage - https://prozilla.disconnected-by-peer.at" +msgstr "Pagina web - https://prozilla.disconnected-by-peer.at" #: src/we.cxx:4652 msgid "Please enter the URL" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 123e188..a1894f4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,8 +6,8 @@ target_include_directories(prozgui PRIVATE target_compile_definitions(prozgui PRIVATE HAVE_CONFIG_H=1 LOCALEDIR="${LOCALEDIR}" GLOBAL_CONF_FILE="${GLOBAL_CONF_FILE}") target_compile_options(prozgui PRIVATE - $<$:-Wall;-Wextra> - $<$:-Wall;-Wextra>) + $<$:-Wall;-Wextra;-Wno-unused-parameter> + $<$:-Wall;-Wextra;-Wno-unused-parameter;-Wno-unused-but-set-variable;-Wno-missing-field-initializers>) target_link_libraries(prozgui PRIVATE libprozilla::prozilla ${FLTK_LIBRARIES}) if(Intl_FOUND) target_link_libraries(prozgui PRIVATE Intl::Intl) diff --git a/src/dl_win.cxx b/src/dl_win.cxx index 7d331c6..e8c846f 100644 --- a/src/dl_win.cxx +++ b/src/dl_win.cxx @@ -175,7 +175,7 @@ flproz_message::flproz_message() { running = FALSE; } -void flproz_message::set_label(char *label) { +void flproz_message::set_label(const char *label) { assert(label!=NULL); strncpy(buffer,label, MAX_MSG_SIZE-1); buffer[MAX_MSG_SIZE-1]=0; @@ -213,7 +213,7 @@ flproz_ask::flproz_ask() { running = FALSE; } -void flproz_ask::set_label(char *label) { +void flproz_ask::set_label(const char *label) { assert(label!=NULL); strncpy(buffer,label, MAX_MSG_SIZE-1); buffer[MAX_MSG_SIZE-1]=0; @@ -251,7 +251,7 @@ flproz_choice::flproz_choice() { running = FALSE; } -void flproz_choice::set_label(char *label) { +void flproz_choice::set_label(const char *label) { assert(label!=NULL); strncpy(buffer,label, MAX_MSG_SIZE-1); buffer[MAX_MSG_SIZE-1]=0; diff --git a/src/dl_win.fl b/src/dl_win.fl index 9f2833b..04db505 100644 --- a/src/dl_win.fl +++ b/src/dl_win.fl @@ -166,7 +166,7 @@ class flproz_message {} { } decl {char buffer[MAX_MSG_SIZE];} {public } - Function {set_label(char *label)} {open + Function {set_label(const char *label)} {open } { code {assert(label!=NULL); strncpy(buffer,label, MAX_MSG_SIZE-1); @@ -212,7 +212,7 @@ class flproz_ask {} { } decl {int no_button_pressed;} {public } - Function {set_label(char *label)} {open + Function {set_label(const char *label)} {open } { code {assert(label!=NULL); strncpy(buffer,label, MAX_MSG_SIZE-1); @@ -264,7 +264,7 @@ class flproz_choice {} { } decl {char button2_label[100];} {public } - Function {set_label(char *label)} {} { + Function {set_label(const char *label)} {} { code {assert(label!=NULL); strncpy(buffer,label, MAX_MSG_SIZE-1); buffer[MAX_MSG_SIZE-1]=0; diff --git a/src/dl_win.h b/src/dl_win.h index 37b05bd..fbf6dab 100644 --- a/src/dl_win.h +++ b/src/dl_win.h @@ -63,7 +63,7 @@ public: int running; int ok_button_pressed; char buffer[MAX_MSG_SIZE]; - void set_label(char *label); + void set_label(const char *label); }; extern void cb_ask_yes_button(Fl_Button*, void*); extern void cb_ask_no_button(Fl_Button*, void*); @@ -78,7 +78,7 @@ public: int yes_button_pressed; char buffer[MAX_MSG_SIZE]; int no_button_pressed; - void set_label(char *label); + void set_label(const char *label); int running; }; @@ -94,7 +94,7 @@ public: int button2_pressed; char button1_label[100]; char button2_label[100]; - void set_label(char *label); + void set_label(const char *label); void set_button1_label(const char *label); void set_button2_label(const char *label); int running; diff --git a/src/download_win.cpp b/src/download_win.cpp index 62d380c..8a9a217 100644 --- a/src/download_win.cpp +++ b/src/download_win.cpp @@ -41,7 +41,8 @@ void cb_dl_window(Fl_Window * widget, void *) if (dl_window->status != DL_IDLING) { - if (fl_choice(_("Are you Sure You want to quit?"), _("No"), _("Yes"), 0) == 1) + if (fl_choice("%s", _("No"), _("Yes"), 0, + _("Are you Sure You want to quit?")) == 1) { dl_window->cleanup(FALSE); } @@ -420,7 +421,7 @@ void DL_Window::start_download() void DL_Window::unpause_download() { - assert(status = DL_PAUSED); + assert(status == DL_PAUSED); if (got_info == FALSE) { @@ -514,22 +515,15 @@ void DL_Window::handle_info_thread() { ftpsearch_win->fetch_mirror_info(&connection->u, connection->main_file_size, - "http://www.filesearching.com/cgi-bin/s", - FILESEARCH_RU, rt.ftps_mirror_req_n); + "https://archie.disconnected-by-peer.at/api/search", + ARCHIE_JSON, rt.ftps_mirror_req_n); } - else if(rt.ftpsearch_server_id==1) + else if(rt.ftpsearch_server_id==1) { ftpsearch_win->fetch_mirror_info(&connection->u, connection->main_file_size, - "http://ftpsearch.uniovi.es:8000/ftpsearch", - LYCOS, rt.ftps_mirror_req_n); - } - else if(rt.ftpsearch_server_id==2) - { - ftpsearch_win->fetch_mirror_info(&connection->u, - connection->main_file_size, - "http://download.lycos.com/swadv/AdvResults.asp", - LYCOS, rt.ftps_mirror_req_n); + "https://www.mmnt.ru/int/get", + MAMONT_HTML, rt.ftps_mirror_req_n); } } else diff --git a/src/download_win.h b/src/download_win.h index c66edb9..861fcca 100644 --- a/src/download_win.h +++ b/src/download_win.h @@ -51,7 +51,6 @@ typedef enum { class DL_Window:public dl_gui { void draw(); - int cx, cy; char key; public: DL_Window(urlinfo * url_data, Fl_Boxtype b, int x, int y, diff --git a/src/ftpsearch_win.cpp b/src/ftpsearch_win.cpp index ec43fee..0d51a35 100644 --- a/src/ftpsearch_win.cpp +++ b/src/ftpsearch_win.cpp @@ -54,7 +54,7 @@ void FTPS_Window::fetch_mirror_info(urlinfo *u, long file_size, assert(u->file); ftps_file_box->value(u->file); - request=proz_ftps_request_init(u, file_size, const_cast(ftps_loc), + request=proz_ftps_request_init(u, file_size, ftps_loc, server_type, num_req_mirrors); proz_connection_set_msg_proc(request->connection, ftps_win_message_proc, this); diff --git a/src/prefs.cpp b/src/prefs.cpp index ebb2739..862272c 100644 --- a/src/prefs.cpp +++ b/src/prefs.cpp @@ -448,6 +448,8 @@ void set_ftpsearch_server_id(int i, const char *const val, FILE * const fp) rt.ftpsearch_server_id = atoi(val); if (rt.ftpsearch_server_id < 0) rt.ftpsearch_server_id = 0; + else if (rt.ftpsearch_server_id > 1) + rt.ftpsearch_server_id = 1; } } diff --git a/src/we.cxx b/src/we.cxx index fab0ffa..d10f732 100644 --- a/src/we.cxx +++ b/src/we.cxx @@ -82,9 +82,8 @@ Fl_Check_Button *in_use_ftpsearch_button=(Fl_Check_Button *)0; Fl_Choice *ftps_server_choice=(Fl_Choice *)0; Fl_Menu_Item menu_ftps_server_choice[] = { - {gettext("filesearching.com"), 0, 0, 0, 0, 0, 0, 12, 56}, - {gettext("ftpsearch.uniovie.es"), 0, 0, 0, 0, 0, 0, 12, 56}, - {gettext("ftpsearch.lycos.com"), 0, 0, 0, 0, 0, 0, 12, 56}, + {"archie.disconnected-by-peer.at", 0, 0, 0, 0, 0, 0, 12, 56}, + {"www.mmnt.ru", 0, 0, 0, 0, 0, 0, 12, 56}, {0} }; @@ -4373,7 +4372,7 @@ esources at genesys.ro, testing")); } o->end(); } - { Fl_Box* o = new Fl_Box(15, 255, 195, 20, gettext("Webpage - http://prozilla.genesys.ro/")); + { Fl_Box* o = new Fl_Box(15, 255, 300, 20, gettext("Webpage - https://prozilla.disconnected-by-peer.at")); o->color(29); o->labelsize(10); o->labelcolor(1); diff --git a/src/we.fl b/src/we.fl index 3ead73b..745a1dc 100644 --- a/src/we.fl +++ b/src/we.fl @@ -222,16 +222,12 @@ Function {make_prefs_win()} {} { xywh {285 55 160 25} down_box BORDER_BOX labelsize 12 align 132 textsize 12 } { menuitem {} { - label {filesearching.com} + label {archie.disconnected-by-peer.at} xywh {0 0 100 20} labelsize 12 } menuitem {} { - label {ftpsearch.uniovie.es} - xywh {10 10 100 20} labelsize 12 - } - menuitem {} { - label {ftpsearch.lycos.com} - xywh {10 10 100 20} labelsize 12 + label {www.mmnt.ru} + xywh {0 0 100 20} labelsize 12 } } } @@ -309,7 +305,7 @@ Function {make_about_win()} {} { xywh {290 175 210 45} labelsize 10 align 128 } Fl_Box {} { - label {Pablo Iranzo Gómez - testing} + label {Pablo Iranzo Gómez - testing} xywh {295 220 180 20} labelsize 10 align 128 } Fl_Box {} { @@ -361,7 +357,7 @@ Function {make_about_win()} {} { } } Fl_Box {} { - label {Webpage - http://prozilla.genesys.ro/} + label {Webpage - https://prozilla.disconnected-by-peer.at} xywh {15 255 195 20} color 29 labelsize 10 labelcolor 1 align 128 } }