changeset 2130:50c7a704ee56

[gaim-migrate @ 2140] i'm EricWarmenhoven. other misc. things. committer: Tailor Script <tailor@pidgin.im>
author Eric Warmenhoven <eric@warmenhoven.org>
date Mon, 06 Aug 2001 21:47:17 +0000
parents 7b68621e26db
children acc11216ec5d
files AUTHORS README doc/CREDITS doc/FAQ doc/gaim.1 plugins/ChangeLog plugins/events.c plugins/gtik.c src/aim.c src/protocols/icq/gaim_icq.c src/protocols/toc/toc.c
diffstat 11 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Mon Aug 06 21:32:18 2001 +0000
+++ b/AUTHORS	Mon Aug 06 21:47:17 2001 +0000
@@ -10,7 +10,7 @@
 	Yahoo: IBRRob
 	Jabber: robflynn@jabber.org
 Eric Warmenhoven <warmenhoven@yahoo.com> - Second in Command (patches here too)
-	AIM: EWarmenhoven
+	AIM: EricWarmenhoven
 	ICQ: 22994591
 	MSN: warmenhoven@hotmail.com
 	Yahoo: warmenhoven
--- a/README	Mon Aug 06 21:32:18 2001 +0000
+++ b/README	Mon Aug 06 21:47:17 2001 +0000
@@ -1,7 +1,7 @@
 gaim
 ========================
 Rob Flynn <rob@marko.net> IM: RobFlynn (currnet maintainer)
-Eric Warmenhoven <warmenhoven@yahoo.com> IM: EWarmenhoven (Gnome Boy :))
+Eric Warmenhoven <warmenhoven@yahoo.com> IM: EricWarmenhoven (Gnome Boy :))
 Syd Logan - Super Hacker and Resident Designated Driver
 Jim Duchek <jimduchek@ou.edu> IM: Zilding (former maintainer)
 Mark Spencer <markster@marko.net>
--- a/doc/CREDITS	Mon Aug 06 21:32:18 2001 +0000
+++ b/doc/CREDITS	Mon Aug 06 21:47:17 2001 +0000
@@ -5,7 +5,7 @@
 Authors:
 
 Rob Flynn    	  <IM: RobFlynn>		rflynn@blueridge.net
-Eric Warmenhoven  <IM: EWarmenhoven>		warmenhoven@yahoo.com
+Eric Warmenhoven  <IM: EricWarmenhoven>		warmenhoven@yahoo.com
 Syd Logan
 Jim Duchek        <IM: zilding>			jimduchek@ou.edu
 Mark Spencer      <IM: markster97>		markster@marko.net
@@ -68,4 +68,4 @@
 
 A big thanks to the X-Chat developers, who were kind enough to
 license X-Chat under the GPL so that I could learn to be as cool
-as them. -EWarmenhoven
+as them. -EW
--- a/doc/FAQ	Mon Aug 06 21:32:18 2001 +0000
+++ b/doc/FAQ	Mon Aug 06 21:47:17 2001 +0000
@@ -65,7 +65,7 @@
 1.2  Where are my log files stored?
 
 Your logs are stored in $HOME/.gaim/logs/. They had previously been stored in
-$HOME/.gaim/YourScreenName/ (e.g. $HOME/.gaim/EWarmenhoven).
+$HOME/.gaim/YourScreenName/ (e.g. $HOME/.gaim/EricWarmenhoven).
 
 1.3  What are GtkHTML and GtkIMHtml, and why not just use GNOME's GtkHTML?
 
@@ -309,7 +309,7 @@
 
 6.3  I have money. I need software written. Can you help?
 
-Oh yes. Our email addresses are warmenhoven@yahoo.com (EWarmenhoven) and
+Oh yes. Our email addresses are warmenhoven@yahoo.com (EricWarmenhoven) and
 rob@marko.net (RobFlynn).
 
 6.4  I have hardware here that's not being used. Can you use it?
--- a/doc/gaim.1	Mon Aug 06 21:32:18 2001 +0000
+++ b/doc/gaim.1	Mon Aug 06 21:47:17 2001 +0000
@@ -367,7 +367,7 @@
 .PP
  Rob Flynn <rob@marko.net> \- AIM: RobFlynn
 .br
