summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Scorgie <dscorgie@src.gnome.org>2007-03-25 18:44:59 +0000
committerDon Scorgie <dscorgie@src.gnome.org>2007-03-25 18:44:59 +0000
commit4c923474fe76c17ae79966d7b4f4faa2129ea2b4 (patch)
treeffa5b9ae2fb3cd988ad35cbea1605ea632a8913c
parent7192305234ec154f48a61daea7f5ea85bc89de47 (diff)
downloadyelp-4c923474fe76c17ae79966d7b4f4faa2129ea2b4.tar.gz
src/yelp-toc-pager.c: First work on Spoon integration Search for
src/yelp-toc-pager.c: * configure.in: First work on Spoon integration Search for pkg-config Spoon file Run a spoon-for-each, printing doc names -This line, and those below, will be ignored-- M configure.in M src/yelp-toc-pager.c M ChangeLog svn path=/branches/yelp-spoon/; revision=2791
-rw-r--r--ChangeLog8
-rw-r--r--configure.in1
-rw-r--r--src/yelp-toc-pager.c16
3 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a794d63b..b3724709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-25 Don Scorgie <dscorgie@cvs.gnome.org>
+
+ * src/yelp-toc-pager.c:
+ * configure.in:
+ First work on Spoon integration
+ Search for pkg-config Spoon file
+ Run a spoon-for-each, printing doc names
+
==================== 2.16.2 ====================
2007-03-12 Shaun McCance <shaunm@gnome.org>
diff --git a/configure.in b/configure.in
index dd4dcb73..e360decb 100644
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,7 @@ PKG_CHECK_MODULES(YELP,
libexslt >= 0.8.1
libstartup-notification-1.0 >= 0.8
dbus-glib-1
+ spoon >= 0.4.5
])
AC_SUBST([YELP_CFLAGS])
AC_SUBST([YELP_LIBS])
diff --git a/src/yelp-toc-pager.c b/src/yelp-toc-pager.c
index 71c1b818..c1fafd0e 100644
--- a/src/yelp-toc-pager.c
+++ b/src/yelp-toc-pager.c
@@ -45,6 +45,8 @@
#include <libxslt/extensions.h>
#include <libxslt/xsltInternals.h>
#include <libxslt/xsltutils.h>
+#include <spoon.h>
+#include <spoon-reg-utils.h>
#include "yelp-debug.h"
#include "yelp-error.h"
@@ -1796,6 +1798,16 @@ process_info_pending (YelpTocPager *pager)
}
#endif /* ENABLE_INFO */
+static int
+SpoonPrint( void *reg, void * data)
+{
+ SpoonReg *r = (SpoonReg *) reg;
+
+ g_print ("Name: %s\n", r->name);
+
+ return TRUE;
+}
+
static gboolean
process_read_menu (YelpTocPager *pager)
{
@@ -1806,7 +1818,9 @@ process_read_menu (YelpTocPager *pager)
gint i, ret;
YelpTocPagerPriv *priv = pager->priv;
-
+ g_print ("for_eaching\n");
+ spoon_for_each (SpoonPrint, NULL);
+ g_print ("Ended\n");
priv->toc_doc = xmlCtxtReadFile (priv->parser, DATADIR "/yelp/toc.xml", NULL,
XML_PARSE_NOBLANKS | XML_PARSE_NOCDATA |
XML_PARSE_NOENT | XML_PARSE_NOERROR |