[tepl] amtk: port tepl_application_get_app_action_info_store()



commit fbf8ec083a7646d26125d200d4bd9f4dd012343b
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Thu Jul 13 16:58:31 2017 +0200

    amtk: port tepl_application_get_app_action_info_store()

 tepl/Makefile.am        |    8 +++++++-
 tepl/tepl-application.c |   14 +++++++-------
 tepl/tepl-application.h |    3 ++-
 3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/tepl/Makefile.am b/tepl/Makefile.am
index c47c4b8..ff7a1f5 100644
--- a/tepl/Makefile.am
+++ b/tepl/Makefile.am
@@ -158,11 +158,17 @@ INTROSPECTION_GIRS = Tepl-@TEPL_API_VERSION@.gir
 INTROSPECTION_SCANNER_ENV = CC="$(CC)"
 
 Tepl-@TEPL_API_VERSION@.gir: libtepl-@TEPL_API_VERSION@.la
+
 INTROSPECTION_SCANNER_ARGS =           \
        -I$(top_srcdir)                 \
        -I$(top_builddir)               \
        --c-include=tepl/tepl.h         \
-       --warn-all
+       --warn-all                      \
+       --include-uninstalled=$(top_builddir)/amtk/Amtk-@TEPL_API_VERSION@.gir
+
+INTROSPECTION_COMPILER_ARGS =                  \
+       --includedir=$(top_builddir)/amtk/
+
 Tepl_@TEPL_API_VERSION@_gir_NAMESPACE = Tepl
 Tepl_@TEPL_API_VERSION@_gir_VERSION = @TEPL_API_VERSION@
 Tepl_@TEPL_API_VERSION@_gir_CFLAGS = $(DEP_CFLAGS)
diff --git a/tepl/tepl-application.c b/tepl/tepl-application.c
index 902f05c..744859f 100644
--- a/tepl/tepl-application.c
+++ b/tepl/tepl-application.c
@@ -40,7 +40,7 @@
 struct _TeplApplicationPrivate
 {
        GtkApplication *gtk_app;
-       TeplActionInfoStore *app_action_info_store;
+       AmtkActionInfoStore *app_action_info_store;
        TeplActionInfoStore *tepl_action_info_store;
 };
 
@@ -63,7 +63,7 @@ init_app_action_info_store (TeplApplication *tepl_app)
        g_return_if_fail (tepl_app->priv->app_action_info_store == NULL);
        g_assert (tepl_app->priv->gtk_app != NULL);
 
-       tepl_app->priv->app_action_info_store = tepl_action_info_store_new (tepl_app->priv->gtk_app);
+       tepl_app->priv->app_action_info_store = amtk_action_info_store_new (tepl_app->priv->gtk_app);
 }
 
 static void
@@ -265,16 +265,16 @@ tepl_application_get_application (TeplApplication *tepl_app)
  * tepl_application_get_app_action_info_store:
  * @tepl_app: a #TeplApplication.
  *
- * Returns an initially empty #TeplActionInfoStore reserved for the
- * application-specific actions. Libraries should not add #TeplActionInfo's to
+ * Returns an initially empty #AmtkActionInfoStore reserved for the
+ * application-specific actions. Libraries should not add #AmtkActionInfo's to
  * this store. Libraries should provide their own store if they want to share
- * #TeplActionInfo's.
+ * #AmtkActionInfo's.
  *
- * Returns: (transfer none): the #TeplActionInfoStore reserved for the
+ * Returns: (transfer none): the #AmtkActionInfoStore reserved for the
  * application.
  * Since: 2.0
  */
-TeplActionInfoStore *
+AmtkActionInfoStore *
 tepl_application_get_app_action_info_store (TeplApplication *tepl_app)
 {
        g_return_val_if_fail (TEPL_IS_APPLICATION (tepl_app), NULL);
diff --git a/tepl/tepl-application.h b/tepl/tepl-application.h
index c5621f5..9b24753 100644
--- a/tepl/tepl-application.h
+++ b/tepl/tepl-application.h
@@ -25,6 +25,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <amtk/amtk.h>
 #include <tepl/tepl-types.h>
 
 G_BEGIN_DECLS
@@ -61,7 +62,7 @@ TeplApplication *     tepl_application_get_default                    (void);
 
 GtkApplication *       tepl_application_get_application                (TeplApplication *tepl_app);
 
-TeplActionInfoStore *  tepl_application_get_app_action_info_store      (TeplApplication *tepl_app);
+AmtkActionInfoStore *  tepl_application_get_app_action_info_store      (TeplApplication *tepl_app);
 
 TeplActionInfoStore *  tepl_application_get_tepl_action_info_store     (TeplApplication *tepl_app);
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]