# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1317514000 0
# Node ID 9173ec5a45cf881f2830b5b6e4cb9c8eb2b5cb3b
# Parent  a34977b4d858668cf84e55c49dc94ca6841fafb7# Parent  32eef2c3314a986dc753eda613e1e0734e4e7b66
merge of '1b285d0b375fbd5e778db6bb852a7b089feb16a3'
     and 'd1328041ee003fdee29a0cf6ae44b44727a49bb8'

diff -r a34977b4d858 -r 9173ec5a45cf finch/gntconv.c
--- a/finch/gntconv.c	Sat Oct 01 23:41:15 2011 +0000
+++ b/finch/gntconv.c	Sun Oct 02 00:06:40 2011 +0000
@@ -801,6 +801,9 @@
 		case PURPLE_CONV_TYPE_CHAT:
 			gnt_widget_set_name(ggc->window, "conversation-window-chat" );
 			break;
+		case PURPLE_CONV_TYPE_MISC:
+			gnt_widget_set_name(ggc->window, "conversation-window-misc" );
+			break;
 		case PURPLE_CONV_TYPE_ANY:
 			gnt_widget_set_name(ggc->window, "conversation-window-any" );
 			break;
diff -r a34977b4d858 -r 9173ec5a45cf libpurple/conversation.h
--- a/libpurple/conversation.h	Sat Oct 01 23:41:15 2011 +0000
+++ b/libpurple/conversation.h	Sun Oct 02 00:06:40 2011 +0000
@@ -53,6 +53,7 @@
 	PURPLE_CONV_TYPE_UNKNOWN = 0, /**< Unknown conversation type. */
 	PURPLE_CONV_TYPE_IM,          /**< Instant Message.           */
 	PURPLE_CONV_TYPE_CHAT,        /**< Chat room.                 */
+	PURPLE_CONV_TYPE_MISC,        /**< A misc. conversation.      */
 	PURPLE_CONV_TYPE_ANY          /**< Any type of conversation.  */
 
 } PurpleConversationType;