changeset 32253:9173ec5a45cf

merge of '1b285d0b375fbd5e778db6bb852a7b089feb16a3' and 'd1328041ee003fdee29a0cf6ae44b44727a49bb8'
author Kevin Stange <kevin@simguy.net>
date Sun, 02 Oct 2011 00:06:40 +0000
parents a34977b4d858 (current diff) 32eef2c3314a (diff)
children 3555d352ee4a
files libpurple/conversation.h
diffstat 2 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;