diff src/buddy_chat.c @ 2289:38e156136896

[gaim-migrate @ 2299] some irc fixes committer: Tailor Script <[e-mail]>

--- a/src/buddy_chat.c	Sun Sep 16 18:30:44 2001 +0000
+++ b/src/buddy_chat.c	Mon Sep 17 05:00:56 2001 +0000
@@ -107,6 +107,7 @@
 {
 	GList *list, *tmp;
 	struct proto_chat_entry *pce;
+	gboolean focus = TRUE;
 
 	if (!joinchatgc)
 		return;
@@ -149,7 +150,10 @@
 			gtk_box_pack_start(GTK_BOX(rowbox), entry, TRUE, TRUE, 0);
 			if (pce->def)
 				gtk_entry_set_text(GTK_ENTRY(entry), pce->def);
-			gtk_widget_grab_focus(entry);
+			if (focus) {
+				gtk_widget_grab_focus(entry);
+				focus = FALSE;
+			}
 			gtk_signal_connect(GTK_OBJECT(entry), "activate",
 					   GTK_SIGNAL_FUNC(do_join_chat), NULL);
 			gtk_widget_show(entry);
@@ -487,7 +491,10 @@
 	if (!(flag & WFLAG_WHISPER)) {
 		str = g_strdup(normalize(who));
 		if (!g_strcasecmp(str, normalize(b->gc->username))) {
-			debug_printf("%s %s\n", normalize(who), normalize(b->gc->username));
+			if (b->makesound && (sound_options & OPT_SOUND_CHAT_YOU_SAY))
+				play_sound(CHAT_YOU_SAY);
+			flag |= WFLAG_SEND;
+		} else if (!g_strcasecmp(str, normalize(b->gc->displayname))) {
 			if (b->makesound && (sound_options & OPT_SOUND_CHAT_YOU_SAY))
 				play_sound(CHAT_YOU_SAY);
 			flag |= WFLAG_SEND;
@@ -540,14 +547,6 @@
 
 }
 
-void topic_callback(GtkWidget *widget, struct conversation *b) {
-   	char *buf = gtk_entry_get_text(GTK_ENTRY(widget));;
-
-	serv_chat_set_topic(b->gc, b->id, buf);
-
-	g_free(buf);
-}
-
 static gint insertname(gconstpointer one, gconstpointer two)
 {
 	const char *a = (const char *)one;
@@ -968,8 +967,7 @@
 		gtk_widget_show(label);
 
 		b->topic_text = gtk_entry_new();
-		gtk_signal_connect(GTK_OBJECT(b->topic_text), "activate",
-				   GTK_SIGNAL_FUNC(topic_callback), b);
+		gtk_entry_set_editable(GTK_ENTRY(b->topic_text), FALSE);
 		gtk_box_pack_start(GTK_BOX(hbox), b->topic_text, TRUE, TRUE, 5);
 		gtk_widget_show(b->topic_text);
 	}