GNOME.org
 

[gitg: 36/36] Update egg-list-box

commit e88bf10205d03d9dd0387b3bcfb486836865b8ba
Merge: 6645b72 491db4b
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Feb 19 22:54:24 2013 +0100

    Update egg-list-box

 libgitg-gtk/egg-list-box/INSTALL                   |    8 +-
 libgitg-gtk/egg-list-box/Makefile.am               |   72 +-
 libgitg-gtk/egg-list-box/configure.ac              |    7 +-
 .../egg-list-box/egg-flow-box-uninstalled.pc.in    |   12 +
 libgitg-gtk/egg-list-box/egg-flow-box.c            | 3322 ++++++++++++++++++++
 libgitg-gtk/egg-list-box/egg-flow-box.h            |  119 +
 libgitg-gtk/egg-list-box/egg-list-box-accessible.c |  191 ++
 libgitg-gtk/egg-list-box/egg-list-box-accessible.h |   55 +
 libgitg-gtk/egg-list-box/egg-list-box.c            |  223 ++-
 libgitg-gtk/egg-list-box/egg-list-box.h            |    1 +
 libgitg-gtk/egg-list-box/eggflowbox.vapi           |   48 +
 libgitg-gtk/egg-list-box/test-flow-box.c           |  559 ++++
 libgitg-gtk/egg-list-box/test-focus.c              |  181 ++
 libgitg-gtk/egg-list-box/test-scrolled.vala        |    2 +-
 libgitg-gtk/egg-list-box/test-sel.c                |   22 +
 15 files changed, 4775 insertions(+), 47 deletions(-)
---
diff --cc libgitg-gtk/egg-list-box/Makefile.am
index 420c8b9,0000000..503f29d
mode 100644,000000..100644
--- a/libgitg-gtk/egg-list-box/Makefile.am
+++ b/libgitg-gtk/egg-list-box/Makefile.am
@@@ -1,54 -1,0 +1,120 @@@
 +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
++
++noinst_DATA = $(INTROSPECTION_GIRS)
++
++CLEANFILES += $(gir_DATA) $(typelib_DATA)
++MAINTAINERCLEANFILES = $(srcdir)/Egg-1.0.gir
++
++endif
diff --cc libgitg-gtk/egg-list-box/configure.ac
index 3eae7dc,0000000..c031a4f
mode 100644,000000..100644
--- a/libgitg-gtk/egg-list-box/configure.ac
+++ b/libgitg-gtk/egg-list-box/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 libgitg-gtk/egg-list-box/egg-flow-box-uninstalled.pc.in
index 0000000,1ce36ce..1ce36ce
mode 000000,100644..100644
--- a/libgitg-gtk/egg-list-box/egg-flow-box-uninstalled.pc.in
+++ b/libgitg-gtk/egg-list-box/egg-flow-box-uninstalled.pc.in
diff --cc libgitg-gtk/egg-list-box/egg-flow-box.c
index 0000000,f8a9699..f8a9699
mode 000000,100644..100644
--- a/libgitg-gtk/egg-list-box/egg-flow-box.c
+++ b/libgitg-gtk/egg-list-box/egg-flow-box.c
diff --cc libgitg-gtk/egg-list-box/egg-flow-box.h
index 0000000,9748522..9748522
mode 000000,100644..100644
--- a/libgitg-gtk/egg-list-box/egg-flow-box.h
+++ b/libgitg-gtk/egg-list-box/egg-flow-box.h
diff --cc libgitg-gtk/egg-list-box/egg-list-box-accessible.c
index 0000000,84485e9..84485e9
mode 000000,100644..100644
--- a/libgitg-gtk/egg-list-box/egg-list-box-accessible.c
+++ b/libgitg-gtk/egg-list-box/egg-list-box-accessible.c
diff --cc libgitg-gtk/egg-list-box/egg-list-box-accessible.h
index 0000000,db5b00c..db5b00c
mode 000000,100644..100644
--- a/libgitg-gtk/egg-list-box/egg-list-box-accessible.h
+++ b/libgitg-gtk/egg-list-box/egg-list-box-accessible.h
diff --cc libgitg-gtk/egg-list-box/eggflowbox.vapi
index 0000000,c2d68b8..c2d68b8
mode 000000,100644..100644
--- a/libgitg-gtk/egg-list-box/eggflowbox.vapi
+++ b/libgitg-gtk/egg-list-box/eggflowbox.vapi
diff --cc libgitg-gtk/egg-list-box/test-flow-box.c
index 0000000,ef06eaa..ef06eaa
mode 000000,100644..100644
--- a/libgitg-gtk/egg-list-box/test-flow-box.c
+++ b/libgitg-gtk/egg-list-box/test-flow-box.c
diff --cc libgitg-gtk/egg-list-box/test-focus.c
index 0000000,a1c0c3d..a1c0c3d
mode 000000,100644..100644
--- a/libgitg-gtk/egg-list-box/test-focus.c
+++ b/libgitg-gtk/egg-list-box/test-focus.c
diff --cc libgitg-gtk/egg-list-box/test-sel.c
index 0000000,ee2577b..ee2577b
mode 000000,100644..100644
--- a/libgitg-gtk/egg-list-box/test-sel.c
+++ b/libgitg-gtk/egg-list-box/test-sel.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]