Commit e8c96238 authored by Elliot Lee's avatar Elliot Lee

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
parent 9b94323c
2000-02-16 Elliot Lee <sopwith@redhat.com>
* 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
2000-02-16 Darin Adler <darin@eazel.com> 2000-02-16 Darin Adler <darin@eazel.com>
Added icon stretching and did some cleanups. Added icon stretching and did some cleanups.
......
...@@ -79,7 +79,7 @@ hyperbola_navigation_index_update_clist(HyperbolaNavigationIndex *hni) ...@@ -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 */ 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); gtk_clist_set_row_data(GTK_CLIST(hni->clist), rownum, ii);
if(nwords) /* highlight this row as a match */ if(nwords) /* highlight this row as a match */
......
...@@ -188,6 +188,7 @@ menu_setup(BonoboObject *ctl, HistoryView *hview) ...@@ -188,6 +188,7 @@ menu_setup(BonoboObject *ctl, HistoryView *hview)
GNOMEUIINFO_END GNOMEUIINFO_END
}; };
hview->uih = bonobo_control_get_ui_handler(BONOBO_CONTROL(ctl));
remote_uih = bonobo_control_get_remote_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); bonobo_ui_handler_set_container(hview->uih, remote_uih);
...@@ -212,8 +213,6 @@ static BonoboObject * make_obj(BonoboGenericFactory *Factory, const char *goad_i ...@@ -212,8 +213,6 @@ static BonoboObject * make_obj(BonoboGenericFactory *Factory, const char *goad_i
object_count++; object_count++;
ctl = nautilus_view_frame_get_bonobo_object(NAUTILUS_VIEW_FRAME(frame)); 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); gtk_signal_connect(GTK_OBJECT(ctl), "set_frame", menu_setup, hview);
/* set description */ /* set description */
......
...@@ -188,6 +188,7 @@ menu_setup(BonoboObject *ctl, HistoryView *hview) ...@@ -188,6 +188,7 @@ menu_setup(BonoboObject *ctl, HistoryView *hview)
GNOMEUIINFO_END GNOMEUIINFO_END
}; };
hview->uih = bonobo_control_get_ui_handler(BONOBO_CONTROL(ctl));
remote_uih = bonobo_control_get_remote_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); bonobo_ui_handler_set_container(hview->uih, remote_uih);
...@@ -212,8 +213,6 @@ static BonoboObject * make_obj(BonoboGenericFactory *Factory, const char *goad_i ...@@ -212,8 +213,6 @@ static BonoboObject * make_obj(BonoboGenericFactory *Factory, const char *goad_i
object_count++; object_count++;
ctl = nautilus_view_frame_get_bonobo_object(NAUTILUS_VIEW_FRAME(frame)); 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); gtk_signal_connect(GTK_OBJECT(ctl), "set_frame", menu_setup, hview);
/* set description */ /* set description */
......
...@@ -274,7 +274,7 @@ url_requested_cb (GtkHTML *html, ...@@ -274,7 +274,7 @@ url_requested_cb (GtkHTML *html,
g_warning ("query_interface on the ClientSite."); g_warning ("query_interface on the ClientSite.");
loader = Bonobo_Unknown_query_interface 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) { if (ev._major != CORBA_NO_EXCEPTION) {
g_warning ("Cannot query Bonobo::ProgressiveLoader on the Bonobo::ClientSite."); g_warning ("Cannot query Bonobo::ProgressiveLoader on the Bonobo::ClientSite.");
CORBA_exception_free (&ev); CORBA_exception_free (&ev);
......
...@@ -317,6 +317,7 @@ browser_vfs_read_callback(GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer b ...@@ -317,6 +317,7 @@ browser_vfs_read_callback(GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer b
{ {
VFSHandle *vfsh = data; 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); gtk_html_write(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, buffer, bytes_read);
if(res != GNOME_VFS_OK) if(res != GNOME_VFS_OK)
...@@ -334,6 +335,8 @@ browser_vfs_callback(GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer data) ...@@ -334,6 +335,8 @@ browser_vfs_callback(GnomeVFSAsyncHandle *h, GnomeVFSResult res, gpointer data)
{ {
VFSHandle *vfsh = data; VFSHandle *vfsh = data;
g_message("browser_vfs_callback");
if(res != GNOME_VFS_OK) if(res != GNOME_VFS_OK)
{ {
gtk_html_end(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, GTK_HTML_STREAM_ERROR); gtk_html_end(GTK_HTML(vfsh->bi->htmlw), vfsh->sh, GTK_HTML_STREAM_ERROR);
......
...@@ -55,14 +55,13 @@ static gboolean ...@@ -55,14 +55,13 @@ static gboolean
bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev)
{ {
BonoboControlInfo *bci; BonoboControlInfo *bci;
Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))));
view->component_data = bci = g_new0(BonoboControlInfo, 1); view->component_data = bci = g_new0(BonoboControlInfo, 1);
bci->control_frame = BONOBO_OBJECT(bonobo_control_frame_new()); bci->control_frame = BONOBO_OBJECT(bonobo_control_frame_new(uih));
bonobo_object_add_interface(BONOBO_OBJECT(bci->control_frame), view->view_frame); bonobo_object_add_interface(BONOBO_OBJECT(bci->control_frame), view->view_frame);
bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(bci->control_frame),
nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)));
bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(bci->control_frame), obj); bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(bci->control_frame), obj);
view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(bci->control_frame)); view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(bci->control_frame));
...@@ -91,7 +90,7 @@ bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInf ...@@ -91,7 +90,7 @@ bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInf
} }
NautilusViewComponentType bonobo_control_component_type = { NautilusViewComponentType bonobo_control_component_type = {
"IDL:GNOME/Control:1.0", "IDL:Bonobo/Control:1.0",
&bonobo_control_try_load_client, /* try_load */ &bonobo_control_try_load_client, /* try_load */
&destroy_bonobo_control_view, /* destroy */ &destroy_bonobo_control_view, /* destroy */
NULL, /* show_properties */ NULL, /* show_properties */
......
...@@ -47,7 +47,7 @@ bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo ...@@ -47,7 +47,7 @@ bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo
{ {
Bonobo_PersistStream persist; Bonobo_PersistStream persist;
if((persist = bonobo_object_client_query_interface(view->client_object, "IDL:GNOME/PersistStream:1.0", if((persist = bonobo_object_client_query_interface(view->client_object, "IDL:Bonobo/PersistStream:1.0",
NULL)) NULL))
&& !CORBA_Object_is_nil(persist, ev)) && !CORBA_Object_is_nil(persist, ev))
{ {
...@@ -78,6 +78,8 @@ static gboolean ...@@ -78,6 +78,8 @@ static gboolean
bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev)
{ {
BonoboSubdocInfo *bsi; BonoboSubdocInfo *bsi;
Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))));
view->component_data = bsi = g_new0(BonoboSubdocInfo, 1); view->component_data = bsi = g_new0(BonoboSubdocInfo, 1);
...@@ -89,9 +91,7 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro ...@@ -89,9 +91,7 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro
bonobo_client_site_bind_embeddable(BONOBO_CLIENT_SITE(bsi->client_site), view->client_object); bonobo_client_site_bind_embeddable(BONOBO_CLIENT_SITE(bsi->client_site), view->client_object);
bonobo_container_add(BONOBO_CONTAINER(bsi->container), bsi->client_site); bonobo_container_add(BONOBO_CONTAINER(bsi->container), bsi->client_site);
bsi->view_frame = BONOBO_OBJECT(bonobo_client_site_new_view(BONOBO_CLIENT_SITE(bsi->client_site))); bsi->view_frame = BONOBO_OBJECT(bonobo_client_site_new_view(BONOBO_CLIENT_SITE(bsi->client_site), uih));
bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(bsi->view_frame),
nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)));
g_assert(bsi->view_frame); g_assert(bsi->view_frame);
...@@ -101,7 +101,7 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro ...@@ -101,7 +101,7 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro
} }
NautilusViewComponentType bonobo_subdoc_component_type = { NautilusViewComponentType bonobo_subdoc_component_type = {
"IDL:GNOME/Embeddable:1.0", "IDL:Bonobo/Embeddable:1.0",
&bonobo_subdoc_try_load_client, /* try_load */ &bonobo_subdoc_try_load_client, /* try_load */
&destroy_bonobo_subdoc_view, /* destroy */ &destroy_bonobo_subdoc_view, /* destroy */
NULL, /* show_properties */ NULL, /* show_properties */
......
...@@ -39,10 +39,10 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro ...@@ -39,10 +39,10 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro
{ {
Bonobo_Control control; Bonobo_Control control;
NautilusViewInfo *nvi; NautilusViewInfo *nvi;
Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))));
nvi = view->component_data = g_new0(NautilusViewInfo, 1); nvi = view->component_data = g_new0(NautilusViewInfo, 1);
control = Bonobo_Unknown_query_interface(obj, "IDL:GNOME/Control:1.0", ev); control = Bonobo_Unknown_query_interface(obj, "IDL:Bonobo/Control:1.0", ev);
if(ev->_major != CORBA_NO_EXCEPTION) if(ev->_major != CORBA_NO_EXCEPTION)
control = CORBA_OBJECT_NIL; control = CORBA_OBJECT_NIL;
...@@ -51,11 +51,9 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro ...@@ -51,11 +51,9 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro
nvi->view_client = CORBA_Object_duplicate(obj, ev); nvi->view_client = CORBA_Object_duplicate(obj, ev);
nvi->control_frame = BONOBO_OBJECT(bonobo_control_frame_new()); nvi->control_frame = BONOBO_OBJECT(bonobo_control_frame_new(uih));
bonobo_object_add_interface(BONOBO_OBJECT(nvi->control_frame), view->view_frame); bonobo_object_add_interface(BONOBO_OBJECT(nvi->control_frame), view->view_frame);
bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(nvi->control_frame),
nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)));
bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(nvi->control_frame), control); bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(nvi->control_frame), control);
view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(nvi->control_frame)); view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(nvi->control_frame));
......
...@@ -596,7 +596,7 @@ nautilus_view_set_active_errors(NautilusView *view, gboolean enabled) ...@@ -596,7 +596,7 @@ nautilus_view_set_active_errors(NautilusView *view, gboolean enabled)
if(enabled) if(enabled)
{ {
if(!view->timer_id) if(!view->timer_id)
view->timer_id = g_timeout_add(1000, (GSourceFunc)check_object, view); view->timer_id = g_timeout_add(2000, (GSourceFunc)check_object, view);
} }
else else
{ {
......
...@@ -55,14 +55,13 @@ static gboolean ...@@ -55,14 +55,13 @@ static gboolean
bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) bonobo_control_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev)
{ {
BonoboControlInfo *bci; BonoboControlInfo *bci;
Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))));
view->component_data = bci = g_new0(BonoboControlInfo, 1); view->component_data = bci = g_new0(BonoboControlInfo, 1);
bci->control_frame = BONOBO_OBJECT(bonobo_control_frame_new()); bci->control_frame = BONOBO_OBJECT(bonobo_control_frame_new(uih));
bonobo_object_add_interface(BONOBO_OBJECT(bci->control_frame), view->view_frame); bonobo_object_add_interface(BONOBO_OBJECT(bci->control_frame), view->view_frame);
bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(bci->control_frame),
nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)));
bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(bci->control_frame), obj); bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(bci->control_frame), obj);
view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(bci->control_frame)); view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(bci->control_frame));
...@@ -91,7 +90,7 @@ bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInf ...@@ -91,7 +90,7 @@ bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInf
} }
NautilusViewComponentType bonobo_control_component_type = { NautilusViewComponentType bonobo_control_component_type = {
"IDL:GNOME/Control:1.0", "IDL:Bonobo/Control:1.0",
&bonobo_control_try_load_client, /* try_load */ &bonobo_control_try_load_client, /* try_load */
&destroy_bonobo_control_view, /* destroy */ &destroy_bonobo_control_view, /* destroy */
NULL, /* show_properties */ NULL, /* show_properties */
......
...@@ -47,7 +47,7 @@ bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo ...@@ -47,7 +47,7 @@ bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo
{ {
Bonobo_PersistStream persist; Bonobo_PersistStream persist;
if((persist = bonobo_object_client_query_interface(view->client_object, "IDL:GNOME/PersistStream:1.0", if((persist = bonobo_object_client_query_interface(view->client_object, "IDL:Bonobo/PersistStream:1.0",
NULL)) NULL))
&& !CORBA_Object_is_nil(persist, ev)) && !CORBA_Object_is_nil(persist, ev))
{ {
...@@ -78,6 +78,8 @@ static gboolean ...@@ -78,6 +78,8 @@ static gboolean
bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev) bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Environment *ev)
{ {
BonoboSubdocInfo *bsi; BonoboSubdocInfo *bsi;
Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))));
view->component_data = bsi = g_new0(BonoboSubdocInfo, 1); view->component_data = bsi = g_new0(BonoboSubdocInfo, 1);
...@@ -89,9 +91,7 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro ...@@ -89,9 +91,7 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro
bonobo_client_site_bind_embeddable(BONOBO_CLIENT_SITE(bsi->client_site), view->client_object); bonobo_client_site_bind_embeddable(BONOBO_CLIENT_SITE(bsi->client_site), view->client_object);
bonobo_container_add(BONOBO_CONTAINER(bsi->container), bsi->client_site); bonobo_container_add(BONOBO_CONTAINER(bsi->container), bsi->client_site);
bsi->view_frame = BONOBO_OBJECT(bonobo_client_site_new_view(BONOBO_CLIENT_SITE(bsi->client_site))); bsi->view_frame = BONOBO_OBJECT(bonobo_client_site_new_view(BONOBO_CLIENT_SITE(bsi->client_site), uih));
bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(bsi->view_frame),
nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)));
g_assert(bsi->view_frame); g_assert(bsi->view_frame);
...@@ -101,7 +101,7 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro ...@@ -101,7 +101,7 @@ bonobo_subdoc_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro
} }
NautilusViewComponentType bonobo_subdoc_component_type = { NautilusViewComponentType bonobo_subdoc_component_type = {
"IDL:GNOME/Embeddable:1.0", "IDL:Bonobo/Embeddable:1.0",
&bonobo_subdoc_try_load_client, /* try_load */ &bonobo_subdoc_try_load_client, /* try_load */
&destroy_bonobo_subdoc_view, /* destroy */ &destroy_bonobo_subdoc_view, /* destroy */
NULL, /* show_properties */ NULL, /* show_properties */
......
...@@ -39,10 +39,10 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro ...@@ -39,10 +39,10 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro
{ {
Bonobo_Control control; Bonobo_Control control;
NautilusViewInfo *nvi; NautilusViewInfo *nvi;
Bonobo_UIHandler uih = bonobo_object_corba_objref(BONOBO_OBJECT(nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window))));
nvi = view->component_data = g_new0(NautilusViewInfo, 1); nvi = view->component_data = g_new0(NautilusViewInfo, 1);
control = Bonobo_Unknown_query_interface(obj, "IDL:GNOME/Control:1.0", ev); control = Bonobo_Unknown_query_interface(obj, "IDL:Bonobo/Control:1.0", ev);
if(ev->_major != CORBA_NO_EXCEPTION) if(ev->_major != CORBA_NO_EXCEPTION)
control = CORBA_OBJECT_NIL; control = CORBA_OBJECT_NIL;
...@@ -51,11 +51,9 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro ...@@ -51,11 +51,9 @@ nautilus_view_try_load_client(NautilusView *view, CORBA_Object obj, CORBA_Enviro
nvi->view_client = CORBA_Object_duplicate(obj, ev); nvi->view_client = CORBA_Object_duplicate(obj, ev);
nvi->control_frame = BONOBO_OBJECT(bonobo_control_frame_new()); nvi->control_frame = BONOBO_OBJECT(bonobo_control_frame_new(uih));
bonobo_object_add_interface(BONOBO_OBJECT(nvi->control_frame), view->view_frame); bonobo_object_add_interface(BONOBO_OBJECT(nvi->control_frame), view->view_frame);
bonobo_control_frame_set_ui_handler(BONOBO_CONTROL_FRAME(nvi->control_frame),
nautilus_window_get_uih(NAUTILUS_WINDOW(view->main_window)));
bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(nvi->control_frame), control); bonobo_control_frame_bind_to_control(BONOBO_CONTROL_FRAME(nvi->control_frame), control);
view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(nvi->control_frame)); view->client_widget = bonobo_control_frame_get_widget(BONOBO_CONTROL_FRAME(nvi->control_frame));
......
...@@ -596,7 +596,7 @@ nautilus_view_set_active_errors(NautilusView *view, gboolean enabled) ...@@ -596,7 +596,7 @@ nautilus_view_set_active_errors(NautilusView *view, gboolean enabled)
if(enabled) if(enabled)
{ {
if(!view->timer_id) if(!view->timer_id)
view->timer_id = g_timeout_add(1000, (GSourceFunc)check_object, view); view->timer_id = g_timeout_add(2000, (GSourceFunc)check_object, view);
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment