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

Sun Jun 11 12:16:34 CEST 2017

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

e   r   i   c       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 0da014b63bbf8c0ce071aeda432d712e506c180d
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Sun Jun 11 13:06:31 2017 +0300

    Revert "Docs: generate and add the new functions"
    
    This reverts commit cfcadc4ac3a1bd0e4385e11735c57b5338ac1095.
    
    This breaks make distcheck. We can recommit it once it's fixed
    and the functions are documented better.
    
    Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
 .gitignore                         |  1 -
 docs/reference/Makefile.am         | 15 ++++-----------
 docs/reference/garcon-docs.xml     | 10 ----------
 docs/reference/garcon-sections.txt | 34 ----------------------------------
 4 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d6ecc4..b23f5e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,6 @@ 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 0b4df85..f218185 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -31,9 +31,7 @@ SCAN_OPTIONS=--rebuild-sections
 SCANGOBJ_OPTIONS=
 
 # Directory containing the source code
-DOC_SOURCE_DIR= \
-	../../garcon \
-	../../garcon-gtk
+DOC_SOURCE_DIR=../../garcon
 
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS=--sgml-mode --output-format=xml
@@ -42,12 +40,8 @@ MKDB_OPTIONS=--sgml-mode --output-format=xml
 FIXXREF_OPTIONS=
 
 # Used for dependencies
-HFILE_GLOB= \
-	$(top_srcdir)/garcon/*.h \
-	$(top_srcdir)/garcon-gtk/*.h
-CFILE_GLOB= \
-	$(top_srcdir)/garcon/*.c \
-	$(top_srcdir)/garcon-gtk/*.c
+HFILE_GLOB=$(top_srcdir)/garcon/*.h
+CFILE_GLOB=$(top_srcdir)/garcon/*.c
 
 # Extra files to add when scanning (relative to $srcdir)
 EXTRA_HFILES=
@@ -78,8 +72,7 @@ GTKDOC_LIBS =								\
 	$(GTHREAD_LIBS)							\
 	$(GTK_CFLAGS)							\
 	$(LIBXFCE4UTIL_LIBS)						\
-	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la \
-	$(top_builddir)/garcon-gtk/libgarcon-gtk3-1.la
+	$(top_builddir)/garcon/libgarcon-$(GARCON_VERSION_API).la
 
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/docs/reference/garcon-docs.xml b/docs/reference/garcon-docs.xml
index e26db29..7203278 100644
--- a/docs/reference/garcon-docs.xml
+++ b/docs/reference/garcon-docs.xml
@@ -64,7 +64,6 @@
     <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>
 
@@ -76,23 +75,16 @@
     <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">
@@ -100,7 +92,5 @@
     <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 4e21a3b..848046c 100644
--- a/docs/reference/garcon-sections.txt
+++ b/docs/reference/garcon-sections.txt
@@ -26,40 +26,6 @@ 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.
