# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 984778820 0
# Node ID c1a8a7c4042451e7f0513e68d329d3b062c9ef07
# Parent  f5845007e3bc9ae6ded4a5c3650b845ec93619b0
[gaim-migrate @ 1607]
highlight on system notices as well. also enable a popup on right-click for tabs.

committer: Tailor Script <tailor@pidgin.im>

diff -r f5845007e3bc -r c1a8a7c40424 src/conversation.c
--- a/src/conversation.c	Fri Mar 16 21:20:01 2001 +0000
+++ b/src/conversation.c	Fri Mar 16 21:40:20 2001 +0000
@@ -1440,8 +1440,9 @@
 	    (!c->is_chat && (general_options & OPT_GEN_POPUP_WINDOWS)))
 		    gdk_window_show(c->window->window);
 
-	if ((flags & WFLAG_RECV) && !c->is_chat && (display_options & OPT_DISP_ONE_WINDOW) &&
-			(gtk_notebook_get_current_page(GTK_NOTEBOOK(convo_notebook))
+	if (((flags & WFLAG_RECV) || (flags & WFLAG_SYSTEM)) && !c->is_chat &&
+	    (display_options & OPT_DISP_ONE_WINDOW) &&
+	    (gtk_notebook_get_current_page(GTK_NOTEBOOK(convo_notebook))
 			 != g_list_index(conversations, c))) {
 		GtkWidget *label = gtk_notebook_get_tab_label(GTK_NOTEBOOK(convo_notebook),
 				gtk_notebook_get_nth_page(GTK_NOTEBOOK(convo_notebook),
@@ -1921,6 +1922,7 @@
 
 			convo_notebook = gtk_notebook_new();
 			gtk_notebook_set_scrollable(GTK_NOTEBOOK(convo_notebook), TRUE);
+			gtk_notebook_popup_enable(GTK_NOTEBOOK(convo_notebook));
 			gtk_container_add(GTK_CONTAINER(win), convo_notebook);
 			gtk_signal_connect(GTK_OBJECT(convo_notebook), "switch-page",
 					   GTK_SIGNAL_FUNC(convo_switch), NULL);