# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 959162821 0
# Node ID 1eeece1c7b7b1387aa0280542370b5571faaa29c
# Parent  a93e273ca1d62828c1b64ed441c3cf05c2b21541
[gaim-migrate @ 268]
Small changes to chat.

committer: Tailor Script <tailor@pidgin.im>

diff -r a93e273ca1d6 -r 1eeece1c7b7b libfaim/CHANGES.gaim
--- a/libfaim/CHANGES.gaim	Wed May 24 07:25:33 2000 +0000
+++ b/libfaim/CHANGES.gaim	Wed May 24 10:07:01 2000 +0000
@@ -1,3 +1,10 @@
+
+Wed May 24 05:20:31 UTC 2000 EWarmenhoven
+	- Inviting someone is possible now (I hope - I haven't been able to get
+	  into a chat room using libfaim (any client) for a couple days now).
+	- I found out from Adam that whispering (which is kind of a stupid idea
+	  anyway) isn't in Oscar, and hasn't been for quite some time, so I
+	  put a nice little error message when you try to whisper.
 
 Tue May 23 18:07:00 UTC 2000 EWarmenhoven
 	- I fixed the code to tell the server who's on your permit/deny list.
diff -r a93e273ca1d6 -r 1eeece1c7b7b libfaim/README.gaim
--- a/libfaim/README.gaim	Wed May 24 07:25:33 2000 +0000
+++ b/libfaim/README.gaim	Wed May 24 10:07:01 2000 +0000
@@ -24,20 +24,21 @@
 CURRENTLY SUPPORTED FEATURES
 ============================
 Signing on
+Receiving IMs
 Sending IMs
-Receiving IMs
+Being idle
 Being away/coming back
-Being idle
 Setting your info
 Getting users' info
+Chat:
+ - joining rooms
+ - leaving rooms
+ - talking
+ - getting invited
+ - inviting someone
 Getting users' away messages (PLEASE do not use oscar/libfaim just because of
 	this, gaim with libfaim is still really buggy, none of you will listen
 	to me anyway)
-Chat:
- - joining rooms
- - leaving rooms
- - getting invited
- - talking
 Telling the server who's on your permit/deny lists
 
 CURRENTLY UNSUPPORTED FEATURES
@@ -46,7 +47,6 @@
 Chat:
  - whispering
  - refreshing the chatlist in the preferences dialog
- - inviting someone
 Getting/setting dir info
 Changing your password
 File transfer/IM images/voice chat/etc.
@@ -66,6 +66,9 @@
 - There are a lot of problems with panel support (funny that I'm supporting the
 panel code, and the oscar code I wrote doesn't work well with it).
 
+- Oscar doesn't do whispering in chat rooms any more (and hasn't for quite a
+while, evidently). So if you want to "whisper" to someone, just IM them.
+
 - Oh, yeah, by the way, it'll eat up all your CPU. (Someone please fix this,
 there's a nice FIXME near the top of oscar.c that says what the problem is.)
 
diff -r a93e273ca1d6 -r 1eeece1c7b7b libfaim/aim_rxhandlers.c
--- a/libfaim/aim_rxhandlers.c	Wed May 24 07:25:33 2000 +0000
+++ b/libfaim/aim_rxhandlers.c	Wed May 24 10:07:01 2000 +0000
@@ -5,6 +5,9 @@
  * with aim_rxdispatch(), the Rx dispatcher.  Queue/list management is
  * actually done in aim_rxqueue.c.
  *
+ * Changes by Eric Warmenhoven, Wed May 24 09:33:38 UTC 2000:
+ * - there were some "bleck" printf's i changed to faimdprintf's.
+ *
  */
 
 #include <aim.h>
@@ -174,9 +177,9 @@
   subtype= aimutil_get16(workingPtr->data+2);
 
   if((family < maxf) && (subtype+1 < maxs) && (literals[family][subtype] != NULL))
-    printf("bleck: null handler for %04x/%04x (%s)\n", family, subtype, literals[family][subtype+1]);
+    faimdprintf(1, "bleck: null handler for %04x/%04x (%s)\n", family, subtype, literals[family][subtype+1]);
   else
-    printf("bleck: null handler for %04x/%04x (no literal)\n",family,subtype);
+    faimdprintf(1, "bleck: null handler for %04x/%04x (no literal)\n",family,subtype);
 
   return 1;
 }
diff -r a93e273ca1d6 -r 1eeece1c7b7b src/server.c
--- a/src/server.c	Wed May 24 07:25:33 2000 +0000
+++ b/src/server.c	Wed May 24 10:07:01 2000 +0000
@@ -473,6 +473,22 @@
 #ifndef USE_OSCAR
         g_snprintf(buf, sizeof(buf)/2, "toc_chat_invite %d \"%s\" %s", id, message, normalize(name));
         sflap_send(buf, -1, TYPE_DATA);
+#else
+	GList *bcs = buddy_chats;
+	struct buddy_chat *b = NULL;
+
+	while (bcs) {
+		b = (struct buddy_chat *)bcs->data;
+		if (id == b->id)
+			break;
+		bcs = bcs->next;
+		b = NULL;
+	}
+
+	if (!b)
+		return;
+		
+	aim_chat_invite(gaim_sess, gaim_conn, name, message, 0x4, b->name, 0x1);
 #endif
 }
 
@@ -509,8 +525,8 @@
         g_snprintf(buf2, sizeof(buf2), "toc_chat_whisper %d %s \"%s\"", id, who, message);
         sflap_send(buf2, -1, TYPE_DATA);
 #else
-	/* FIXME : libfaim doesn't whisper */
-	serv_chat_send(id, message);
+	do_error_dialog("Sorry, Oscar doesn't whisper. Send an IM.",
+			"Gaim - Chat");
 #endif
 }