# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1070550613 0
# Node ID 8165ab2a00e6de53c969fc30ab3ebe28f537839c
# Parent  3906c0957d4f9027cc9dbd9d0bf2a28820638e8e
[gaim-migrate @ 8393]
Un-changeable keybindings which I find personally irritating are uncool.
One down.  Thanks to hasse for motivating me to actually fix this, and
to deryni for telling me exactly where to look.

committer: Tailor Script <tailor@pidgin.im>

diff -r 3906c0957d4f -r 8165ab2a00e6 src/gtkconv.c
--- a/src/gtkconv.c	Thu Dec 04 12:20:30 2003 +0000
+++ b/src/gtkconv.c	Thu Dec 04 15:10:13 2003 +0000
@@ -703,6 +703,12 @@
 }
 
 static void
+menu_new_conv_cb(gpointer data, guint action, GtkWidget *widget)
+{
+	show_im_dialog();
+}
+
+static void
 menu_save_as_cb(gpointer data, guint action, GtkWidget *widget)
 {
 	GaimConvWindow *win = (GaimConvWindow *)data;
@@ -1480,11 +1486,6 @@
 			g_string_free(conv->history, TRUE);
 			conv->history = g_string_new("");
 		}
-		else if (event->keyval == 'n') {
-			g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");
-
-			show_im_dialog();
-		}
 		else if (event->keyval == 'z') {
 			g_signal_stop_emission_by_name(G_OBJECT(entry), "key_press_event");
 
@@ -2883,6 +2884,11 @@
 	/* Conversation menu */
 	{ N_("/_Conversation"), NULL, NULL, 0, "<Branch>" },
 
+	{ N_("/Conversation/_New Conversation..."), NULL, menu_new_conv_cb,
+	  0, "<StockItem>", GTK_STOCK_NEW },
+
+        { "/Conversation/sep0", NULL, NULL, 0, "<Separator>" },
+
 	{ N_("/Conversation/_Save As..."), NULL, menu_save_as_cb, 0,
 	  "<StockItem>", GTK_STOCK_SAVE_AS },
 	{ N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, NULL },