[Xfce4-commits] [xfce/garcon] 01/03: "Docs: generate and add the new functions"

noreply at xfce.org noreply at xfce.org
Tue Jun 27 13:30:32 CEST 2017


This is an automated email from the git hooks/post-receive script.

s   k   u   n   n   y   k       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/garcon.

commit 6aaaf0e82e88c7d983177b16895f50c4824b01d7
Author: Romain B <skunnyk at alteroot.org>
Date:   Tue Jun 27 10:45:26 2017 +0200

    "Docs: generate and add the new functions"
    
    This reverts commit 0da014b63bbf8c0ce071aeda432d712e506c180d.
---
 .gitignore                         |  1 +
 docs/reference/Makefile.am         | 15 +++++++++++----
 docs/reference/garcon-docs.xml     | 10 ++++++++++
 docs/reference/garcon-sections.txt | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 69ec315..3174452 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,6 +40,7 @@ garcon.signals
 docs/reference/html/*
 docs/reference/tmpl/*
 docs/reference/xml/*
+po/.intltool-merge-cache
 aclocal.m4
 autom4te.cache
 compile
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f218185..0b4df85 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -31,7 +31,9 @@ SCAN_OPTIONS=--rebuild-sections
 SCANGOBJ_OPTIONS=
 
 # Directory containing the source code
-DOC_SOURCE_DIR=../../garcon
+DOC_SOURCE_DIR= \
+	../../garcon \
+	../../garcon-gtk
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml
@@ -40,8 +42,12 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml
 FIXXREF_OPTIONS=
 
 # Used for dependencies
-HFILE_GLOB=$(top_srcdir)/garcon/*.h
-CFILE_GLOB=$(top_srcdir)/garcon/*.c
+HFILE_GLOB= \
+	$(top_srcdir)/garcon/*.h \
+	$(top_srcdir)/garcon-gtk/*.h
+CFILE_GLOB= \
+	$(top_srcdir)/garcon/*.c \
+	$(top_srcdir)/garcon-gtk/*.c
 
 # Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=
@@ -72,7 +78,8 @@ GTKDOC_LIBS =								\
 	$(GTHREAD_LIBS)							\
 	$(GTK_CFLAGS)							\
 	$(LIBXFCE4UTIL_LIBS)						\
-	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
+	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la \
+	$(top_builddir)/garcon-gtk/libgarcon-gtk3-1.la
 
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/docs/reference/garcon-docs.xml b/docs/reference/garcon-docs.xml
index 7203278..e26db29 100644
--- a/docs/reference/garcon-docs.xml
+++ b/docs/reference/garcon-docs.xml
@@ -64,6 +64,7 @@
     <xi:include href="xml/garcon-menu-item.xml"/>
     <xi:include href="xml/garcon-menu-item-cache.xml"/>
     <xi:include href="xml/garcon-menu-item-pool.xml"/>
+    <xi:include href="xml/garcon-menu-item-action.xml"/>
     <xi:include href="xml/garcon-menu-separator.xml"/>
   </part>
 
@@ -75,16 +76,23 @@
     <xi:include href="xml/garcon-menu-tree-provider.xml"/>
   </part>
 
+  <part id="garcon-gtk-menu">
+    <title>Create a complete GtkMenu from a GarconMenu</title>
+    <xi:include href="xml/garcon-gtk-menu.xml"/>
+  </part>
+
   <part id="garcon-miscellaneous">
     <title>Miscellaneous</title>
     <xi:include href="xml/garcon-environment.xml"/>
     <xi:include href="xml/garcon.xml"/>
+    <xi:include href="xml/garcon-gtk.xml"/>
     <xi:include href="xml/garcon-config.xml"/>
   </part>
 
   <part id="object-tree">
     <title>Object Hierarchy</title>
     <xi:include href="xml/tree_index.sgml"/>
+    <xi:include href="xml/object_index.sgml"/>
   </part>
 
   <index id="api-index-full">
@@ -92,5 +100,7 @@
     <xi:include href="xml/api-index-full.xml">
       <xi:fallback />
     </xi:include>
+    <xi:include href="xml/api-index-0.3.0.xml" />
+    <xi:include href="xml/api-index-deprecated.xml" />
   </index>
 </book>
diff --git a/docs/reference/garcon-sections.txt b/docs/reference/garcon-sections.txt
index 848046c..4e21a3b 100644
--- a/docs/reference/garcon-sections.txt
+++ b/docs/reference/garcon-sections.txt
@@ -26,6 +26,40 @@ garcon_set_environment_xdg
 </SECTION>
 
 <SECTION>
+<FILE>garcon-gtk</FILE>
+GARCON_INSIDE_GARCON_GTK_H
+</SECTION>
+
+<SECTION>
+<FILE>garcon-gtk-menu</FILE>
+<TITLE>GarconGtkMenu</TITLE>
+GarconGtkMenuClass
+GarconGtkMenu
+garcon_gtk_menu_new
+garcon_gtk_menu_set_menu
+garcon_gtk_menu_get_menu
+garcon_gtk_menu_set_show_generic_names
+garcon_gtk_menu_get_show_generic_names
+garcon_gtk_menu_set_show_menu_icons
+garcon_gtk_menu_get_show_menu_icons
+garcon_gtk_menu_set_show_tooltips
+garcon_gtk_menu_get_show_tooltips
+garcon_gtk_menu_set_show_desktop_actions
+garcon_gtk_menu_get_show_desktop_actions
+garcon_gtk_menu_set_right_click_edits
+garcon_gtk_menu_get_right_click_edits
+GarconGtkMenuPrivate
+<SUBSECTION Standard>
+GARCON_GTK_IS_MENU
+GARCON_GTK_IS_MENU_CLASS
+GARCON_GTK_MENU
+GARCON_GTK_MENU_CLASS
+GARCON_GTK_MENU_GET_CLASS
+GARCON_GTK_TYPE_MENU
+garcon_gtk_menu_get_type
+</SECTION>
+
+<SECTION>
 <FILE>garcon-marshal</FILE>
 garcon_marshal_VOID__OBJECT_OBJECT
 </SECTION>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list