GNOME.org
 

[gnome-contacts: 35/35] Pulled latest egglistbox

commit f1a47f6eb5d5ae179d4608d4a614ccc4fcd66150
Merge: 325fd8f 30689cc
Author: Alexander Larsson <alexl redhat com>
Date:   Thu Feb 14 21:25:29 2013 +0100

    Pulled latest egglistbox
    
    Merge commit '30689cced983b1ae4704c4fde65a8493823b0502'

 src/Makefile.am                            |    1 +
 src/listbox/INSTALL                        |    8 +-
 src/listbox/Makefile.am                    |   76 +-
 src/listbox/configure.ac                   |    7 +-
 src/listbox/egg-flow-box-uninstalled.pc.in |   12 +
 src/listbox/egg-flow-box.c                 | 3322 ++++++++++++++++++++++++++++
 src/listbox/egg-flow-box.h                 |  119 +
 src/listbox/egg-list-box-accessible.c      |  191 ++
 src/listbox/egg-list-box-accessible.h      |   55 +
 src/listbox/egg-list-box.c                 |  223 ++-
 src/listbox/egg-list-box.h                 |    1 +
 src/listbox/eggflowbox.vapi                |   48 +
 src/listbox/test-flow-box.c                |  559 +++++
 src/listbox/test-focus.c                   |  181 ++
 src/listbox/test-scrolled.vala             |    2 +-
 src/listbox/test-sel.c                     |   22 +
 16 files changed, 4780 insertions(+), 47 deletions(-)
---
diff --cc src/Makefile.am
index 4ee369d,0000000..6b99b6c
mode 100644,000000..100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1,108 -1,0 +1,109 @@@
 +NULL =
 +
 +AM_CPPFLAGS = \
 +      -include config.h \
 +      $(CONTACTS_CFLAGS) \
 +      -I$(srcdir)/listbox \
 +      -I$(top_srcdir)/libgd \
 +      -DLOCALEDIR=\""$(localedir)"\" \
 +      -DPKGDATADIR=\""$(pkgdatadir)"\" \
 +      -DPKGLIBDIR=\""$(pkglibdir)"\" \
 +      -DGNOME_DESKTOP_USE_UNSTABLE_API \
 +      $(NULL)
 +
 +AM_VALAFLAGS = \
 +      --vapidir=../vapi --vapidir=listbox --vapidir=../libgd --pkg config --pkg custom --pkg egglistbox 
--pkg gd-1.0 \
 +      @CONTACTS_PACKAGES@ \
 +      $(NULL)
 +
 +if BUILD_CHEESE
 +AM_VALAFLAGS += -D HAVE_CHEESE
 +AM_CPPFLAGS += $(CHEESE_CFLAGS)
 +endif
 +
 +bin_PROGRAMS = gnome-contacts
 +
 +vala_sources = \
 +      contacts-app.vala \
 +      contacts-contact.vala \
 +      contacts-contact-sheet.vala \
 +      contacts-contact-editor.vala \
 +      contacts-contact-pane.vala \
 +      contacts-types.vala \
 +      contacts-list-pane.vala \
 +      contacts-linked-accounts-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 \
 +      listbox/egg-list-box.c \
++      listbox/egg-list-box-accessible.c \
 +      contacts-esd-setup.c \
 +      $(vala_sources) \
 +      $(NULL)
 +
 +gnome_contacts_LDADD = $(CONTACTS_LIBS) -lm $(top_builddir)/libgd/libgd.la
 +
 +if BUILD_CHEESE
 +gnome_contacts_LDADD += $(CHEESE_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 = \
 +      listbox/egg-list-box.h \
 +      listbox/egglistbox.vapi \
 +      cheese-flash.h \
 +      um-crop-area.h \
 +      contacts.gresource.xml \
 +      app-menu.ui \
 +      $(gsettingsschema_in_files)     \
 +      contacts-esd-setup.h \
 +      $(NULL)
diff --cc src/listbox/Makefile.am
index 420c8b9,0000000..c680cf7
mode 100644,000000..100644
--- a/src/listbox/Makefile.am
+++ b/src/listbox/Makefile.am
@@@ -1,54 -1,0 +1,124 @@@
 +NULL =
 +
 +AM_CPPFLAGS = \
 +      -include config.h \
 +      $(LISTBOX_CFLAGS) \
 +      $(NULL)
 +
 +AM_VALAFLAGS = \
 +      @LISTBOX_PACKAGES@ \
 +      --vapidir=. \
 +      $(NULL)
 +
- noinst_LTLIBRARIES = libegglistbox.la
++noinst_LTLIBRARIES = \
++      libegglistbox.la \
++      libeggflowbox.la \
++      $(NULL)
++
++libegglistbox_la_SOURCES = \
++      egg-list-box.c egg-list-box.h \
++      egg-list-box-accessible.c egg-list-box-accessible.h
 +
- libegglistbox_la_SOURCES = egg-list-box.c egg-list-box.h
 +libegglistbox_la_LIBADD = $(LISTBOX_LIBS)
 +
- noinst_PROGRAMS = test-list test-scrolled
++libeggflowbox_la_SOURCES = \
++      egg-flow-box.c egg-flow-box.h
++
++libeggflowbox_la_LIBADD = $(LISTBOX_LIBS)
++
++noinst_PROGRAMS = test-list test-scrolled test-focus test-sel test-flow-box
++
++test_sel_SOURCES = \
++      test-sel.c \
++      $(NULL)
++
++test_sel_LDADD = \
++      $(LISTBOX_LIBS) \
++      libegglistbox.la \
++      $(NULL)
 +
 +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)
 +
