diff --git a/po/de.po b/po/de.po index f09d270..b9348aa 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-09 23:23+0100\n" +"POT-Creation-Date: 2010-12-10 22:45+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: German\n" @@ -16,39 +16,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/callbacks.c:427 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:747 +#: ../src/surfer.c:750 ../src/surfer.c:1132 ../src/surfer.c:1135 +msgid "Question" +msgstr "" + +#: ../src/callbacks.c:47 +msgid "" +"There are multiple tabs opened.\n" +"Do you really want to close every tab opened in this window?" +msgstr "" + +#: ../src/callbacks.c:451 msgid "Web surfer preferences" msgstr "Web surfer Einstellungen" -#: ../src/callbacks.c:447 +#: ../src/callbacks.c:471 msgid "Homepage:" msgstr "" -#: ../src/callbacks.c:455 +#: ../src/callbacks.c:479 msgid "Focus new tabs" msgstr "" -#: ../src/callbacks.c:459 +#: ../src/callbacks.c:483 msgid "General" msgstr "" -#: ../src/callbacks.c:463 +#: ../src/callbacks.c:487 msgid "Direct connection" msgstr "" -#: ../src/callbacks.c:467 +#: ../src/callbacks.c:491 msgid "HTTP proxy:" msgstr "" -#: ../src/callbacks.c:474 +#: ../src/callbacks.c:498 msgid "Hostname:" msgstr "" -#: ../src/callbacks.c:478 +#: ../src/callbacks.c:502 msgid "Port:" msgstr "" -#: ../src/callbacks.c:486 +#: ../src/callbacks.c:510 msgid "Network" msgstr "" @@ -115,7 +126,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 -#: ../src/surfer.c:853 ../src/surfer.c:856 +#: ../src/surfer.c:867 ../src/surfer.c:870 msgid "Error" msgstr "Fehler" @@ -170,7 +181,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:855 +#: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:869 msgid "Unknown error" msgstr "" @@ -354,76 +365,71 @@ msgstr "" msgid "Ready" msgstr "" -#: ../src/surfer.c:607 ../src/surfer.c:1053 +#: ../src/surfer.c:607 ../src/surfer.c:1067 msgid "Untitled" msgstr "" -#: ../src/surfer.c:733 ../src/surfer.c:736 ../src/surfer.c:1118 -#: ../src/surfer.c:1121 -msgid "Question" -msgstr "" - -#: ../src/surfer.c:806 ../src/surfer.c:1184 +#: ../src/surfer.c:820 ../src/surfer.c:1198 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:884 +#: ../src/surfer.c:898 msgid "Find text" msgstr "Suchen" -#: ../src/surfer.c:891 +#: ../src/surfer.c:905 msgid "Text:" msgstr "" -#: ../src/surfer.c:898 +#: ../src/surfer.c:912 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:900 +#: ../src/surfer.c:914 msgid "Wrap" msgstr "" -#: ../src/surfer.c:926 +#: ../src/surfer.c:940 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1014 +#: ../src/surfer.c:1028 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1043 +#: ../src/surfer.c:1057 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1245 +#: ../src/surfer.c:1259 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1250 +#: ../src/surfer.c:1264 msgid "Command:" msgstr "" -#: ../src/surfer.c:1269 +#: ../src/surfer.c:1283 msgid "Message" msgstr "" -#: ../src/surfer.c:1274 +#: ../src/surfer.c:1288 msgid "Source" msgstr "" -#: ../src/surfer.c:1279 +#: ../src/surfer.c:1293 msgid "Line" msgstr "Linie" -#: ../src/surfer.c:1404 +#: ../src/surfer.c:1418 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1445 ../src/surfer.c:1448 ../src/surfer.c:1503 -#: ../src/surfer.c:1508 +#: ../src/surfer.c:1459 ../src/surfer.c:1462 ../src/surfer.c:1517 +#: ../src/surfer.c:1522 msgid "Warning" msgstr "Achtung" -#: ../src/surfer.c:1507 +#: ../src/surfer.c:1521 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/es.po b/po/es.po index 654136b..faecd9a 100644 --- a/po/es.po +++ b/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-09 23:23+0100\n" +"POT-Creation-Date: 2010-12-10 22:45+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Spanish\n" @@ -16,39 +16,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/callbacks.c:427 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:747 +#: ../src/surfer.c:750 ../src/surfer.c:1132 ../src/surfer.c:1135 +msgid "Question" +msgstr "" + +#: ../src/callbacks.c:47 +msgid "" +"There are multiple tabs opened.\n" +"Do you really want to close every tab opened in this window?" +msgstr "" + +#: ../src/callbacks.c:451 msgid "Web surfer preferences" msgstr "Web surfer preferencias" -#: ../src/callbacks.c:447 +#: ../src/callbacks.c:471 msgid "Homepage:" msgstr "" -#: ../src/callbacks.c:455 +#: ../src/callbacks.c:479 msgid "Focus new tabs" msgstr "" -#: ../src/callbacks.c:459 +#: ../src/callbacks.c:483 msgid "General" msgstr "" -#: ../src/callbacks.c:463 +#: ../src/callbacks.c:487 msgid "Direct connection" msgstr "" -#: ../src/callbacks.c:467 +#: ../src/callbacks.c:491 msgid "HTTP proxy:" msgstr "" -#: ../src/callbacks.c:474 +#: ../src/callbacks.c:498 msgid "Hostname:" msgstr "" -#: ../src/callbacks.c:478 +#: ../src/callbacks.c:502 msgid "Port:" msgstr "" -#: ../src/callbacks.c:486 +#: ../src/callbacks.c:510 msgid "Network" msgstr "" @@ -115,7 +126,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 -#: ../src/surfer.c:853 ../src/surfer.c:856 +#: ../src/surfer.c:867 ../src/surfer.c:870 msgid "Error" msgstr "" @@ -170,7 +181,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:855 +#: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:869 msgid "Unknown error" msgstr "" @@ -354,76 +365,71 @@ msgstr "" msgid "Ready" msgstr "" -#: ../src/surfer.c:607 ../src/surfer.c:1053 +#: ../src/surfer.c:607 ../src/surfer.c:1067 msgid "Untitled" msgstr "" -#: ../src/surfer.c:733 ../src/surfer.c:736 ../src/surfer.c:1118 -#: ../src/surfer.c:1121 -msgid "Question" -msgstr "" - -#: ../src/surfer.c:806 ../src/surfer.c:1184 +#: ../src/surfer.c:820 ../src/surfer.c:1198 msgid "Save file as..." msgstr "Guardar como..." -#: ../src/surfer.c:884 +#: ../src/surfer.c:898 msgid "Find text" msgstr "Buscar" -#: ../src/surfer.c:891 +#: ../src/surfer.c:905 msgid "Text:" msgstr "" -#: ../src/surfer.c:898 +#: ../src/surfer.c:912 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:900 +#: ../src/surfer.c:914 msgid "Wrap" msgstr "" -#: ../src/surfer.c:926 +#: ../src/surfer.c:940 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1014 +#: ../src/surfer.c:1028 msgid "Open file..." msgstr "Abrir..." -#: ../src/surfer.c:1043 +#: ../src/surfer.c:1057 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1245 +#: ../src/surfer.c:1259 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1250 +#: ../src/surfer.c:1264 msgid "Command:" msgstr "" -#: ../src/surfer.c:1269 +#: ../src/surfer.c:1283 msgid "Message" msgstr "" -#: ../src/surfer.c:1274 +#: ../src/surfer.c:1288 msgid "Source" msgstr "" -#: ../src/surfer.c:1279 +#: ../src/surfer.c:1293 msgid "Line" msgstr "" -#: ../src/surfer.c:1404 +#: ../src/surfer.c:1418 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1445 ../src/surfer.c:1448 ../src/surfer.c:1503 -#: ../src/surfer.c:1508 +#: ../src/surfer.c:1459 ../src/surfer.c:1462 ../src/surfer.c:1517 +#: ../src/surfer.c:1522 msgid "Warning" msgstr "" -#: ../src/surfer.c:1507 +#: ../src/surfer.c:1521 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/po/fr.po b/po/fr.po index 4b46d94..bfcfe1b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-09 23:23+0100\n" +"POT-Creation-Date: 2010-12-10 22:45+0100\n" "PO-Revision-Date: 2010-04-01 19:40+0200\n" "Last-Translator: Calimero \n" "Language-Team: French\n" @@ -16,39 +16,52 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../src/callbacks.c:427 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:747 +#: ../src/surfer.c:750 ../src/surfer.c:1132 ../src/surfer.c:1135 +msgid "Question" +msgstr "Question" + +#: ../src/callbacks.c:47 +msgid "" +"There are multiple tabs opened.\n" +"Do you really want to close every tab opened in this window?" +msgstr "" +"Plusieurs onglets sont ouverts.\n" +"Voulez-vous vraiment fermer tous les onglets de cette fenêtre ?" + +#: ../src/callbacks.c:451 msgid "Web surfer preferences" msgstr "Préférences de Web surfer" -#: ../src/callbacks.c:447 +#: ../src/callbacks.c:471 msgid "Homepage:" msgstr "Page d'accueil :" -#: ../src/callbacks.c:455 +#: ../src/callbacks.c:479 msgid "Focus new tabs" msgstr "Focaliser les nouveaux onglets" -#: ../src/callbacks.c:459 +#: ../src/callbacks.c:483 msgid "General" msgstr "Général" -#: ../src/callbacks.c:463 +#: ../src/callbacks.c:487 msgid "Direct connection" msgstr "Connexion directe" -#: ../src/callbacks.c:467 +#: ../src/callbacks.c:491 msgid "HTTP proxy:" msgstr "Proxy HTTP :" -#: ../src/callbacks.c:474 +#: ../src/callbacks.c:498 msgid "Hostname:" msgstr "Hôte :" -#: ../src/callbacks.c:478 +#: ../src/callbacks.c:502 msgid "Port:" msgstr "Port :" -#: ../src/callbacks.c:486 +#: ../src/callbacks.c:510 msgid "Network" msgstr "Réseau" @@ -115,7 +128,7 @@ msgid "Close window when the download is complete" msgstr "Fermer la fenêtre à la fin du téléchargement" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 -#: ../src/surfer.c:853 ../src/surfer.c:856 +#: ../src/surfer.c:867 ../src/surfer.c:870 msgid "Error" msgstr "Erreur" @@ -170,7 +183,7 @@ msgstr "Résolu" msgid "Code " msgstr "Code " -#: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:855 +#: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:869 msgid "Unknown error" msgstr "Erreur inconnue" @@ -357,76 +370,71 @@ msgstr " Adresse: " msgid "Ready" msgstr "Prêt" -#: ../src/surfer.c:607 ../src/surfer.c:1053 +#: ../src/surfer.c:607 ../src/surfer.c:1067 msgid "Untitled" msgstr "Sans titre" -#: ../src/surfer.c:733 ../src/surfer.c:736 ../src/surfer.c:1118 -#: ../src/surfer.c:1121 -msgid "Question" -msgstr "Question" - -#: ../src/surfer.c:806 ../src/surfer.c:1184 +#: ../src/surfer.c:820 ../src/surfer.c:1198 msgid "Save file as..." msgstr "Enregistrer sous..." -#: ../src/surfer.c:884 +#: ../src/surfer.c:898 msgid "Find text" msgstr "Chercher du texte" -#: ../src/surfer.c:891 +#: ../src/surfer.c:905 msgid "Text:" msgstr "Texte: " -#: ../src/surfer.c:898 +#: ../src/surfer.c:912 msgid "Case-sensitive" msgstr "Sensible à la casse" -#: ../src/surfer.c:900 +#: ../src/surfer.c:914 msgid "Wrap" msgstr "Chercher en boucle" -#: ../src/surfer.c:926 +#: ../src/surfer.c:940 msgid "Text not found" msgstr "Texte non trouvé" -#: ../src/surfer.c:1014 +#: ../src/surfer.c:1028 msgid "Open file..." msgstr "Ouvrir un fichier..." -#: ../src/surfer.c:1043 +#: ../src/surfer.c:1057 msgid "Could not initialize HTML renderer" msgstr "Ne peut charger le moteur de rendu HTML" -#: ../src/surfer.c:1245 +#: ../src/surfer.c:1259 msgid "Javascript console" msgstr "Console Javascript" -#: ../src/surfer.c:1250 +#: ../src/surfer.c:1264 msgid "Command:" msgstr "Commande :" -#: ../src/surfer.c:1269 +#: ../src/surfer.c:1283 msgid "Message" msgstr "Message" -#: ../src/surfer.c:1274 +#: ../src/surfer.c:1288 msgid "Source" msgstr "Source" -#: ../src/surfer.c:1279 +#: ../src/surfer.c:1293 msgid "Line" msgstr "Ligne" -#: ../src/surfer.c:1404 +#: ../src/surfer.c:1418 msgid "Web surfer - Source of " msgstr "Web surfer - Source de " -#: ../src/surfer.c:1445 ../src/surfer.c:1448 ../src/surfer.c:1503 -#: ../src/surfer.c:1508 +#: ../src/surfer.c:1459 ../src/surfer.c:1462 ../src/surfer.c:1517 +#: ../src/surfer.c:1522 msgid "Warning" msgstr "Avertissement" -#: ../src/surfer.c:1507 +#: ../src/surfer.c:1521 msgid "This file already exists. Overwrite?" msgstr "Le fichier existe déjà. L'écraser ?" diff --git a/po/it.po b/po/it.po index 0f384fb..3478fc2 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Surfer 0.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-12-09 23:23+0100\n" +"POT-Creation-Date: 2010-12-10 22:45+0100\n" "PO-Revision-Date: 2010-04-11 12:06+0200\n" "Last-Translator: Pierre Pronchery \n" "Language-Team: Italian\n" @@ -16,39 +16,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../src/callbacks.c:427 +#: ../src/callbacks.c:43 ../src/callbacks.c:53 ../src/surfer.c:747 +#: ../src/surfer.c:750 ../src/surfer.c:1132 ../src/surfer.c:1135 +msgid "Question" +msgstr "" + +#: ../src/callbacks.c:47 +msgid "" +"There are multiple tabs opened.\n" +"Do you really want to close every tab opened in this window?" +msgstr "" + +#: ../src/callbacks.c:451 msgid "Web surfer preferences" msgstr "" -#: ../src/callbacks.c:447 +#: ../src/callbacks.c:471 msgid "Homepage:" msgstr "" -#: ../src/callbacks.c:455 +#: ../src/callbacks.c:479 msgid "Focus new tabs" msgstr "" -#: ../src/callbacks.c:459 +#: ../src/callbacks.c:483 msgid "General" msgstr "" -#: ../src/callbacks.c:463 +#: ../src/callbacks.c:487 msgid "Direct connection" msgstr "" -#: ../src/callbacks.c:467 +#: ../src/callbacks.c:491 msgid "HTTP proxy:" msgstr "" -#: ../src/callbacks.c:474 +#: ../src/callbacks.c:498 msgid "Hostname:" msgstr "" -#: ../src/callbacks.c:478 +#: ../src/callbacks.c:502 msgid "Port:" msgstr "" -#: ../src/callbacks.c:486 +#: ../src/callbacks.c:510 msgid "Network" msgstr "" @@ -115,7 +126,7 @@ msgid "Close window when the download is complete" msgstr "" #: ../src/download.c:291 ../src/download.c:296 ../src/download.c:631 -#: ../src/surfer.c:853 ../src/surfer.c:856 +#: ../src/surfer.c:867 ../src/surfer.c:870 msgid "Error" msgstr "" @@ -170,7 +181,7 @@ msgstr "" msgid "Code " msgstr "" -#: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:855 +#: ../src/download.c:605 ../src/ghtml-webkit.c:537 ../src/surfer.c:869 msgid "Unknown error" msgstr "" @@ -354,76 +365,71 @@ msgstr "" msgid "Ready" msgstr "" -#: ../src/surfer.c:607 ../src/surfer.c:1053 +#: ../src/surfer.c:607 ../src/surfer.c:1067 msgid "Untitled" msgstr "" -#: ../src/surfer.c:733 ../src/surfer.c:736 ../src/surfer.c:1118 -#: ../src/surfer.c:1121 -msgid "Question" -msgstr "" - -#: ../src/surfer.c:806 ../src/surfer.c:1184 +#: ../src/surfer.c:820 ../src/surfer.c:1198 msgid "Save file as..." msgstr "" -#: ../src/surfer.c:884 +#: ../src/surfer.c:898 msgid "Find text" msgstr "" -#: ../src/surfer.c:891 +#: ../src/surfer.c:905 msgid "Text:" msgstr "" -#: ../src/surfer.c:898 +#: ../src/surfer.c:912 msgid "Case-sensitive" msgstr "" -#: ../src/surfer.c:900 +#: ../src/surfer.c:914 msgid "Wrap" msgstr "" -#: ../src/surfer.c:926 +#: ../src/surfer.c:940 msgid "Text not found" msgstr "" -#: ../src/surfer.c:1014 +#: ../src/surfer.c:1028 msgid "Open file..." msgstr "" -#: ../src/surfer.c:1043 +#: ../src/surfer.c:1057 msgid "Could not initialize HTML renderer" msgstr "" -#: ../src/surfer.c:1245 +#: ../src/surfer.c:1259 msgid "Javascript console" msgstr "" -#: ../src/surfer.c:1250 +#: ../src/surfer.c:1264 msgid "Command:" msgstr "" -#: ../src/surfer.c:1269 +#: ../src/surfer.c:1283 msgid "Message" msgstr "" -#: ../src/surfer.c:1274 +#: ../src/surfer.c:1288 msgid "Source" msgstr "" -#: ../src/surfer.c:1279 +#: ../src/surfer.c:1293 msgid "Line" msgstr "" -#: ../src/surfer.c:1404 +#: ../src/surfer.c:1418 msgid "Web surfer - Source of " msgstr "" -#: ../src/surfer.c:1445 ../src/surfer.c:1448 ../src/surfer.c:1503 -#: ../src/surfer.c:1508 +#: ../src/surfer.c:1459 ../src/surfer.c:1462 ../src/surfer.c:1517 +#: ../src/surfer.c:1522 msgid "Warning" msgstr "" -#: ../src/surfer.c:1507 +#: ../src/surfer.c:1521 msgid "This file already exists. Overwrite?" msgstr "" diff --git a/src/callbacks.c b/src/callbacks.c index eea9c5b..f602a5b 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -31,7 +31,31 @@ gboolean on_closex(gpointer data) { Surfer * surfer = data; + GtkWidget * dialog; + GtkDialogFlags f = GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT; + int res; + if(gtk_notebook_get_n_pages(GTK_NOTEBOOK(surfer->notebook)) > 1) + { + dialog = gtk_message_dialog_new(GTK_WINDOW(surfer->window), f, + GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", +#if GTK_CHECK_VERSION(2, 8, 0) + _("Question")); + gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG( + dialog), "%s", +#endif + _("There are multiple tabs opened.\n" + "Do you really want to close every tab" + " opened in this window?")); + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL); + gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); + res = gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); + if(res != GTK_RESPONSE_CLOSE) + return TRUE; + } surfer_delete(surfer); return FALSE; } @@ -492,8 +516,6 @@ void on_preferences(gpointer data) static void _preferences_set(Surfer * surfer) { char const * p; - unsigned long port; - char * q = NULL; gtk_entry_set_text(GTK_ENTRY(surfer->pr_homepage), surfer->homepage != NULL ? surfer->homepage : ""); @@ -508,17 +530,11 @@ static void _preferences_set(Surfer * surfer) surfer->pr_proxy_radio_http), surfer->proxy_type == SPT_HTTP); _preferences_on_proxy_http_toggled(surfer); - if((p = config_get(surfer->config, "proxy", "http")) != NULL) - gtk_entry_set_text(GTK_ENTRY(surfer->pr_proxy_http), p); - if((p = config_get(surfer->config, "proxy", "http_port")) != NULL - && p[0] != '\0') - { - port = strtoul(p, &q, 10); - if(q != NULL && *q == '\0') - gtk_spin_button_set_value(GTK_SPIN_BUTTON( - surfer->pr_proxy_http_port), - port); - } + if(surfer->proxy_http != NULL) + gtk_entry_set_text(GTK_ENTRY(surfer->pr_proxy_http), + surfer->proxy_http); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(surfer->pr_proxy_http_port), + surfer->proxy_http_port); } static gboolean _preferences_on_closex(gpointer data) diff --git a/src/surfer.c b/src/surfer.c index 01a2d09..f30e426 100644 --- a/src/surfer.c +++ b/src/surfer.c @@ -676,6 +676,9 @@ void surfer_close_tab(Surfer * surfer, GtkWidget * view) int surfer_config_load(Surfer * surfer) { char * filename; + char const * p; + char buf[256]; + unsigned int port; if((filename = _config_get_filename()) == NULL) return 1; @@ -683,12 +686,23 @@ int surfer_config_load(Surfer * surfer) free(filename); _config_load_string(surfer->config, NULL, "homepage", &surfer->homepage); - _config_load_integer(surfer->config, "proxy", "type", - &surfer->proxy_type); - _config_load_string(surfer->config, "proxy", "http", - &surfer->proxy_http); - _config_load_integer(surfer->config, "proxy", "http_port", - &surfer->proxy_http_port); + if((p = getenv("http_proxy")) != NULL && sscanf(p, + "http://%255[^:]:%u", buf, &port) == 2) + { + surfer->proxy_type = SPT_HTTP; + buf[sizeof(buf) - 1] = '\0'; + surfer->proxy_http = strdup(buf); + surfer->proxy_http_port = port; + } + else + { + _config_load_integer(surfer->config, "proxy", "type", + &surfer->proxy_type); + _config_load_string(surfer->config, "proxy", "http", + &surfer->proxy_http); + _config_load_integer(surfer->config, "proxy", "http_port", + &surfer->proxy_http_port); + } return 0; }