Fix warning. Update for Bonobo UIH changes. Update repo ID for Bonobo

* components/help/hyperbola-nav-index.c: Fix warning.
* components/history/ntl-history-view.c: Update for Bonobo UIH changes.
* components/html/main.c: Update repo ID for Bonobo changes.
* src/ntl-view-bonobo-control.c: Likewise
* src/ntl-view-bonobo-subdoc.c: Likewise
* src/ntl-view-nautilus.c: Likewise
* src/ntl-view.c: Only check for death every other second.
* components/html/ntl-web-browser: Debugging printfs for now

5 files changed, 7 insertions, 6 deletions

diff --git a/components/help/hyperbola-nav-index.c b/components/help/hyperbola-nav-index.c
index e22f3375b..2c5b61d71 100644
--- a/components/help/hyperbola-nav-index.c
+++ b/components/help/hyperbola-nav-index.c
@@ -79,7 +79,7 @@ hyperbola_navigation_index_update_clist(HyperbolaNavigationIndex *hni)
 	}
 
       g_snprintf(rowtext, sizeof(rowtext), "%*s%s", ii->indent * 2, "", ii->text); /* Lame way of indenting entries */
-      rownum = gtk_clist_append(GTK_CLIST(hni->clist), &rowtext);
+      rownum = gtk_clist_append(GTK_CLIST(hni->clist), (char **)&rowtext);
       gtk_clist_set_row_data(GTK_CLIST(hni->clist), rownum, ii);
 
       if(nwords) /* highlight this row as a match */
diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c
index 37c1771de..0d2b7fad1 100644
--- a/components/history/nautilus-history-view.c
+++ b/components/history/nautilus-history-view.c
@@ -188,6 +188,7 @@ menu_setup(BonoboObject *ctl, HistoryView *hview)
     GNOMEUIINFO_END
   };
 
+  hview->uih = bonobo_control_get_ui_handler(BONOBO_CONTROL(ctl));
   remote_uih = bonobo_control_get_remote_ui_handler(BONOBO_CONTROL(ctl));
   bonobo_ui_handler_set_container(hview->uih, remote_uih);
 
@@ -212,8 +213,6 @@ static BonoboObject * make_obj(BonoboGenericFactory *Factory, const char *goad_i
   object_count++;
 
   ctl = nautilus_view_frame_get_bonobo_object(NAUTILUS_VIEW_FRAME(frame));
-  hview->uih = bonobo_ui_handler_new();
-  bonobo_control_set_ui_handler(BONOBO_CONTROL(ctl), hview->uih);
   gtk_signal_connect(GTK_OBJECT(ctl), "set_frame", menu_setup, hview);
 
   /* set description */
diff --git a/components/history/ntl-history-view.c b/components/history/ntl-history-view.c
index 37c1771de..0d2b7fad1 100644
--- a/components/history/ntl-history-view.c
+++ b/components/history/ntl-history-view.c
@@ -188,6 +188,7 @@ menu_setup(BonoboObject *ctl, HistoryView *hview)
     GNOMEUIINFO_END
   };
 
+  hview->uih = bonobo_control_get_ui_handler(BONOBO_CONTROL(ctl));
   remote_uih = bonobo_control_get_remote_ui_handler(BONOBO_CONTROL(ctl));
   bonobo_ui_handler_set_container(hview->uih, remote_uih);
 
@@ -212,8 +213,6 @@ static BonoboObject * make_obj(BonoboGenericFactory *Factory, const char *goad_i
   object_count++;
 
   ctl = nautilus_view_frame_get_bonobo_object(NAUTILUS_VIEW_FRAME(frame));
-  hview->uih = bonobo_ui_handler_new();
-  bonobo_control_set_ui_handler(BONOBO_CONTROL(ctl), hview->uih);
   gtk_signal_connect(GTK_OBJECT(ctl), "set_frame", menu_setup, hview);
 
   /* set description */
diff --git a/components/html/main.c b/components/html/main.c
index a959931aa..6aa8b18b1 100644
--- a/components/html/main.c
+++ b/components/html/main.c
@@ -274,7 +274,7 @@ url_requested_cb (GtkHTML *html,
 
 	g_warning ("query_interface on the ClientSite.");
 	loader = Bonobo_Unknown_query_interface
-		(client_site, "IDL:GNOME/ProgressiveLoader:1.0", &ev);
+		(client_site, "IDL:Bonobo/ProgressiveLoader:1.0", &ev);
 	if (ev._major != CORBA_NO_EXCEPTION) {
 		g_warning ("Cannot query Bonobo::ProgressiveLoader on the Bonobo::ClientSite.");
 		CORBA_exception_free (&ev);
diff --git a/components/html/ntl-web-browser.c b/components/html/ntl-web-browser.c
index 298c8d9de..b181ab44d 100644
--- a/components/html/ntl-web-browser.c
+++ b/components/html/ntl-web-browser.c
@@ -317,6 +317,7 @@ browser_vfs_read_callback(GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer b
 {
   VFSHandle *vfsh = data;
 
+  g_message("browser_vfs_read_callback: %ld/%ld bytes", bytes_read, bytes_requested);
   gtk_html_write(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, buffer, bytes_read);
 
   if(res != GNOME_VFS_OK)
@@ -334,6 +335,8 @@ browser_vfs_callback(GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer data)
 {
   VFSHandle *vfsh = data;
 
+  g_message("browser_vfs_callback");
+
   if(res != GNOME_VFS_OK)
     {
       gtk_html_end(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, GTK_HTML_STREAM_ERROR);