[gnome-contacts: 29/29] Update to C implementation of egg-list-box

[Alexander Larsson <alexl src gnome org>]

commit 343c5a9b4a2cf8b735c436ff094f07c78e538bf2
Merge: e08aad9 ce28bb7
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Aug 16 20:38:31 2012 +0200

    Update to C implementation of egg-list-box

 src/Makefile.am               |    5 +-
 src/listbox/.gitignore        |    6 +-
 src/listbox/Makefile.am       |   11 +-
 src/listbox/egg-list-box.c    | 1945 +++++++++++++++++++++++++++++++++++++++++
 src/listbox/egg-list-box.h    |   78 ++
 src/listbox/egg-list-box.vala | 1019 ---------------------
 src/listbox/egglistbox.vapi   |   55 ++
 7 files changed, 2086 insertions(+), 1033 deletions(-)
---
diff --cc src/Makefile.am
index 6ece706,0000000..d364dce
mode 100644,000000..100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,104 -1,0 +1,105 @@@
 +NULL =
 +
 +AM_CPPFLAGS = \
 +	-include config.h \
 +	$(CONTACTS_CFLAGS) \
++	-I$(srcdir)/listbox \
 +	-DLOCALEDIR=\""$(localedir)"\" \
 +	-DPKGDATADIR=\""$(pkgdatadir)"\" \
 +	-DPKGLIBDIR=\""$(pkglibdir)"\" \
 +	-DGNOME_DESKTOP_USE_UNSTABLE_API \
 +	$(NULL)
 +
 +AM_VALAFLAGS = \
- 	--vapidir=$(srcdir)/../vapi --pkg config --pkg custom \
++	--vapidir=$(srcdir)/../vapi --vapidir=$(srcdir)/listbox --pkg config --pkg custom --pkg egglistbox \
 +	@CONTACTS_PACKAGES@ \
 +	$(NULL)
 +
 +if USE_GSTREAMER
 +AM_VALAFLAGS += -D HAVE_GSTREAMER @CONTACTS_GSTREAMER_PACKAGES@
 +AM_CPPFLAGS += $(CONTACTS_GSTREAMER_CFLAGS)
 +endif
 +
 +bin_PROGRAMS = gnome-contacts
 +
 +vala_sources = \
- 	listbox/egg-list-box.vala \
 +	contacts-app.vala \
 +	contacts-contact.vala \
 +	contacts-contact-pane.vala \
 +	contacts-types.vala \
 +	contacts-list-pane.vala \
 +	contacts-link-dialog.vala \
 +	contacts-linking.vala \
 +	contacts-menu-button.vala \
 +	contacts-row.vala \
 +	contacts-store.vala \
 +	contacts-view.vala \
 +	contacts-utils.vala \
 +	contacts-clickable.vala \
 +	contacts-new-contact-dialog.vala \
 +	contacts-avatar-dialog.vala \
 +	contacts-contact-frame.vala \
 +	contacts-revealer.vala \
 +	contacts-setup-window.vala \
 +	contacts-window.vala \
 +	main.vala \
 +	memory-icon.vala \
 +	$(NULL)
 +
 +gsettingsschema_in_files = org.gnome.Contacts.gschema.xml.in
 +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 +.PRECIOUS: $(gsettings_SCHEMAS)
 +
 + INTLTOOL_XML_NOMERGE_RULE@
 +
 + GSETTINGS_RULES@
 +
 +contact-resources.c: contacts.gresource.xml app-menu.ui
 +	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $(srcdir)/contacts.gresource.xml \
 +		--target=$@ --sourcedir=$(srcdir) --c-name contacts --generate-source
 +
 +gnome_contacts_SOURCES = \
 +	um-crop-area.c \
 +	contact-resources.c \
 +	gtk-notification.c   \
++	listbox/egg-list-box.c \
 +	contacts-esd-setup.c \
 +	$(vala_sources) \
 +	$(NULL)
 +
 +gnome_contacts_LDADD = $(CONTACTS_LIBS) -lm
 +
 +if USE_GSTREAMER
 +gnome_contacts_LDADD += $(CONTACTS_GSTREAMER_LIBS)
 +gnome_contacts_SOURCES += \
 +	cheese-flash.c \
 +	$(NULL)
 +endif
 +
 +libexec_PROGRAMS = gnome-contacts-search-provider
 +
 +gnome_contacts_search_provider_SOURCES = \
 +	contacts-contact.vala \
 +	contacts-esd-setup.c \
 +	contacts-shell-search-provider.vala \
 +	contacts-store.vala \
 +	contacts-types.vala \
 +	contacts-utils.vala \
 +	$(NULL)
 +
 +gnome_contacts_search_provider_LDADD = $(CONTACTS_LIBS)
 +
 +CLEANFILES = \
 +	$(vala_sources:.vala=.c) \
 +	$(gsettings_SCHEMAS) \
 +	*.vapi *.stamp
 +
 +EXTRA_DIST = \
 +	cheese-flash.h \
 +	um-crop-area.h \
 +	gtk-notification.h   \
 +	contacts.gresource.xml \
 +	app-menu.ui \
 +	$(gsettingsschema_in_files)     \
 +	contacts-esd-setup.h \
 +	$(NULL)
