yelp r3047 - in trunk: . data/ui src

[dscorgie svn gnome org]

Author: dscorgie
Date: Mon Jan 21 20:25:12 2008
New Revision: 3047
URL: http://svn.gnome.org/viewvc/yelp?rev=3047&view=rev

Log:
* src/yelp-info.c: 
* src/yelp-transform.c:
* src/yelp-man.c:
* src/yelp-settings.c:
* src/yelp-docbook.c:
* src/yelp-print.c:
Fix various compiler warnings
* src/yelp-window.c:
Fix compiler warnings
Remove additional debug printf
* src/yelp-utils.c:
Fix man sectioning stuff
* src/yelp-toc.c:
Fix reloading on TOC pages


Modified:
   trunk/ChangeLog
   trunk/data/ui/yelp-ui.xml
   trunk/src/yelp-docbook.c
   trunk/src/yelp-info.c
   trunk/src/yelp-man.c
   trunk/src/yelp-print.c
   trunk/src/yelp-settings.c
   trunk/src/yelp-toc.c
   trunk/src/yelp-transform.c
   trunk/src/yelp-utils.c
   trunk/src/yelp-window.c

Modified: trunk/data/ui/yelp-ui.xml
==============================================================================
--- trunk/data/ui/yelp-ui.xml	(original)
+++ trunk/data/ui/yelp-ui.xml	Mon Jan 21 20:25:12 2008
@@ -61,4 +61,5 @@
   <accelerator action="OpenLocation"/>
   <accelerator action="Reload"/>
   <accelerator action="TextCursor"/>
+  <accelerator action="FindSlash"/>
 </ui>

Modified: trunk/src/yelp-docbook.c
==============================================================================
--- trunk/src/yelp-docbook.c	(original)
+++ trunk/src/yelp-docbook.c	Mon Jan 21 20:25:12 2008
@@ -84,7 +84,7 @@
 					       gchar               *page_id,
 					       YelpDocumentFunc     func,
 					       gpointer             user_data);
