# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1182279552 0
# Node ID 9287055b97d2bb10f172a385bd7062a00f3942e7
# Parent  5b4013f102854e658e13086ab11f2916fbd34ea8# Parent  a4dee68e040fb7e5bfee779cf17629c62c068842
merge of '4de940f299051a02913e8184619cf3a50ad68dff'
     and '5433e8d729b5ebf4946b383fbe85192080f661d0'

diff -r 5b4013f10285 -r 9287055b97d2 pidgin/gtkstatusbox.c
--- a/pidgin/gtkstatusbox.c	Tue Jun 19 18:57:11 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Tue Jun 19 18:59:12 2007 +0000
@@ -1624,15 +1624,17 @@
 			GtkTreePath *path;
 
 			if (gtk_tree_selection_get_selected(sel, NULL, &iter)) {
+				gboolean ret = TRUE;
 				path = gtk_tree_model_get_path(GTK_TREE_MODEL(box->dropdown_store), &iter);
 				if (event->keyval == GDK_Return) {
 					treeview_activate_current_selection(box, path);
 				} else if (event->keyval == GDK_Delete) {
 					tree_view_delete_current_selection(box, path);
-				}
+				} else
+					ret = FALSE;
 
 				gtk_tree_path_free (path);
-				return TRUE;
+				return ret;
 			}
 		} 
 	}