Mercurial > pidgin

changeset 19782:f1bcba415a4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '2510b3bdf51be7bd339aca4a39ec86bf73c6716c' and 'f7c31ba459e2ad06a7d5866a8591aa46f4cda7c2'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Thu, 13 Sep 2007 02:17:31 +0000
parents 6dcab2412c22 (diff) 959b3aaba0b6 (current diff)
children e4dc98b8e140
files
diffstat 7 files changed, 112 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/ntlm.c	Thu Sep 13 02:15:05 2007 +0000
+++ b/libpurple/ntlm.c	Thu Sep 13 02:17:31 2007 +0000
@@ -131,7 +131,7 @@
 	tmsg->protocol[6] = 'P';
 	tmsg->protocol[7] = '\0';
 	tmsg->type      = 0x00000001;
-	tmsg->flags     = 0x0000b202;
+	tmsg->flags     = 0x0000b203;
 	tmsg->dom_len1  = tmsg->dom_len2 = domainlen;
 	tmsg->dom_off   = sizeof(struct type1_message) + hostnamelen;
 	tmsg->host_len1 = tmsg->host_len2 = hostnamelen;
@@ -286,7 +286,7 @@
 		tmsg->sess_len1 = tmsg->sess_len2 = 0x0010;
 	}
 
-	tmsg->flags = 0x00008200;
+	tmsg->flags = 0x00008201;
 
 	tmp = (char *)tmsg + sizeof(struct type3_message);
 
--- a/libpurple/proxy.c	Thu Sep 13 02:15:05 2007 +0000
+++ b/libpurple/proxy.c	Thu Sep 13 02:17:31 2007 +0000
@@ -668,6 +668,16 @@
 		if (status == 407 /* Proxy Auth */)
 		{
 			gchar *ntlm;
+			char hostname[256];
+			int ret;
+
+			ret = gethostname(hostname, sizeof(hostname));
+			hostname[sizeof(hostname) - 1] = '\0';
+			if (ret < 0 || hostname[0] == '\0') {
+				purple_debug_warning("proxy", "gethostname() failed -- is your hostname set?");
+				strcpy(hostname, "localhost");
+			}
+
 			ntlm = g_strrstr((const gchar *)connect_data->read_buffer,
 					"Proxy-Authenticate: NTLM ");
 			if (ntlm != NULL)
@@ -679,6 +689,7 @@
 				gchar *username;
 				gchar *request;
 				gchar *response;
+
 				username = strchr(domain, '\\');
 				if (username == NULL)
 				{
@@ -694,7 +705,7 @@
 				nonce = purple_ntlm_parse_type2(ntlm, NULL);
 				response = purple_ntlm_gen_type3(username,
 					(gchar*) purple_proxy_info_get_password(connect_data->gpi),
-					(gchar*) purple_proxy_info_get_host(connect_data->gpi),
+					hostname,
 					domain, nonce, NULL);
 				username--;
 				*username = '\\';
@@ -745,9 +756,7 @@
 					sizeof(request) - request_len,
 					"Proxy-Authorization: NTLM %s\r\n"
 					"Proxy-Connection: Keep-Alive\r\n\r\n",
-					purple_ntlm_gen_type1(
-						(gchar*) purple_proxy_info_get_host(connect_data->gpi),
-						domain));
+					purple_ntlm_gen_type1(hostname, domain));
 				*username = '\\';
 
 				purple_input_remove(connect_data->inpa);
@@ -832,6 +841,14 @@
 	if (purple_proxy_info_get_username(connect_data->gpi) != NULL)
 	{
 		char *t1, *t2;
+		char hostname[256];
+
+		ret = gethostname(hostname, sizeof(hostname));
+		hostname[sizeof(hostname) - 1] = '\0';
+		if (ret < 0 || hostname[0] == '\0') {
+			purple_debug_warning("proxy", "gethostname() failed -- is your hostname set?");
+			strcpy(hostname, "localhost");
+		}
 
 		t1 = g_strdup_printf("%s:%s",
 			purple_proxy_info_get_username(connect_data->gpi),
@@ -844,8 +861,7 @@
 			"Proxy-Authorization: Basic %s\r\n"
 			"Proxy-Authorization: NTLM %s\r\n"
 			"Proxy-Connection: Keep-Alive\r\n",
-			t2, purple_ntlm_gen_type1(
-					purple_proxy_info_get_host(connect_data->gpi), ""));
+			t2, purple_ntlm_gen_type1(hostname, ""));
 		g_free(t2);
 	}
 