-static gpointer       docbook_get_sections    (YelpDocument        *document);
+/* static gpointer       docbook_get_sections    (YelpDocument        *document); */
 
 /* YelpTransform */
 static void           transform_func          (YelpTransform       *transform,
@@ -227,13 +227,13 @@
 /******************************************************************************/
 /** YelpDocument **************************************************************/
 
-static gpointer
-docbook_get_sections (YelpDocument *document)
-{
-    YelpDocbook *db = (YelpDocbook *) document;
+/* static gpointer */
+/* docbook_get_sections (YelpDocument *document) */
+/* { */
+/*     YelpDocbook *db = (YelpDocbook *) document; */
     
-    return (gpointer) (db->priv->sections);
-}
+/*     return (gpointer) (db->priv->sections); */
+/* } */
 
 static void
 docbook_request (YelpDocument     *document,

Modified: trunk/src/yelp-info.c
==============================================================================
--- trunk/src/yelp-info.c	(original)
+++ trunk/src/yelp-info.c	Mon Jan 21 20:25:12 2008
@@ -34,6 +34,7 @@
 #include "yelp-info-parser.h"
 #include "yelp-transform.h"
 #include "yelp-debug.h"
+#include "yelp-settings.h"
 
 #define STYLESHEET DATADIR"/yelp/xslt/info2html.xsl"
 

Modified: trunk/src/yelp-man.c
==============================================================================
--- trunk/src/yelp-man.c	(original)
+++ trunk/src/yelp-man.c	Mon Jan 21 20:25:12 2008
@@ -34,6 +34,7 @@
 #include "yelp-man-parser.h"
 #include "yelp-transform.h"
 #include "yelp-debug.h"
+#include "yelp-settings.h"
 
 #define STYLESHEET DATADIR"/yelp/xslt/man2html.xsl"
 

Modified: trunk/src/yelp-print.c
==============================================================================
--- trunk/src/yelp-print.c	(original)
+++ trunk/src/yelp-print.c	Mon Jan 21 20:25:12 2008
@@ -254,7 +254,7 @@
 {
     if (!gtk_printer_accepts_ps (printer)) {
 	GtkDialog *dialog;
-	dialog = gtk_message_dialog_new ( GTK_WINDOW (print_dialog),
+	dialog = (GtkDialog *) gtk_message_dialog_new ( GTK_WINDOW (print_dialog),
 					  GTK_DIALOG_MODAL,
 					  GTK_MESSAGE_ERROR,
 					  GTK_BUTTONS_OK,

Modified: trunk/src/yelp-settings.c
==============================================================================
--- trunk/src/yelp-settings.c	(original)
+++ trunk/src/yelp-settings.c	Mon Jan 21 20:25:12 2008
@@ -716,7 +716,7 @@
     GdkColor   blue = { 0, 0x1E1E, 0x3E3E, 0xE7E7 };
     gdouble    base_h, base_l, base_s;
     gdouble    text_h, text_l, text_s;
-    guint16    rval, gval, bval;
+    /* guint16    rval, gval, bval; */
     gint i;
 
     debug_print (DB_FUNCTION, "entering\n");

Modified: trunk/src/yelp-toc.c
==============================================================================
--- trunk/src/yelp-toc.c	(original)
+++ trunk/src/yelp-toc.c	Mon Jan 21 20:25:12 2008
@@ -184,6 +184,7 @@
 {
     YelpToc *toc = YELP_TOC (object);
 
+    toc_doc = NULL;
     if (toc->priv->xmldoc)
 	xmlFreeDoc (toc->priv->xmldoc);
 
@@ -288,7 +289,6 @@
     g_assert (toc != NULL && YELP_IS_TOC (toc));
 
     priv = toc->priv;
-
     g_assert (transform == priv->transform);
 
     if (priv->state == TOC_STATE_STOP) {
@@ -305,6 +305,7 @@
 	yelp_transform_release (transform);
 	priv->transform = NULL;
 	priv->transform_running = FALSE;
+	priv->process_running = FALSE;
 	return;
     }
 
@@ -317,6 +318,7 @@
 	yelp_transform_release (transform);
 	priv->transform = NULL;
 	priv->transform_running = FALSE;
+	priv->process_running = FALSE;
 	break;
     case YELP_TRANSFORM_FINAL:
 	transform_final_func (transform, toc);
@@ -368,6 +370,7 @@
     priv->transform = NULL;
 
     priv->transform_running = FALSE;
+    priv->process_running = FALSE;
 
     if (priv->xmldoc) {
 	xmlFreeDoc (priv->xmldoc);

Modified: trunk/src/yelp-transform.c
==============================================================================
--- trunk/src/yelp-transform.c	(original)
+++ trunk/src/yelp-transform.c	Mon Jan 21 20:25:12 2008
@@ -43,7 +43,7 @@
 
 #define YELP_NAMESPACE "http://www.gnome.org/yelp/ns";
 
-static exslt_registered = FALSE;
+static gboolean exslt_registered = FALSE;
 
 static void      transform_run         (YelpTransform  *transform);
 static gboolean  transform_free        (YelpTransform  *transform);
@@ -407,7 +407,7 @@
 
     g_mutex_lock (transform->mutex);
 
-    temp = g_strdup (page_id);
+    temp = g_strdup ((gchar *) page_id);
     xmlFree (page_id);
 
     g_async_queue_push (transform->queue, g_strdup ((gchar *) temp));

Modified: trunk/src/yelp-utils.c
==============================================================================
--- trunk/src/yelp-utils.c	(original)
+++ trunk/src/yelp-utils.c	Mon Jan 21 20:25:12 2008
@@ -223,7 +223,7 @@
     if (lbrace) {
 	rbrace = strrchr (name, ')');
 	if (rbrace) {
-	    /*sect = g_strndup (lbrace+1, rbrace - lbrace - 1);*/
+	    sect = g_strndup (lbrace+1, rbrace - lbrace - 1);
 	    real_name = g_strndup (name, lbrace - name);
 	} else {
 	    sect = NULL;
@@ -233,12 +233,12 @@
 	lbrace = strrchr (name, '.');
 	if (lbrace) {
 	    repeat = TRUE;
-	    /*sect = strdup (lbrace+1);*/
+	    sect = strdup (lbrace+1);
 	    real_name = g_strndup (name, lbrace - name);
 	} else {
 	    lbrace = strrchr (name, '#');
 	    if (lbrace) {
-		/*sect = strdup (lbrace+1);*/
+		sect = strdup (lbrace+1);
 		real_name = g_strndup (name, lbrace - name);
 	    } else {
 		real_name = strdup (name);

Modified: trunk/src/yelp-window.c
==============================================================================
--- trunk/src/yelp-window.c	(original)
+++ trunk/src/yelp-window.c	Mon Jan 21 20:25:12 2008
@@ -1249,13 +1249,14 @@
     gtk_menu_tool_button_set_menu (GTK_MENU_TOOL_BUTTON (f_proxy), 
 				   priv->forward_menu);
     
-    priv->search_action =  gtk_entry_action_new ("Search",
+    priv->search_action =  (GtkWidget * )gtk_entry_action_new ("Search",
 				    _("_Search:"),
 				    _("Search for other documentation"),
 				    NULL);
     g_signal_connect (G_OBJECT (priv->search_action), "activate",
 		      G_CALLBACK (search_activated), window);
-    gtk_action_group_add_action (priv->action_group, priv->search_action);
+    gtk_action_group_add_action (priv->action_group, 
+				 (GtkAction *) priv->search_action);
 
     priv->ui_manager = gtk_ui_manager_new ();
     gtk_ui_manager_insert_action_group (priv->ui_manager, priv->action_group, 0);
@@ -1292,8 +1293,6 @@
 
     toolbar = gtk_ui_manager_get_widget(priv->ui_manager, "ui/tools");
 
-    printf ("SE is %p\n", priv->search_action);
-
     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (f_proxy), 0);
     gtk_toolbar_insert (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (b_proxy), 0);
 
@@ -1410,7 +1409,7 @@
 		     YelpWindow *window)
 {
     if ((window->priv->search_action && 
-	gtk_entry_action_has_focus (window->priv->search_action)) ||
+	 gtk_entry_action_has_focus ((GtkEntryAction *) window->priv->search_action)) ||
 	GTK_WIDGET_HAS_FOCUS (window->priv->find_entry))
 	return FALSE;
 
@@ -1428,7 +1427,7 @@
 {
     YelpWindowPriv *priv;
 
-    g_return_if_fail (YELP_IS_WINDOW (window));
+    g_return_val_if_fail (YELP_IS_WINDOW (window), FALSE);
 
     priv = window->priv;