Mercurial > pidgin3 / changeset

--- a/COPYRIGHT	Sun Apr 24 20:49:55 2005 +0000
+++ b/COPYRIGHT	Sun Apr 24 21:26:33 2005 +0000
@@ -189,6 +189,7 @@
 Philip Tellis
 Arun A. Tharuvai
 Cestonaro Thilo
+Will Thompson
 Douglas Thrift (douglaswth)
 Stu Tomlinson
 Bill Tompkins

--- a/src/gtkconv.c	Sun Apr 24 20:49:55 2005 +0000
+++ b/src/gtkconv.c	Sun Apr 24 21:26:33 2005 +0000
@@ -1733,20 +1733,18 @@
 		} /* End of switch */
 	}
 
-#if 0
 	/* If ALT (or whatever) was held down... */
 	else if (event->state & GDK_MOD1_MASK)
 	{
-		/* XXX - Make sure the conv exists before switching to it */
-		if (event->keyval > '0' && event->keyval <= '9') {
+		if (event->keyval > '0' && event->keyval <= '9')
+		{
 			int switchto = event->keyval - '1';
-			if (switchto < numconvs)
-				gaim_conv_window_switch_conversation(win, switchto);
+			if (switchto < gaim_conv_window_get_conversation_count(win))
+				gtk_notebook_set_current_page(GTK_NOTEBOOK(gtkwin->notebook), switchto);
 
 			return TRUE;
 		}
 	}
-#endif
 
 	/* If neither CTRL nor ALT were held down... */
 	else