++test_focus_SOURCES = \
++      test-focus.c \
++      $(NULL)
++
++test_focus_LDADD = \
++      $(LISTBOX_LIBS) \
++      libegglistbox.la \
++      $(NULL)
++
++test_flow_box_SOURCES = \
++      test-flow-box.c \
++      $(NULL)
++
++test_flow_box_LDADD = \
++      $(LISTBOX_LIBS) \
++      libeggflowbox.la \
++      $(NULL)
++
 +CLEANFILES = \
 +      $(test_list_SOURCES:.vala=.c) \
 +      $(test_scrolled_SOURCES:.vala=.c) \
 +      *.stamp
 +
 +EXTRA_DIST = \
 +      $(NULL)
++
++include $(INTROSPECTION_MAKEFILE)
++INTROSPECTION_GIRS =
++INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --warn-all
++INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
++
++if HAVE_INTROSPECTION
++
++Egg-1.0.gir: libegglistbox.la Makefile
++Egg_1_0_gir_NAMESPACE = Egg
++Egg_1_0_gir_VERSION = 1.0
++Egg_1_0_gir_LIBS = libegglistbox.la libeggflowbox.la
++Egg_1_0_gir_CFLAGS = $(LISTBOX_CFLAGS)
++Egg_1_0_gir_SCANNERFLAGS =                    \
++       --warn-all                             \
++       --symbol-prefix=egg                    \
++       --identifier-prefix=Egg                        \
++       $(NULL)
++Egg_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
++Egg_1_0_gir_FILES = $(libegglistbox_la_SOURCES) $(libeggflowbox_la_SOURCES)
++INTROSPECTION_GIRS += Egg-1.0.gir
++
++girdir= $(pkgdatadir)/gir-1.0
++typelibdir= $(pkglibdir)/girepository-1.0
++
++gir_DATA = $(INTROSPECTION_GIRS)
++typelib_DATA = $(gir_DATA:.gir=.typelib)
++
++CLEANFILES += $(gir_DATA) $(typelib_DATA)
++MAINTAINERCLEANFILES = $(srcdir)/Egg-1.0.gir
++
++endif
diff --cc src/listbox/configure.ac
index 3eae7dc,0000000..c031a4f
mode 100644,000000..100644
--- a/src/listbox/configure.ac
+++ b/src/listbox/configure.ac
@@@ -1,25 -1,0 +1,28 @@@
 +AC_PREREQ([2.67])
 +AC_INIT([egg-list-box],[3.5.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-contacts])
 +AC_CONFIG_SRCDIR([test-list.vala])
 +AC_CONFIG_HEADERS([config.h])
 +AC_CONFIG_MACRO_DIR([m4])
 +AM_INIT_AUTOMAKE
 +# Enable silent rules is available
 +AM_SILENT_RULES([yes])
 +AM_MAINTAINER_MODE([enable])
 +AC_CONFIG_FILES([Makefile
 +              ])
 +
++AM_PROG_AR
 +LT_INIT
 +AC_PROG_CC
 +AM_PROG_VALAC([0.16.0])
 +AC_PROG_INSTALL
 +
- pkg_modules="gtk+-3.0 >= 3.4.0
++GOBJECT_INTROSPECTION_REQUIRE([0.9.7])
++
++pkg_modules="gtk+-3.0 >= 3.7.6
 +           glib-2.0 >= 2.31.10"
 +PKG_CHECK_MODULES(LISTBOX, [$pkg_modules])
 +
 +LISTBOX_PACKAGES="--pkg gtk+-3.0"
 +AC_SUBST(LISTBOX_PACKAGES)
 +
- AC_OUTPUT( egg-list-box-uninstalled.pc )
++AC_OUTPUT([egg-list-box-uninstalled.pc egg-flow-box-uninstalled.pc])
diff --cc src/listbox/egg-flow-box-uninstalled.pc.in
index 0000000,1ce36ce..1ce36ce
mode 000000,100644..100644
--- a/src/listbox/egg-flow-box-uninstalled.pc.in
+++ b/src/listbox/egg-flow-box-uninstalled.pc.in
diff --cc src/listbox/egg-flow-box.c
index 0000000,f8a9699..f8a9699
mode 000000,100644..100644
--- a/src/listbox/egg-flow-box.c
+++ b/src/listbox/egg-flow-box.c
diff --cc src/listbox/egg-flow-box.h
index 0000000,9748522..9748522
mode 000000,100644..100644
--- a/src/listbox/egg-flow-box.h
+++ b/src/listbox/egg-flow-box.h
diff --cc src/listbox/egg-list-box-accessible.c
index 0000000,84485e9..84485e9
mode 000000,100644..100644
--- a/src/listbox/egg-list-box-accessible.c
+++ b/src/listbox/egg-list-box-accessible.c
diff --cc src/listbox/egg-list-box-accessible.h
index 0000000,db5b00c..db5b00c
mode 000000,100644..100644
--- a/src/listbox/egg-list-box-accessible.h
+++ b/src/listbox/egg-list-box-accessible.h
diff --cc src/listbox/eggflowbox.vapi
index 0000000,c2d68b8..c2d68b8
mode 000000,100644..100644
--- a/src/listbox/eggflowbox.vapi
+++ b/src/listbox/eggflowbox.vapi
diff --cc src/listbox/test-flow-box.c
index 0000000,ef06eaa..ef06eaa
mode 000000,100644..100644
--- a/src/listbox/test-flow-box.c
+++ b/src/listbox/test-flow-box.c
diff --cc src/listbox/test-focus.c
index 0000000,a1c0c3d..a1c0c3d
mode 000000,100644..100644
--- a/src/listbox/test-focus.c
+++ b/src/listbox/test-focus.c
diff --cc src/listbox/test-sel.c
index 0000000,ee2577b..ee2577b
mode 000000,100644..100644
--- a/src/listbox/test-sel.c
+++ b/src/listbox/test-sel.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]