# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1137021818 0
# Node ID 1096bdfef88744063ed4045a5c5270acfab85b0e
# Parent  339d61ebca8ae031c095aef46cdf4cd0ddcb0d1d
[gaim-migrate @ 15185]
Removing GAIM_SUBTYPE_CONV_WINDOW because conversation windows are no longer a concept of the core. I changed the signal in gtkconv.c to use GAIM_TYPE_BOXED, but I really have no idea how well that'll actually work for the language bindings (Perl and Tcl) that were using GAIM_SUBTYPE_CONV_WINDOW.

committer: Tailor Script <tailor@pidgin.im>

diff -r 339d61ebca8a -r 1096bdfef887 plugins/ChangeLog.API
--- a/plugins/ChangeLog.API	Wed Jan 11 23:18:52 2006 +0000
+++ b/plugins/ChangeLog.API	Wed Jan 11 23:23:38 2006 +0000
@@ -134,6 +134,8 @@
 	* cb and user_data from the ops in GaimNotifyUiOps: This is now handled
 	  by the notify API in the core.
 	* GaimConversationUiOps.updated: use the conversation-updated signal
+	* GAIM_SUBTYPE_CONV_WINDOW: windows are now only represented in the UI,
+	  so GAIM_TYPE_BOXED is used for the signal types
 
 	Added:
 	* gaim_prefs_disconnect_by_handle()
diff -r 339d61ebca8a -r 1096bdfef887 plugins/perl/perl-common.c
--- a/plugins/perl/perl-common.c	Wed Jan 11 23:18:52 2006 +0000
+++ b/plugins/perl/perl-common.c	Wed Jan 11 23:23:38 2006 +0000
@@ -420,7 +420,6 @@
 		case GAIM_SUBTYPE_BLIST_CHAT:   stash = "Gaim::BuddyList::Chat";  break;
 		case GAIM_SUBTYPE_CONNECTION:   stash = "Gaim::Connection";       break;
 		case GAIM_SUBTYPE_CONVERSATION: stash = "Gaim::Conversation";     break;
-		case GAIM_SUBTYPE_CONV_WINDOW:  stash = "Gaim::ConvWindow";       break;
 		case GAIM_SUBTYPE_PLUGIN:       stash = "Gaim::Plugin";           break;
 
 		default:
diff -r 339d61ebca8a -r 1096bdfef887 plugins/tcl/tcl_signals.c
--- a/plugins/tcl/tcl_signals.c	Wed Jan 11 23:18:52 2006 +0000
+++ b/plugins/tcl/tcl_signals.c	Wed Jan 11 23:23:38 2006 +0000
@@ -258,7 +258,6 @@
 			case GAIM_SUBTYPE_ACCOUNT:
 			case GAIM_SUBTYPE_CONNECTION:
 			case GAIM_SUBTYPE_CONVERSATION:
-			case GAIM_SUBTYPE_CONV_WINDOW:
 			case GAIM_SUBTYPE_PLUGIN:
 				/* pointers again */
 				if (gaim_value_is_outgoing(handler->argtypes[i])) {
diff -r 339d61ebca8a -r 1096bdfef887 src/gtkconv.c
--- a/src/gtkconv.c	Wed Jan 11 23:18:52 2006 +0000
+++ b/src/gtkconv.c	Wed Jan 11 23:23:38 2006 +0000
@@ -6384,10 +6384,10 @@
 	 **********************************************************************/
 	gaim_signal_register(handle, "conversation-dragging",
 	                     gaim_marshal_VOID__POINTER_POINTER, NULL, 2,
-	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
-	                                    GAIM_SUBTYPE_CONV_WINDOW),
-	                     gaim_value_new(GAIM_TYPE_SUBTYPE,
-	                                    GAIM_SUBTYPE_CONV_WINDOW));
+	                     gaim_value_new(GAIM_TYPE_BOXED,
+	                                    "GaimGtkWindow *"),
+	                     gaim_value_new(GAIM_TYPE_BOXED,
+	                                    "GaimGtkWindow *"));
 
 	gaim_signal_register(handle, "conversation-timestamp",
 	                     gaim_marshal_POINTER__POINTER_POINTER,
diff -r 339d61ebca8a -r 1096bdfef887 src/value.h
--- a/src/value.h	Wed Jan 11 23:18:52 2006 +0000
+++ b/src/value.h	Wed Jan 11 23:23:38 2006 +0000
@@ -67,7 +67,6 @@
 	GAIM_SUBTYPE_BUDDY_ICON,
 	GAIM_SUBTYPE_CONNECTION,
 	GAIM_SUBTYPE_CONVERSATION,
-	GAIM_SUBTYPE_CONV_WINDOW,
 	GAIM_SUBTYPE_PLUGIN,
 	GAIM_SUBTYPE_BLIST_NODE,
 	GAIM_SUBTYPE_CIPHER,