# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1054006732 0
# Node ID 3becf79500d203166208e716a2cc90e331c84e51
# Parent  8bf28c2d100e3d787f7b0443155196ddba8cc287
[gaim-migrate @ 5937]
This is:
-AIM over OSCAR use Christian's new, kick ass
  gaim_notify_email stuff for new mail notification.  This
  should be good, but it's kind of a pain to test.  Let me
  know if you have any problems

-Minor fix to the translation README

-2 minor changes to the doxygen of 2 major header files
  (this means you'll have to recompile a lot of files :-) )

-If your global proxy setting is "No Proxy" and your global
  proxy host is empty, but $http_proxy is set to something,
  gaim used to switch your global proxy setting to "HTTP."  It
  no longer does this.  This makes more sense to me.  If you
  disagree, please let me know--this is open to debate, and
  what not.  Also, the use of environmental proxy settings
  will be changed a bit in the next day or two

committer: Tailor Script <tailor@pidgin.im>

diff -r 8bf28c2d100e -r 3becf79500d2 po/README
--- a/po/README	Tue May 27 02:58:56 2003 +0000
+++ b/po/README	Tue May 27 03:38:52 2003 +0000
@@ -12,7 +12,7 @@
 
 To update an exsting translation, type:
 
-./update.pl LANG.po
+./update.pl LANG
 
 where LANG is the language code to update, such as fr or ja. This will build
 a new gaim.pot and update the translation with the changes. You may then
diff -r 8bf28c2d100e -r 3becf79500d2 src/gaimrc.c
--- a/src/gaimrc.c	Tue May 27 02:58:56 2003 +0000
+++ b/src/gaimrc.c	Tue May 27 03:38:52 2003 +0000
@@ -1177,9 +1177,7 @@
 
 	len = c - proxy;
 
-	if (!strncmp(proxy, "http://", len + 3))
-		global_proxy_info.proxytype = PROXY_HTTP;
-	else
+	if (strncmp(proxy, "http://", len + 3))
 		return FALSE;
 
 	gaim_debug(GAIM_DEBUG_MISC, "gaimrc", "Found HTTP proxy.\n");
@@ -1348,9 +1346,6 @@
 				g_snprintf(global_proxy_info.proxypass,
 						sizeof(global_proxy_info.proxypass), "%s",
 						g_getenv("HTTPPROXYPASS"));
-
-			if (global_proxy_info.proxyhost[0])
-				global_proxy_info.proxytype = PROXY_HTTP;
 		}
 	}
 }
diff -r 8bf28c2d100e -r 3becf79500d2 src/gtkft.h
--- a/src/gtkft.h	Tue May 27 02:58:56 2003 +0000
+++ b/src/gtkft.h	Tue May 27 03:38:52 2003 +0000
@@ -1,5 +1,5 @@
 /**
- * @file gtkft.h The GTK+ file transfer UI
+ * @file gtkft.h GTK+ file transfer UI
  * @ingroup gtkui
  *
  * gaim
diff -r 8bf28c2d100e -r 3becf79500d2 src/gtkimhtml.h
--- a/src/gtkimhtml.h	Tue May 27 02:58:56 2003 +0000
+++ b/src/gtkimhtml.h	Tue May 27 03:38:52 2003 +0000
@@ -1,5 +1,5 @@
 /**
- * @file gtkimhtml.h Gaim IM rendering component
+ * @file gtkimhtml.h GTK+ Gaim IM rendering component
  * @ingroup gtkui
  *
  * Copyright (C) 2000, Eric Warmenhoven <warmenhoven@yahoo.com>
diff -r 8bf28c2d100e -r 3becf79500d2 src/gtknotify.c
--- a/src/gtknotify.c	Tue May 27 02:58:56 2003 +0000
+++ b/src/gtknotify.c	Tue May 27 03:38:52 2003 +0000
@@ -195,12 +195,12 @@
 
 		if (froms != NULL) {
 			from_text = g_strdup_printf(
-				"<span weight=\"bold\">From:</span> %s", *froms);
+				"<span weight=\"bold\">From:</span> %s\n", *froms);
 		}
 
 		if (subjects != NULL) {
 			subject_text = g_strdup_printf(
-				"<span weight=\"bold\">Subject:</span> %s", *subjects);
+				"<span weight=\"bold\">Subject:</span> %s\n", *subjects);
 		}
 
 		label_text = g_strdup_printf(
diff -r 8bf28c2d100e -r 3becf79500d2 src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue May 27 02:58:56 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Tue May 27 03:38:52 2003 +0000
@@ -3445,11 +3445,13 @@
 	va_end(ap);
 
 	if (emailinfo) {
+		gchar *to = g_strdup_printf("%s@%s", gc->username, emailinfo->domain);
 		if (emailinfo->unread) {
 			if (havenewmail)
-				connection_has_mail(gc, emailinfo->nummsgs ? emailinfo->nummsgs : -1, NULL, NULL, emailinfo->url);
+				gaim_notify_emails(gc, emailinfo->nummsgs, FALSE, NULL, NULL, &to, &emailinfo->url, NULL, NULL);
 		} else
-			connection_has_mail(gc, 0, NULL, NULL, emailinfo->url);
+			gaim_notify_emails(gc, 0, FALSE, NULL, NULL, &to, &emailinfo->url, NULL, NULL);
+		g_free(to);
 	}
 
 	return 1;