--- a/pidgin/Makefile.am	Thu Sep 13 02:15:05 2007 +0000
+++ b/pidgin/Makefile.am	Thu Sep 13 02:17:31 2007 +0000
@@ -29,6 +29,7 @@
 		win32/nsis/langmacros.nsh \
 		win32/nsis/translations/afrikaans.nsh \
 		win32/nsis/translations/albanian.nsh \
+		win32/nsis/translations/basque.nsh \
 		win32/nsis/translations/bulgarian.nsh \
 		win32/nsis/translations/catalan.nsh \
 		win32/nsis/translations/czech.nsh \
--- a/pidgin/gtkimhtmltoolbar.c	Thu Sep 13 02:15:05 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Thu Sep 13 02:17:31 2007 +0000
@@ -1298,6 +1298,10 @@
 			imhtmltoolbar_view_pref_changed, toolbar);
 	purple_prefs_trigger_callback(PIDGIN_PREFS_ROOT "/conversations/toolbar/wide");
 
+#if GTK_CHECK_VERSION(2,4,0)
+	gtk_event_box_set_visible_window(GTK_EVENT_BOX(event), FALSE);
+#endif
+
 	gtk_widget_add_events(event, GDK_BUTTON_PRESS_MASK);
 	gtk_box_pack_start(GTK_BOX(hbox), event, TRUE, TRUE, 0);
 	g_signal_connect(G_OBJECT(event), "button-press-event", G_CALLBACK(gtk_imhtmltoolbar_popup_menu), toolbar);
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Thu Sep 13 02:15:05 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Thu Sep 13 02:17:31 2007 +0000
@@ -167,6 +167,7 @@
 
   !insertmacro MUI_LANGUAGE "Afrikaans"
   !insertmacro MUI_LANGUAGE "Albanian"
+  !insertmacro MUI_LANGUAGE "Basque"
   !insertmacro MUI_LANGUAGE "Bulgarian"
   !insertmacro MUI_LANGUAGE "Catalan"
   !insertmacro MUI_LANGUAGE "Czech"
@@ -206,6 +207,7 @@
 
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "AFRIKAANS"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\afrikaans.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ALBANIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\albanian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BASQUE"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\basque.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BULGARIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CATALAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\catalan.nsh"
   !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CZECH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\czech.nsh"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/win32/nsis/translations/basque.nsh	Thu Sep 13 02:17:31 2007 +0000
