Merge branch 'configurable-iface'

Conflicts:
	libpeasui/Makefile.am

4 files changed, 32 insertions, 9 deletions

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 67bd55e..1c8d1af 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -73,15 +73,17 @@ expand_content_files=
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
 # signals and properties.
-GTKDOC_CFLAGS=	\
+GTKDOC_CFLAGS = \
 	-I$(top_srcdir)			\
 	-I$(top_builddir)		\
-	$(PEAS_CFLAGS)
+	$(PEAS_CFLAGS)			\
+	$(PEASUI_CFLAGS)
 
-GTKDOC_LIBS=	\
+GTKDOC_LIBS = \
 	$(top_builddir)/libpeas/libpeas-2.0.la		\
 	$(top_builddir)/libpeasui/libpeasui-2.0.la	\
-	$(PEAS_LIBS)
+	$(PEAS_LIBS)					\
+	$(PEASUI_LIBS)
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
diff --git a/docs/reference/libpeas-docs.sgml b/docs/reference/libpeas-docs.sgml
index f74aa03..17624e0 100644
--- a/docs/reference/libpeas-docs.sgml
+++ b/docs/reference/libpeas-docs.sgml
@@ -23,7 +23,9 @@
     </chapter>
     <chapter>
       <title>UI Components</title>
+      <xi:include href="xml/peas-ui-configurable.xml"/>
       <xi:include href="xml/peas-ui-plugin-manager.xml"/>
+      <xi:include href="xml/peas-ui-plugin-info.xml"/>
     </chapter>
   </part>
   <index id="api-index-full">
diff --git a/docs/reference/libpeas-sections.txt b/docs/reference/libpeas-sections.txt
index cc47273..5865392 100644
--- a/docs/reference/libpeas-sections.txt
+++ b/docs/reference/libpeas-sections.txt
@@ -11,7 +11,6 @@ peas_engine_set_active_plugins
 peas_engine_get_plugin_info
 peas_engine_activate_plugin
 peas_engine_deactivate_plugin
-peas_engine_configure_plugin
 peas_engine_update_plugins_ui
 peas_engine_add_object
 peas_engine_remove_object
@@ -35,8 +34,6 @@ peas_plugin_get_data_dir
 peas_plugin_activate
 peas_plugin_deactivate
 peas_plugin_update_ui
-peas_plugin_is_configurable
-peas_plugin_create_configure_dialog
 PEAS_REGISTER_TYPE_WITH_CODE
 PEAS_REGISTER_TYPE
 <SUBSECTION Standard>
@@ -55,13 +52,11 @@ PEAS_PLUGIN_GET_CLASS
 PeasPluginInfo
 peas_plugin_info_is_active
 peas_plugin_info_is_available
-peas_plugin_info_is_configurable
 peas_plugin_info_get_module_name
 peas_plugin_info_get_module_dir
 peas_plugin_info_get_data_dir
 peas_plugin_info_get_name
 peas_plugin_info_get_description
-peas_plugin_info_get_icon_name
 peas_plugin_info_get_authors
 peas_plugin_info_get_website
 peas_plugin_info_get_copyright
@@ -73,6 +68,29 @@ peas_plugin_info_get_type
 </SECTION>
 
 <SECTION>
+<FILE>peas-ui-configurable</FILE>
+<TITLE>PeasUIConfigurable</TITLE>
+PeasUIConfigurable
+PeasUIConfigurableIface
+peas_ui_configurable_is_configurable
+peas_ui_configurable_create_configure_dialog
+<SUBSECTION Standard>
+PEAS_UI_CONFIGURABLE
+PEAS_UI_IS_CONFIGURABLE
+PEAS_UI_TYPE_CONFIGURABLE
+peas_ui_configurable_get_type
+PEAS_UI_CONFIGURABLE_GET_IFACE
+</SECTION>
+
+<SECTION>
+<FILE>peas-ui-plugin-info</FILE>
+<TITLE>PeasPluginInfo Extension</TITLE>
+peas_ui_plugin_info_get_icon_name
+peas_ui_plugin_info_is_configurable
+peas_ui_plugin_info_create_configure_dialog
+</SECTION>
+
+<SECTION>
 <FILE>peas-ui-plugin-manager</FILE>
 <TITLE>PeasUIPluginManager</TITLE>
 PeasUIPluginManager
diff --git a/docs/reference/libpeas.types b/docs/reference/libpeas.types
index 7611716..fb2c412 100644
--- a/docs/reference/libpeas.types
+++ b/docs/reference/libpeas.types
@@ -1,4 +1,5 @@
 peas_plugin_get_type
 peas_engine_get_type
 peas_plugin_info_get_type
+peas_ui_configurable_get_type
 peas_ui_plugin_manager_get_type