169 lines
5.4 KiB
Diff
169 lines
5.4 KiB
Diff
--- a/src/grip.c 2022-02-10 12:19:23.000000000 +0100
|
|
+++ b/src/grip.c 2025-06-01 01:56:02.514625107 +0200
|
|
@@ -651,7 +651,7 @@
|
|
ginfo->ask_submit=FALSE;
|
|
ginfo->is_new_disc=FALSE;
|
|
ginfo->first_time=TRUE;
|
|
- ginfo->automatic_discdb=TRUE;
|
|
+ ginfo->automatic_discdb=FALSE;
|
|
ginfo->auto_eject_countdown=0;
|
|
ginfo->current_discid=0;
|
|
ginfo->volume=255;
|
|
@@ -671,20 +671,20 @@
|
|
ginfo->use_proxy=FALSE;
|
|
ginfo->use_proxy_env=FALSE;
|
|
|
|
- strcpy(ginfo->dbserver.name,"gnudb.gnudb.org");
|
|
- strcpy(ginfo->dbserver.cgi_prog,"~cddb/cddb.cgi");
|
|
+ strcpy(ginfo->dbserver.name,"");
|
|
+ strcpy(ginfo->dbserver.cgi_prog,"");
|
|
ginfo->dbserver.port=80;
|
|
ginfo->dbserver.use_proxy=0;
|
|
ginfo->dbserver.proxy=&(ginfo->proxy_server);
|
|
|
|
strcpy(ginfo->dbserver2.name,"");
|
|
- strcpy(ginfo->dbserver2.cgi_prog,"~cddb/cddb.cgi");
|
|
+ strcpy(ginfo->dbserver2.cgi_prog,"");
|
|
ginfo->dbserver2.port=80;
|
|
ginfo->dbserver2.use_proxy=0;
|
|
ginfo->dbserver2.proxy=&(ginfo->proxy_server);
|
|
|
|
- strcpy(ginfo->discdb_submit_email,"submit@gnudb.org");
|
|
- ginfo->db_use_freedb=TRUE;
|
|
+ strcpy(ginfo->discdb_submit_email,"");
|
|
+ ginfo->db_use_freedb=FALSE;
|
|
*ginfo->user_email='\0';
|
|
|
|
strcpy(ginfo->discdb_encoding,"UTF-8");
|
|
--- a/src/gripcfg.c 2022-02-10 12:19:23.000000000 +0100
|
|
+++ b/src/gripcfg.c 2025-05-30 23:10:36.255579834 +0200
|
|
@@ -547,128 +547,6 @@
|
|
|
|
page=gtk_frame_new(NULL);
|
|
|
|
- dbvbox=gtk_vbox_new(FALSE,4);
|
|
- gtk_container_border_width(GTK_CONTAINER(dbvbox),3);
|
|
-
|
|
- notebook=gtk_notebook_new();
|
|
-
|
|
- page2=gtk_frame_new(NULL);
|
|
-
|
|
- vbox=gtk_vbox_new(FALSE,2);
|
|
- gtk_container_border_width(GTK_CONTAINER(vbox),3);
|
|
-
|
|
- entry=MakeStrEntry(NULL,ginfo->dbserver.name,_("DB server"),255,TRUE);
|
|
- gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- entry=MakeStrEntry(NULL,ginfo->dbserver.cgi_prog,_("CGI path"),255,TRUE);
|
|
- gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- gtk_container_add(GTK_CONTAINER(page2),vbox);
|
|
- gtk_widget_show(vbox);
|
|
-
|
|
- label=gtk_label_new(_("Primary Server"));
|
|
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook),page2,label);
|
|
- gtk_widget_show(page2);
|
|
-
|
|
- page2=gtk_frame_new(NULL);
|
|
-
|
|
- vbox=gtk_vbox_new(FALSE,2);
|
|
- gtk_container_border_width(GTK_CONTAINER(vbox),3);
|
|
-
|
|
- entry=MakeStrEntry(NULL,ginfo->dbserver2.name,_("DB server"),255,TRUE);
|
|
- gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- entry=MakeStrEntry(NULL,ginfo->dbserver2.cgi_prog,_("CGI path"),255,TRUE);
|
|
- gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- gtk_container_add(GTK_CONTAINER(page2),vbox);
|
|
- gtk_widget_show(vbox);
|
|
-
|
|
- label=gtk_label_new(_("Secondary Server"));
|
|
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook),page2,label);
|
|
- gtk_widget_show(page2);
|
|
-
|
|
-
|
|
- gtk_box_pack_start(GTK_BOX(dbvbox),notebook,FALSE,FALSE,0);
|
|
- gtk_widget_show(notebook);
|
|
-
|
|
-
|
|
- entry=MakeStrEntry(NULL,ginfo->discdb_submit_email,
|
|
- _("DB Submit email"),255,TRUE);
|
|
- gtk_box_pack_start(GTK_BOX(dbvbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- entry=MakeStrEntry(NULL,ginfo->discdb_encoding,
|
|
- _("DB Character set encoding"),16,TRUE);
|
|
- gtk_box_pack_start(GTK_BOX(dbvbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- check=MakeCheckButton(NULL,&ginfo->db_use_freedb,
|
|
- _("Use freedb extensions"));
|
|
- gtk_box_pack_start(GTK_BOX(dbvbox),check,FALSE,FALSE,0);
|
|
- gtk_widget_show(check);
|
|
-
|
|
- check=MakeCheckButton(NULL,&ginfo->automatic_discdb,
|
|
- _("Perform disc lookups automatically"));
|
|
- gtk_box_pack_start(GTK_BOX(dbvbox),check,FALSE,FALSE,0);
|
|
- gtk_widget_show(check);
|
|
-
|
|
- gtk_container_add(GTK_CONTAINER(page),dbvbox);
|
|
- gtk_widget_show(dbvbox);
|
|
-
|
|
-
|
|
- label=gtk_label_new(_("DiscDB"));
|
|
- gtk_notebook_append_page(GTK_NOTEBOOK(config_notebook),page,label);
|
|
- gtk_widget_show(page);
|
|
-
|
|
- page=gtk_frame_new(NULL);
|
|
-
|
|
- vbox=gtk_vbox_new(FALSE,2);
|
|
- gtk_container_border_width(GTK_CONTAINER(vbox),3);
|
|
-
|
|
- check=MakeCheckButton(&button,&ginfo->use_proxy,_("Use proxy server"));
|
|
- gtk_signal_connect(GTK_OBJECT(button),"clicked",
|
|
- GTK_SIGNAL_FUNC(UseProxyChanged),(gpointer)ginfo);
|
|
- gtk_box_pack_start(GTK_BOX(vbox),check,FALSE,FALSE,0);
|
|
- gtk_widget_show(check);
|
|
-
|
|
- check=MakeCheckButton(NULL,&ginfo->use_proxy_env,
|
|
- _("Get server from 'http_proxy' env. var"));
|
|
- gtk_box_pack_start(GTK_BOX(vbox),check,FALSE,FALSE,0);
|
|
- gtk_widget_show(check);
|
|
-
|
|
- entry=MakeStrEntry(NULL,ginfo->proxy_server.name,_("Proxy server"),255,TRUE);
|
|
- gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- entry=MakeNumEntry(NULL,&(ginfo->proxy_server.port),_("Proxy port"),5);
|
|
- gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- entry=MakeStrEntry(NULL,ginfo->proxy_server.username,_("Proxy username"),
|
|
- 80,TRUE);
|
|
- gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- entry=MakeStrEntry(&realentry,ginfo->proxy_server.pswd,
|
|
- _("Proxy password"),80,TRUE);
|
|
- gtk_entry_set_visibility(GTK_ENTRY(realentry),FALSE);
|
|
- gtk_box_pack_start(GTK_BOX(vbox),entry,FALSE,FALSE,0);
|
|
- gtk_widget_show(entry);
|
|
-
|
|
- gtk_container_add(GTK_CONTAINER(page),vbox);
|
|
- gtk_widget_show(vbox);
|
|
-
|
|
- label=gtk_label_new(_("Proxy"));
|
|
- gtk_notebook_append_page(GTK_NOTEBOOK(config_notebook),page,label);
|
|
- gtk_widget_show(page);
|
|
-
|
|
- page=gtk_frame_new(NULL);
|
|
-
|
|
vbox=gtk_vbox_new(FALSE,2);
|
|
gtk_container_border_width(GTK_CONTAINER(vbox),3);
|
|
|