@@ -0,0 +1,80 @@
+;;
+;;  basque.nsh
+;;Abio-menua - Istanteko Mezularitza
+;;  Basque language strings for the Windows Pidgin NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Author: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>, 2007.
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Instalatzailea martxan dago."
+!define PIDGIN_IS_RUNNING			"Pidgin istantzia bat dago martxan. Pidgin itxi eta berriro saiatu."
+!define GTK_INSTALLER_NEEDED			"GTK+ exekuzio-ingurunea falta da, edo eguneratu egin beharko litzateke.$\rGTK+ exekuzio-ingurunearen ${GTK_MIN_VERSION} bertsioa edo berriagoa instalatu"
+
+; License Page
+!define PIDGIN_LICENSE_BUTTON			"Jarraitu >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"GNU Lizentzia Orokor Publikopean (GPL) argitaratzen da $(^Name). Informatzeko helburu soilarekin aurkezten da hemen lizentzia. $_CLICK"
+
+; Components Page
+!define PIDGIN_SECTION_TITLE			"Pidgin Istanteko Mezularitza Bezeroa (beharrezkoa)"
+!define GTK_SECTION_TITLE			"GTK+ exekuzio ingurunea (beharrezkoa)"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Lasterbideak"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Mahaigaina"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Abio-menua"
+!define PIDGIN_SECTION_DESCRIPTION		"Funtsezko Pidgin fitxategi eta dll-ak"
+!define GTK_SECTION_DESCRIPTION		"Plataforma anitzeko GUI tresna-sorta, Pidgin-ek erabilia"
+
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Pidgin abiarazteko lasterbideak"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Pidgin-entzako lasterbidea Mahaigainean"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Pidgin-entzako lasterbidea Abio-Menuan"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"GTK+ exekuzio-ingurunearen bertsio zahar bat aurkitu da. Eguneratu egin nahi al duzu?$\rOharra: Bestela, posible da $(^Name) ez ibiltzea."
+!define GTK_WINDOWS_INCOMPATIBLE		"GTK+ 2.8.0 eta berriagoekin bateraezinak dira Windows 95/98/Me.  Ez da GTK+ ${GTK_INSTALL_VERSION} instalatuko.$\rJadanik ez badaukazu GTK+ ${GTK_MIN_VERSION} edo berriagorik instalatuta, bertan behera utziko da instalazioa."
+
+; Installer Finish Page
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Pidgin Webgunera etorri"
+
+; Pidgin Section Prompts and Texts
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Ezin izan da jadanik instalatuta zegoen Pidgin bertsioa kendu. Aurreko bertsioa kendu gabe instalatuko da bertsio berria."
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Errorea GTK+ exekuzio-ingurunea instalatzean."
+!define GTK_BAD_INSTALL_PATH			"The path you entered can not be accessed or created."
+
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"URI Kudeatzaileak"
+
+; Uninstall Section Prompts
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Ezin izan dira Pidgin-en erregistro-sarrerak aurkitu.$\rZiurrenik, beste erabiltzaile batek instalatu zuen aplikazio hau."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Ez daukazu aplikazio hau kentzeko baimenik."
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Zuzentzaile Ortografikoa"
+!define PIDGIN_SPELLCHECK_ERROR		"Errorea Zuzentzaile Ortografikoa instalatzean"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Errorea Zuzentzaile Ortografikoarentzako hiztegia instalatzean"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Zuzentzaile Ortografikoa.  (Internet konexioa behar du instalatzeko)"
+!define ASPELL_INSTALL_FAILED			"Ezin izan da instalatu"
+!define PIDGIN_SPELLCHECK_BRETON		"Britaniera"
+!define PIDGIN_SPELLCHECK_CATALAN		"Katalana"
+!define PIDGIN_SPELLCHECK_CZECH		"Txekiera"
+!define PIDGIN_SPELLCHECK_WELSH		"Gaelikoa"
+!define PIDGIN_SPELLCHECK_DANISH		"Daniera"
+!define PIDGIN_SPELLCHECK_GERMAN		"Alemana"
+!define PIDGIN_SPELLCHECK_GREEK		"Grekoa"
+!define PIDGIN_SPELLCHECK_ENGLISH		"Ingelesa"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperantoa"
+!define PIDGIN_SPELLCHECK_SPANISH		"Gaztelania"
+!define PIDGIN_SPELLCHECK_FAROESE		"Faroera"
+!define PIDGIN_SPELLCHECK_FRENCH		"Frantsesa"
+!define PIDGIN_SPELLCHECK_ITALIAN		"Italiera"
+!define PIDGIN_SPELLCHECK_DUTCH		"Nederlandera"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norvegiera"
+!define PIDGIN_SPELLCHECK_POLISH		"Poloniera"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugesa"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Errumaniera"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"Errusiera"
+!define PIDGIN_SPELLCHECK_SLOVAK		"Eslovakiera"
+!define PIDGIN_SPELLCHECK_SWEDISH		"Suediera"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukraniera"
+
--- a/po/ChangeLog	Thu Sep 13 02:15:05 2007 +0000
+++ b/po/ChangeLog	Thu Sep 13 02:17:31 2007 +0000
@@ -1,6 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.2.0
+	* Basque win32 translation added (Mikel Pascual Aldabaldetreku)
 	* Belarusian Latin translation added (Ihar Hrachyshka)
 	* Czech translation updated (Miloslav Trmac)
 	* English (British) translation updated (Luke Ross)