Brent Smith <gnome@nextreality.net>

        * configure.in:
        Remove "or" from ALL_LINGUAS since this breaks the build.
        * src/yelp-toc-pager.c: (toc_pager_dispose),
        (process_read_scrollkeeper), (files_are_equivalent),
        (process_omf_pending):
        oops, delete some debugging messages and clean up some compile
        warnings

3 files changed, 12 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index 0bf0d86b..e858cbd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2006-04-02  Brent Smith  <gnome@nextreality.net>
 
+	* configure.in:
+	Remove "or" from ALL_LINGUAS since this breaks the build.
+	* src/yelp-toc-pager.c: (toc_pager_dispose),
+	(process_read_scrollkeeper), (files_are_equivalent),
+	(process_omf_pending):
+	oops, delete some debugging messages and clean up some compile
+	warnings
+
+2006-04-02  Brent Smith  <gnome@nextreality.net>
+
 	* src/yelp-toc-pager.c: (toc_process_pending), (sk_characters),
 	(process_read_scrollkeeper), (files_are_equivalent),
 	(get_omf_attributes), (create_toc_from_omf_cache_file),
diff --git a/configure.in b/configure.in
index 3e73cc53..cd7db062 100644
--- a/configure.in
+++ b/configure.in
@@ -60,7 +60,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
                    [The gettext translation domain])
 
-ALL_LINGUAS="af am ar az be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kn ko ku ky li lt lv mk ml mn mr ms nb ne nl nn no nso or pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg th tr ug uk vi wa xh zh_CN zh_HK zh_TW zu"
+ALL_LINGUAS="af am ar az be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kn ko ku ky li lt lv mk ml mn mr ms nb ne nl nn no nso pa pl pt pt_BR ro ru rw sk sl sq sr sr@Latn sv ta tg th tr ug uk vi wa xh zh_CN zh_HK zh_TW zu"
 AM_GLIB_GNU_GETTEXT
 
 AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
diff --git a/src/yelp-toc-pager.c b/src/yelp-toc-pager.c
index 7683fd93..4156cee3 100644
--- a/src/yelp-toc-pager.c
+++ b/src/yelp-toc-pager.c
@@ -227,8 +227,6 @@ toc_pager_init (YelpTocPager *pager)
 static void
 toc_pager_dispose (GObject *object)
 {
-    YelpTocPager *pager = YELP_TOC_PAGER (object);
-
     G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
@@ -464,9 +462,6 @@ sk_characters (void          *pager,
 static gboolean
 process_read_scrollkeeper (YelpTocPager *pager, gchar *content_list)
 {
-    YelpTocPagerPriv *priv = pager->priv;
-    GSList *ptr;
-    GSList *ptr2;
     static xmlSAXHandler sk_sax_handler = { 0, };
 
     if (!sk_sax_handler.startElement) {
@@ -478,19 +473,6 @@ process_read_scrollkeeper (YelpTocPager *pager, gchar *content_list)
 
     xmlSAXUserParseFile (&sk_sax_handler, pager, content_list);
 
-    /* debugging - iterates through our hash and prints out all the directories and
-     * files */
-    ptr = priv->omf_pending;
-    while (ptr && ptr->data) {
-	g_print ("dir=%s\n", (gchar *)ptr->data); 
-	ptr2 = g_hash_table_lookup (priv->omf_dirhash, ptr->data);
-	while (ptr2 && ptr2->data) {
-	    g_print ("  file=%s\n", (gchar *)ptr2->data);
-	    ptr2 = g_slist_next (ptr2);
-	}
-	ptr = g_slist_next (ptr);
-    }
-    
     return FALSE;
 }
 
@@ -512,10 +494,8 @@ files_are_equivalent (gchar *file1, gchar *file2)
 
     while (fread (&data1, sizeof (gint), 1, f1)) {
 	fread (&data2, sizeof (gint), 1, f2);
-	if (data1 != data2) {
-	    g_print ("Files do not match.. aborting\n");
+	if (data1 != data2)
 	    return FALSE;
-	}
     }
 
     fclose (f1);
@@ -767,7 +747,6 @@ process_omf_pending (YelpTocPager *pager)
 	     * file everytime, so there's no regression of functionality */
 	    
 	    if (!files_are_equivalent (sk_file, content_list)) {
-		g_print ("files are the not the same!\n");
 	    	process_read_scrollkeeper (pager, content_list);
 		return TRUE;
 	    }
@@ -840,7 +819,6 @@ process_omf_pending (YelpTocPager *pager)
     priv->omf_pending = g_slist_remove_link (priv->omf_pending, first);
     dir = (gchar *) first->data;
 
-    g_print ("processing directory %s\n", dir);
     priv->omf_ins = xmlNewChild (priv->omf_root, NULL, BAD_CAST "dir", NULL);
     xmlAddChild (priv->omf_ins, xmlNewText (BAD_CAST "\n    "));
     xmlNewChild (priv->omf_ins, NULL, BAD_CAST "name", BAD_CAST dir);