diff --cc src/listbox/.gitignore
index b1d8b60,0000000..94610c8
mode 100644,000000..100644
--- a/src/listbox/.gitignore
+++ b/src/listbox/.gitignore
@@@ -1,49 -1,0 +1,49 @@@
 +*.bak
 +*.lo
 +*.o
 +*.orig
 +*.rej
 +*.tab.c
 +*~
 +.deps
 +.libs
 +Makefile
 +Makefile.in
 +/aclocal.m4
 +/autom4te.cache
 +/autoscan.log
 +/compile
 +/config.cache
 +/config.guess
 +/config.h
 +/config.h.in
 +/config.log
 +/config.lt
 +/config.status
 +/config.status.lineno
 +/config.sub
 +/configure
 +/configure.lineno
 +/configure.scan
 +/ltmain.sh
 +/depcomp
 +/install-sh
 +/intltool-extract
 +/intltool-extract.in
 +/intltool-merge
 +/intltool-merge.in
 +/intltool-update
 +/intltool-update.in
 +/libtool
 +/missing
 +/m4
 +/stamp-h1
 +*.stamp
- *.c
++*.la
 +test-list
++test-list.c
 +test-scrolled
++test-scrolled.c
 +/egg-list-box-uninstalled.pc
- /egg-list-box.h
- /egglistbox.vapi
 +/omf.make
 +/xmldocs.make
diff --cc src/listbox/Makefile.am
index fc60072,0000000..420c8b9
mode 100644,000000..100644
--- a/src/listbox/Makefile.am
+++ b/src/listbox/Makefile.am
@@@ -1,61 -1,0 +1,54 @@@
 +NULL =
 +
 +AM_CPPFLAGS = \
 +	-include config.h \
 +	$(LISTBOX_CFLAGS) \
 +	$(NULL)
 +
 +AM_VALAFLAGS = \
 +	@LISTBOX_PACKAGES@ \
 +	--vapidir=. \
 +	$(NULL)
 +
 +noinst_LTLIBRARIES = libegglistbox.la
 +
- libegglistbox_la_VALAFLAGS = \
- 	$(AM_VALAFLAGS) \
- 	--library=egglistbox \
- 	--vapi egglistbox.vapi \
- 	-H egg-list-box.h \
- 	$(NULL)
- libegglistbox_la_SOURCES = egg-list-box.vala
++libegglistbox_la_SOURCES = egg-list-box.c egg-list-box.h
 +libegglistbox_la_LIBADD = $(LISTBOX_LIBS)
 +
 +noinst_PROGRAMS = test-list test-scrolled
 +
 +test_list_SOURCES = \
 +	test-list.vala \
 +	$(NULL)
 +
 +test_list_LDADD = \
 +	$(LISTBOX_LIBS) \
 +	libegglistbox.la \
 +	$(NULL)
 +
 +test_list_VALAFLAGS = \
 +	$(AM_VALAFLAGS) \
 +	--pkg egglistbox \
 +	$(NULL)
 +
 +test_scrolled_SOURCES = \
 +	test-scrolled.vala \
 +	$(NULL)
 +
 +test_scrolled_LDADD = \
 +	$(LISTBOX_LIBS) \
 +	libegglistbox.la \
 +	$(NULL)
 +
 +test_scrolled_VALAFLAGS = \
 +	$(AM_VALAFLAGS) \
 +	--pkg egglistbox \
 +	$(NULL)
 +
 +CLEANFILES = \
 +	$(test_list_SOURCES:.vala=.c) \
 +	$(test_scrolled_SOURCES:.vala=.c) \
- 	$(libegglistbox_la_SOURCES:.vala=.c) \
- 	*.vapi *.stamp
++	*.stamp
 +
 +EXTRA_DIST = \
 +	$(NULL)
diff --cc src/listbox/egg-list-box.c
index 0000000,5108597..5108597
mode 000000,100644..100644
--- a/src/listbox/egg-list-box.c
+++ b/src/listbox/egg-list-box.c
diff --cc src/listbox/egg-list-box.h
index 0000000,c816a14..c816a14
mode 000000,100644..100644
--- a/src/listbox/egg-list-box.h
+++ b/src/listbox/egg-list-box.h
diff --cc src/listbox/egglistbox.vapi
index 0000000,8fe65cb..8fe65cb
mode 000000,100644..100644
--- a/src/listbox/egglistbox.vapi
+++ b/src/listbox/egglistbox.vapi