Adding patch to deactivate Chat button for prpls that don't support it. Closes bug #57565. Thanks to Stu Tomlinson for the patch.

4 files changed, 77 insertions, 12 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index b9aefb600824..4223bfe371bd 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.203 2004/07/19 11:04:22 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.204 2004/07/21 16:51:42 rizzo Exp $
+
+  21 Jul 2004; Don Seiler <rizzo@gentoo.org>
+  +files/gaim-0.81cvs-chatbutton-crashfix.patch, gaim-0.80.ebuild:
+  Adding patch to deactivate Chat button for prpls that don't support it. Closes
+  bug #57565. Thanks to Stu Tomlinson for the patch.
 
   19 Jul 2004; Don Seiler <rizzo@gentoo.org> gaim-0.80.ebuild:
   Raising minimum gaim-encryption, closes bug #57548
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 526ef88bb2e2..6611490e95d9 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,18 +1,19 @@
-MD5 8f37dca6c258a0e67582dce2fb86147e gaim-0.80.ebuild 4321
-MD5 ef8ff410b3b5c38b803fdcccdd9a12d0 gaim-0.79-r2.ebuild 4254
+MD5 d02db9e435d83c1a5a58a9e7bc910700 ChangeLog 33636
 MD5 2082dba7f44158a072d405ae826cfb70 gaim-0.77.ebuild 4034
 MD5 61fad13c0f47db7f6e84a6d21e1d34db gaim-0.79-r1.ebuild 4208
-MD5 4620f7532ddd1f86ccea50ea8ad96b09 ChangeLog 33389
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
-MD5 672dd3fb3ce09b1402e80069ce307492 files/gaim-0.79-buddyicon.patch 5152
+MD5 ef8ff410b3b5c38b803fdcccdd9a12d0 gaim-0.79-r2.ebuild 4254
+MD5 bf9efd6ff715b122e97ec79e1791051e gaim-0.80.ebuild 4380
 MD5 4bc83ad48d260db208fcae372c2bb291 files/digest-gaim-0.77 63
-MD5 7a5f5d2d68f003ca4e2b61935ca40ea1 files/digest-gaim-0.80 63
-MD5 12944fad880bbec0f05c539550fa5dd4 files/gaim-0.81cvs-gtkblist_dnd.diff 1516
+MD5 a71b33cfe6690e3792d65f1b407ace3e files/digest-gaim-0.79-r1 63
+MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 MD5 3a5e6167d13c4a44a8618c12629d777e files/gaim-0.77-c99.patch 4790
-MD5 4d66f0652fc19f650164da20f3898eac files/gaim-0.81cvs-irc-ison-lessflood.patch 1252
 MD5 a8234ce30b90015d2798a6f576982857 files/gaim-0.78cvs-novelltweaks5.patch 715
-MD5 a71b33cfe6690e3792d65f1b407ace3e files/digest-gaim-0.79-r1 63
+MD5 672dd3fb3ce09b1402e80069ce307492 files/gaim-0.79-buddyicon.patch 5152
 MD5 a71b33cfe6690e3792d65f1b407ace3e files/digest-gaim-0.79-r2 63