- Eric Warmenhoven <warmenhoven@yahoo.com> \- AIM: EWarmenhoven
+ Eric Warmenhoven <warmenhoven@yahoo.com> \- AIM: EricWarmenhoven
 .br
  Syd Logan
 
--- a/plugins/ChangeLog	Mon Aug 06 21:32:18 2001 +0000
+++ b/plugins/ChangeLog	Mon Aug 06 21:47:17 2001 +0000
@@ -38,7 +38,7 @@
 	If you have interest in writing a protocol plugin, please talk to one
 	of us before you start.
 
-	That's about all that I'm going to talk about. My SN is EWarmenhoven
+	That's about all that I'm going to talk about. My SN is EricWarmenhoven
 	if you have any questions (like what the hell struct gaim_connection is
 	and what its relation to struct aim_user is).
 
--- a/plugins/events.c	Mon Aug 06 21:32:18 2001 +0000
+++ b/plugins/events.c	Mon Aug 06 21:47:17 2001 +0000
@@ -2,7 +2,7 @@
  *
  * test every callback, print to stdout
  *
- * by EWarmenhoven
+ * by EW
  *
  * GPL and all that jazz
  *
--- a/plugins/gtik.c	Mon Aug 06 21:32:18 2001 +0000
+++ b/plugins/gtik.c	Mon Aug 06 21:47:17 2001 +0000
@@ -16,7 +16,7 @@
  *	Do not use the Gnome Stock Ticker for making investment decisions, 
  *      it is for informational purposes only.
  *
- *      Modified by EWarmenhoven to become a gaim plugin. There was little
+ *      Modified by EricWarmenhoven to become a gaim plugin. There was little
  *      enough that needed to be changed that I can't really claim any credit.
  *      (you need to add -lghttp to the GTK_LIBS part of the Makefile)
  *      TODO: config, saving info
--- a/src/aim.c	Mon Aug 06 21:32:18 2001 +0000
+++ b/src/aim.c	Mon Aug 06 21:47:17 2001 +0000
@@ -388,7 +388,7 @@
 				"and post the backtrace from the core file. If you do not know\n"
 				"how to get the backtrace, please get instructions at\n"
 				WEBSITE "gdb.shtml. If you need further\n"
-				"assistance, please IM either EWarmenhoven or RobFlynn and\n"
+				"assistance, please IM either EricWarmenhoven or RobFlynn and\n"
 				"they can help you.\n");
 		abort();
 		break;
--- a/src/protocols/icq/gaim_icq.c	Mon Aug 06 21:32:18 2001 +0000
+++ b/src/protocols/icq/gaim_icq.c	Mon Aug 06 21:47:17 2001 +0000
@@ -174,7 +174,7 @@
 	serv_got_update(gc, buf, 1, 0, 0, 0, status, 0);
 }
 
-static gint icq_set_timeout_cb() {
+static gboolean icq_set_timeout_cb(gpointer data) {
 	icq_HandleTimeout();
 	ack_timer = 0;
 	return FALSE;
@@ -183,9 +183,9 @@
 static void icq_set_timeout(long interval) {
 	debug_printf("icq_SetTimeout: %ld\n", interval);
 	if (interval > 0 && ack_timer == 0)
-		ack_timer = gtk_timeout_add(interval * 1000, (GtkFunction)icq_set_timeout_cb, NULL);
+		ack_timer = g_timeout_add(interval * 1000, icq_set_timeout_cb, NULL);
 	else if (ack_timer > 0) {
-		gtk_timeout_remove(ack_timer);
+		g_source_remove(ack_timer);
 		ack_timer = 0;
 	}
 }
--- a/src/protocols/toc/toc.c	Mon Aug 06 21:32:18 2001 +0000
+++ b/src/protocols/toc/toc.c	Mon Aug 06 21:47:17 2001 +0000
@@ -845,7 +845,7 @@
 
 	n = g_snprintf(buf, sizeof(buf), "toc_add_buddy");
 	while (buddies) {
-		if (strlen(normalize(buddies->data)) > MSG_LEN - n - 16) {
+		if (strlen(normalize(buddies->data)) + n + 32 > MSG_LEN) {
 			sflap_send(g, buf, -1, TYPE_DATA);
 			n = g_snprintf(buf, sizeof(buf), "toc_add_buddy");
 		}