to the search combobox

Patch by: Tsutomu Uchino <hanya.runo@gmail.com>

(cherry picked from commit 704bca13)

Change-Id: I5d454e164d2f33cebf5b5761ef3ce7ae1025c7c6

Return zero value from non-void function to prevent compiler warnings.

(cherry picked from commit 7986627c)

Change-Id: I5d065ac9fc4272c28ffd418ce2043e01d41a2e14