[gnome-contacts: 8/9] Merge commit '736f1c9e3c5c8c539958532b3ea81b19fe822067'

[Alexander Larsson <alexl src gnome org>]

commit bb9e41d6204ed5f0793ecea2d0dd70e9e30ea944
Merge: 661e6d4 736f1c9
Author: Alexander Larsson <alexl redhat com>
Date:   Wed May 16 14:56:29 2012 +0200

    Merge commit '736f1c9e3c5c8c539958532b3ea81b19fe822067'

 src/listbox/Makefile.am        |    8 +-
 src/listbox/egg-list-box.vala  |  237 +++++++++++++++++++++++++---------------
 src/listbox/test-list.vala     |   14 +++
 src/listbox/test-scrolled.vala |   97 ++++++++++++++++
 4 files changed, 269 insertions(+), 87 deletions(-)
---
diff --cc src/listbox/Makefile.am
index d98958a,0000000..f2770ef
mode 100644,000000..100644
--- a/src/listbox/Makefile.am
+++ b/src/listbox/Makefile.am
@@@ -1,25 -1,0 +1,31 @@@
 +NULL =
 +
 +AM_CPPFLAGS = \
 +	-include config.h \
 +	$(LISTBOX_CFLAGS) \
 +	$(NULL)
 +
 +AM_VALAFLAGS = \
 +	@LISTBOX_PACKAGES@ \
 +	$(NULL)
 +
- noinst_PROGRAMS = test-list
++noinst_PROGRAMS = test-list test-scrolled
 +
 +test_list_SOURCES = \
 +	egg-list-box.vala \
 +	test-list.vala \
 +	$(NULL)
 +test_list_LDADD = $(LISTBOX_LIBS)
 +
++test_scrolled_SOURCES = \
++	egg-list-box.vala \
++	test-scrolled.vala \
++	$(NULL)
++test_scrolled_LDADD = $(LISTBOX_LIBS)
++
 +CLEANFILES = \
 +	$(test_list_SOURCES:.vala=.c) \
 +	*.vapi *.stamp
 +
 +EXTRA_DIST = \
 +	$(NULL)
diff --cc src/listbox/test-scrolled.vala
index 0000000,669b91e..669b91e
mode 000000,100644..100644
--- a/src/listbox/test-scrolled.vala
+++ b/src/listbox/test-scrolled.vala