changeset 22868:10fb6ced9bc8

merge of '245104c3da64bf99627578bd68d6cda42ee16b43' and '68e91ac241a8cba7102b6f868b76189a265c6d5b'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Thu, 08 May 2008 03:22:03 +0000
parents 502bac8b2b4c (current diff) f28047b68678 (diff)
children 1334c0de8f32
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkconv.c	Thu May 08 00:22:08 2008 +0000
+++ b/pidgin/gtkconv.c	Thu May 08 03:22:03 2008 +0000
@@ -1901,6 +1901,7 @@
 				break;
 
 			case GDK_Tab:
+			case GDK_KP_Tab:
 			case GDK_ISO_Left_Tab:
 				if (event->state & GDK_SHIFT_MASK) {
 					move_to_next_unread_tab(gtkconv, FALSE);
@@ -2082,6 +2083,8 @@
 	else {
 		switch (event->keyval) {
 		case GDK_Tab:
+		case GDK_KP_Tab:
+		case GDK_ISO_Left_Tab:
 			if (gtkconv->entry != entry)
 				break;
 			return tab_complete(conv);
@@ -2152,6 +2155,7 @@
 		(event->keyval == GDK_Home) ||
 		(event->keyval == GDK_End) ||
 		(event->keyval == GDK_Tab) ||
+		(event->keyval == GDK_KP_Tab) ||
 		(event->keyval == GDK_ISO_Left_Tab))
 	{
 		if (event->type == GDK_KEY_PRESS)
--- a/pidgin/gtkstatusbox.c	Thu May 08 00:22:08 2008 +0000
+++ b/pidgin/gtkstatusbox.c	Thu May 08 03:22:03 2008 +0000
@@ -1131,7 +1131,7 @@
 
 static gboolean imhtml_remove_focus(GtkWidget *w, GdkEventKey *event, PidginStatusBox *status_box)
 {
-	if (event->keyval == GDK_Tab || event->keyval == GDK_KP_Tab)
+	if (event->keyval == GDK_Tab || event->keyval == GDK_KP_Tab || event->keyval == GDK_ISO_Left_Tab)
 	{
 		/* If last inserted character is a tab, then remove the focus from here */
 		GtkWidget *top = gtk_widget_get_toplevel(w);
@@ -1458,7 +1458,7 @@
 			}
 			return TRUE;
 		default:
-			return TRUE;
+			return FALSE;
 	}
 }