-MD5 d37f310f1242f44dab25d3aa42c8836d files/gaim-0.81cvs-icon_scaling.diff 3999
-MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 MD5 3c401c12526335e1e2c4c45851678132 files/gaim-0.80cvs-login.diff 656
+MD5 7a5f5d2d68f003ca4e2b61935ca40ea1 files/digest-gaim-0.80 63
+MD5 12944fad880bbec0f05c539550fa5dd4 files/gaim-0.81cvs-gtkblist_dnd.diff 1516
+MD5 d37f310f1242f44dab25d3aa42c8836d files/gaim-0.81cvs-icon_scaling.diff 3999
+MD5 4d66f0652fc19f650164da20f3898eac files/gaim-0.81cvs-irc-ison-lessflood.patch 1252
+MD5 91841348c88bce66a078e65c4c26f9ca files/gaim-0.81cvs-chatbutton-crashfix.patch 2932
diff --git a/net-im/gaim/files/gaim-0.81cvs-chatbutton-crashfix.patch b/net-im/gaim/files/gaim-0.81cvs-chatbutton-crashfix.patch
new file mode 100644
index 000000000000..d09f734e7d11
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.81cvs-chatbutton-crashfix.patch
@@ -0,0 +1,58 @@
+Index: src/gtkblist.c
+===================================================================
+RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
+retrieving revision 1.136
+diff -u -p -u -r1.136 gtkblist.c
+--- src/gtkblist.c	18 Jul 2004 18:21:26 -0000	1.136
++++ src/gtkblist.c	21 Jul 2004 16:37:13 -0000
+@@ -2937,6 +2937,8 @@ sign_on_off_cb(GaimConnection *gc, GaimB
+ 
+ 	widget = gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Privacy"));
+ 	gtk_widget_set_sensitive(widget, gaim_gtk_privacy_is_showable());
++
++	gaim_gtk_blist_update_toolbar();
+ }
+ 
+ 
+@@ -3209,6 +3211,7 @@ static void gaim_gtk_blist_show(GaimBudd
+ 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_im_cb),
+ 			 gtkblist->treeview);
+ 	gtk_tooltips_set_tip(GTK_TOOLTIPS(gtkblist->tooltips), button, _("Send a message to the selected buddy"), NULL);
++	g_object_set_data(G_OBJECT(button), "button_name", "im");
+ 	gtk_widget_show(button);
+ 
+ 	button = gaim_pixbuf_button_from_stock(_("Get _Info"), GAIM_STOCK_INFO, GAIM_BUTTON_VERTICAL);
+@@ -3218,6 +3221,7 @@ static void gaim_gtk_blist_show(GaimBudd
+ 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_info_cb),
+ 			 gtkblist->treeview);
+ 	gtk_tooltips_set_tip(GTK_TOOLTIPS(gtkblist->tooltips), button, _("Get information on the selected buddy"), NULL);
++	g_object_set_data(G_OBJECT(button), "button_name", "info");
+ 	gtk_widget_show(button);
+ 
+ 	button = gaim_pixbuf_button_from_stock(_("_Chat"), GAIM_STOCK_CHAT, GAIM_BUTTON_VERTICAL);
+@@ -3226,6 +3230,8 @@ static void gaim_gtk_blist_show(GaimBudd
+ 	gtk_size_group_add_widget(sg, button);
+ 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_chat_cb), gtkblist->treeview);
+ 	gtk_tooltips_set_tip(GTK_TOOLTIPS(gtkblist->tooltips), button, _("Join a chat room"), NULL);
++	gtk_widget_set_sensitive(button, gaim_gtk_blist_joinchat_is_showable());
++	g_object_set_data(G_OBJECT(button), "button_name", "chat");
+ 	gtk_widget_show(button);
+ 
+ 	button = gaim_pixbuf_button_from_stock(_("_Away"), GAIM_STOCK_ICON_AWAY, GAIM_BUTTON_VERTICAL);
+@@ -3234,6 +3240,7 @@ static void gaim_gtk_blist_show(GaimBudd
+ 	gtk_size_group_add_widget(sg, button);
+ 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(gtk_blist_button_away_cb), NULL);
+ 	gtk_tooltips_set_tip(GTK_TOOLTIPS(gtkblist->tooltips), button, _("Set an away message"), NULL);
++	g_object_set_data(G_OBJECT(button), "button_name", "away");
+ 	gtk_widget_show(button);
+ 
+ 	/* this will show the right image/label widgets for us */
+@@ -3425,6 +3432,8 @@ gaim_gtk_blist_update_toolbar_icons (Gtk
+ 			gtk_widget_show(widget);
+ 	}
+ 	else if (GTK_IS_CONTAINER(widget)) {
++		if (GTK_IS_BUTTON(widget) && !strcmp(g_object_get_data(G_OBJECT(widget), "button_name"), "chat"))
++				gtk_widget_set_sensitive(widget, gaim_gtk_blist_joinchat_is_showable());
+ 		gtk_container_foreach(GTK_CONTAINER(widget),
+ 							  gaim_gtk_blist_update_toolbar_icons, NULL);
+ 	}
diff --git a/net-im/gaim/gaim-0.80.ebuild b/net-im/gaim/gaim-0.80.ebuild
index 4ff5fcc4d366..fe7930785362 100644
--- a/net-im/gaim/gaim-0.80.ebuild
+++ b/net-im/gaim/gaim-0.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.80.ebuild,v 1.3 2004/07/19 11:04:22 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.80.ebuild,v 1.4 2004/07/21 16:51:42 rizzo Exp $
 
 inherit flag-o-matic eutils gcc
 use debug && inherit debug
@@ -64,6 +64,7 @@ src_unpack() {
 	epatch ${FILESDIR}/gaim-0.81cvs-gtkblist_dnd.diff
 	epatch ${FILESDIR}/gaim-0.81cvs-icon_scaling.diff
 	epatch ${FILESDIR}/gaim-0.81cvs-irc-ison-lessflood.patch
+	epatch ${FILESDIR}/gaim-0.81cvs-chatbutton-crashfix.patch
 }
 
 src_compile() {