diff options
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | endless/eospagemanager.c | 16 |
3 files changed, 28 insertions, 11 deletions
diff --git a/Makefile.am b/Makefile.am index 1fcb096..fc08ee0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,18 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-gir-doc CLEANFILES = DISTCLEANFILES = +# Make sure that 'make dist' includes documentation +if CAN_MAKE_DIST +dist-hook: +else +dist-hook: + @echo "***" + @echo "*** You must configure with --enable-gtk-doc and --enable-gir-doc" + @echo "*** to run make dist or make distcheck." + @echo "***" + @false +endif + # # # LIBRARY # # # # Main Open Endless SDK library diff --git a/configure.ac b/configure.ac index 2841fa8..49c3a40 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,7 @@ GTK_REQUIREMENT="gtk+-3.0 >= 3.4" # These go into the pkg-config file as Requires: and Requires.private: # (Generally, use Requires.private: instead of Requires:) EOS_REQUIRED_MODULES= -EOS_REQUIRED_MODULES_PRIVATE="$GLIB_REQUIREMENT $GOBJECT_REQUIREMENT $GIO_REQUIREMENT $GTK_REQUIREMENT" +EOS_REQUIRED_MODULES_PRIVATE="$GLIB_REQUIREMENT $GOBJECT_REQUIREMENT $GIO_REQUIREMENT $GTK_REQUIREMENT pstack" AC_SUBST(EOS_REQUIRED_MODULES) AC_SUBST(EOS_REQUIRED_MODULES_PRIVATE) @@ -172,6 +172,15 @@ AS_IF([test "x$enable_gir_doc" = "xyes"], [ [AC_MSG_ERROR([yelp-build must be installed for --enable-gir-doc])])]) AM_CONDITIONAL([ENABLE_GIR_DOC], [test "x$enable_gir_doc" = "xyes"]) +# For 'make dist' or 'make distcheck', both --enable-gtk-doc and +# --enable-gir-doc are required +AC_MSG_CHECKING([whether this configuration allows building distributions]) +can_make_dist=yes +AM_COND_IF([ENABLE_GTK_DOC], [], [can_make_dist=no]) +AM_COND_IF([ENABLE_GIR_DOC], [], [can_make_dist=no]) +AM_CONDITIONAL([CAN_MAKE_DIST], [test "x$can_make_dist" = "xyes"]) +AC_MSG_RESULT([$can_make_dist]) + # Required libraries # ------------------ PKG_CHECK_MODULES([EOS_SDK], [ diff --git a/endless/eospagemanager.c b/endless/eospagemanager.c index d719fc7..3919b5b 100644 --- a/endless/eospagemanager.c +++ b/endless/eospagemanager.c @@ -4,6 +4,7 @@ #include "eospagemanager.h" #include <gtk/gtk.h> +#include <pstack.h> #include <string.h> @@ -215,11 +216,8 @@ set_visible_page_from_info (EosPageManager *self, EosPageManagerPageInfo *info) { /* FIXME when porting to GtkStack */ - GtkNotebook *stack_notebook = GTK_NOTEBOOK (self->priv->stack); - int page_pos = gtk_notebook_page_num (stack_notebook, info->page); - /* Invariant: if info is not NULL, then page must be in stack */ - g_assert (page_pos != -1); - gtk_notebook_set_current_page (stack_notebook, page_pos); + PStack *stack = P_STACK (self->priv->stack); + p_stack_set_visible_child (stack, info->page); self->priv->visible_page_info = info; @@ -670,11 +668,9 @@ eos_page_manager_init (EosPageManager *self) gtk_widget_set_has_window (self_widget, FALSE); /* TODO replace with GtkStack */ - self->priv->stack = gtk_notebook_new (); - g_object_set (self->priv->stack, - "show-tabs", FALSE, - "show-border", FALSE, - NULL); + self->priv->stack = p_stack_new (); + p_stack_set_transition_type (P_STACK (self->priv->stack), + P_STACK_TRANSITION_TYPE_CROSSFADE); gtk_widget_set_parent (self->priv->stack, self_widget); } |