Commit 4a225507 authored by Darin Adler's avatar Darin Adler

Lots of files. Get rid a lot of unneeded casts.

	* Lots of files.
	Get rid a lot of unneeded casts.
parent ee16c763
2001-11-08 Darin Adler <darin@bentspoon.com>
* Lots of files.
Get rid a lot of unneeded casts.
2001-11-08 Darin Adler <darin@bentspoon.com>
* components/sample/Makefile.am: Cleanup, turn on all
......
......@@ -78,7 +78,7 @@ adapter_factory_make_object (BonoboGenericFactory *factory,
* when there are no more objects outstanding.
*/
object_count++;
g_signal_connect (G_OBJECT (adapter), "destroy",
g_signal_connect (adapter, "destroy",
adapter_factory_object_destroyed, NULL);
return BONOBO_OBJECT (adapter);
......
......@@ -166,7 +166,7 @@ nautilus_adapter_control_embed_strategy_new (Bonobo_Control control,
strategy->details->widget = bonobo_control_frame_get_widget (strategy->details->control_frame);
g_signal_connect (G_OBJECT (strategy->details->control_frame),
g_signal_connect (strategy->details->control_frame,
"activate_uri", G_CALLBACK (activate_uri_callback), strategy);
CORBA_exception_init (&ev);
......
......@@ -203,7 +203,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable,
bonobo_wrapper_set_visibility (BONOBO_WRAPPER (strategy->details->client_widget), FALSE);
bonobo_view_frame_set_covered (strategy->details->view_frame, FALSE);
g_signal_connect (G_OBJECT (strategy->details->view_frame),
g_signal_connect (strategy->details->view_frame,
"activate_uri", G_CALLBACK (activate_uri_callback), strategy);
gtk_widget_show (strategy->details->client_widget);
......
......@@ -155,7 +155,7 @@ void
nautilus_adapter_embed_strategy_activate (NautilusAdapterEmbedStrategy *strategy,
Bonobo_UIContainer ui_container)
{
g_signal_emit (G_OBJECT (strategy),
g_signal_emit (strategy,
signals[ACTIVATE], 0,
ui_container);
}
......@@ -163,7 +163,7 @@ nautilus_adapter_embed_strategy_activate (NautilusAdapterEmbedStrategy *strategy
void
nautilus_adapter_embed_strategy_deactivate (NautilusAdapterEmbedStrategy *strategy)
{
g_signal_emit (G_OBJECT (strategy),
g_signal_emit (strategy,
signals[DEACTIVATE], 0);
}
......@@ -171,7 +171,7 @@ void
nautilus_adapter_embed_strategy_emit_open_location (NautilusAdapterEmbedStrategy *strategy,
const char *uri)
{
g_signal_emit (G_OBJECT (strategy),
g_signal_emit (strategy,
signals[OPEN_LOCATION], 0,
uri);
}
......@@ -203,7 +203,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable,
bonobo_wrapper_set_visibility (BONOBO_WRAPPER (strategy->details->client_widget), FALSE);
bonobo_view_frame_set_covered (strategy->details->view_frame, FALSE);
g_signal_connect (G_OBJECT (strategy->details->view_frame),
g_signal_connect (strategy->details->view_frame,
"activate_uri", G_CALLBACK (activate_uri_callback), strategy);
gtk_widget_show (strategy->details->client_widget);
......
......@@ -123,7 +123,7 @@ impl_Nautilus_ComponentAdapterFactory_create_adapter (PortableServer_Servant se
adapter_view = nautilus_adapter_get_nautilus_view (adapter);
g_signal_connect (G_OBJECT (adapter_view), "destroy",
g_signal_connect (adapter_view, "destroy",
adapter_object_destroyed, factory_servant->bonobo_object);
return CORBA_Object_duplicate
......@@ -164,7 +164,7 @@ impl_Nautilus_ComponentAdapterFactory__create (NautilusAdapterFactoryServer *bon
servant->servant.vepv = &impl_Nautilus_ComponentAdapterFactory_vepv;
POA_Nautilus_ComponentAdapterFactory__init ((PortableServer_Servant) servant, ev);
g_signal_connect (G_OBJECT (bonobo_object), "destroy",
g_signal_connect (bonobo_object, "destroy",
G_CALLBACK (impl_Nautilus_ComponentAdapterFactory__destroy), servant);
servant->bonobo_object = bonobo_object;
......
......@@ -200,7 +200,7 @@ nautilus_adapter_load_strategy_stop_loading (NautilusAdapterLoadStrategy *strat
void
nautilus_adapter_load_strategy_report_load_underway (NautilusAdapterLoadStrategy *strategy)
{
g_signal_emit (G_OBJECT (strategy),
g_signal_emit (strategy,
signals[REPORT_LOAD_UNDERWAY], 0);
}
......@@ -208,7 +208,7 @@ void
nautilus_adapter_load_strategy_report_load_progress (NautilusAdapterLoadStrategy *strategy,
double fraction_done)
{
g_signal_emit (G_OBJECT (strategy),
g_signal_emit (strategy,
signals[REPORT_LOAD_PROGRESS], 0,
fraction_done);
}
......@@ -216,13 +216,13 @@ nautilus_adapter_load_strategy_report_load_progress (NautilusAdapterLoadStrateg
void
nautilus_adapter_load_strategy_report_load_complete (NautilusAdapterLoadStrategy *strategy)
{
g_signal_emit (G_OBJECT (strategy),
g_signal_emit (strategy,
signals[REPORT_LOAD_COMPLETE], 0);
}
void
nautilus_adapter_load_strategy_report_load_failed (NautilusAdapterLoadStrategy *strategy)
{
g_signal_emit (G_OBJECT (strategy),
g_signal_emit (strategy,
signals[REPORT_LOAD_FAILED], 0);
}
......@@ -169,11 +169,11 @@ nautilus_adapter_new (Bonobo_Unknown component)
if (zoomable != NULL)
bonobo_object_add_interface (BONOBO_OBJECT (control), zoomable);
g_signal_connect (G_OBJECT (control), "activate",
g_signal_connect (control, "activate",
G_CALLBACK (nautilus_adapter_activate_callback),
adapter);
g_signal_connect (G_OBJECT (adapter->details->embed_strategy), "open_location",
g_signal_connect (adapter->details->embed_strategy, "open_location",
nautilus_adapter_open_location_callback, adapter);
......@@ -211,11 +211,11 @@ nautilus_adapter_new (Bonobo_Unknown component)
nautilus_adapter_embed_strategy_get_widget (adapter->details->embed_strategy));
/* hook up view signals. */
g_signal_connect (G_OBJECT (adapter->details->nautilus_view),
g_signal_connect (adapter->details->nautilus_view,
"load_location",
nautilus_adapter_load_location_callback,
adapter);
g_signal_connect (G_OBJECT (adapter->details->nautilus_view),
g_signal_connect (adapter->details->nautilus_view,
"stop_loading",
nautilus_adapter_stop_loading_callback,
adapter);
......
......@@ -58,7 +58,7 @@ hardware_view_make_object (BonoboGenericFactory *factory,
object_count++;
g_signal_connect (G_OBJECT (view), "destroy", hardware_view_object_destroyed, NULL);
g_signal_connect (view, "destroy", hardware_view_object_destroyed, NULL);
return BONOBO_OBJECT (view);
}
......
......@@ -158,7 +158,7 @@ nautilus_hardware_view_init (NautilusHardwareView *hardware_view)
hardware_view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (hardware_view));
g_signal_connect (G_OBJECT (hardware_view->details->nautilus_view),
g_signal_connect (hardware_view->details->nautilus_view,
"load_location",
G_CALLBACK (hardware_view_load_location_callback),
hardware_view);
......
......@@ -78,7 +78,7 @@ make_obj (BonoboGenericFactory * Factory, const char *goad_id, void *closure)
if (retval) {
object_count++;
g_signal_connect (G_OBJECT (retval), "destroy",
g_signal_connect (retval, "destroy",
do_destroy, NULL);
}
......
......@@ -1749,9 +1749,9 @@ hyperbola_navigation_index_new (void)
vbox = gtk_vbox_new (FALSE, GNOME_PAD);
hni->ent = gtk_entry_new ();
g_signal_connect (G_OBJECT (hni->ent), "changed",
g_signal_connect (hni->ent, "changed",
hyperbola_navigation_index_ent_changed, hni);
g_signal_connect (G_OBJECT (hni->ent), "activate",
g_signal_connect (hni->ent, "activate",
hyperbola_navigation_index_ent_activate, hni);
gtk_container_add (GTK_CONTAINER (vbox), hni->ent);
......@@ -1760,7 +1760,7 @@ hyperbola_navigation_index_new (void)
gtk_clist_set_selection_mode (GTK_CLIST (hni->clist),
GTK_SELECTION_BROWSE);
g_signal_connect (G_OBJECT (hni->clist), "select_row",
g_signal_connect (hni->clist, "select_row",
hyperbola_navigation_index_select_row, hni);
wtmp =
......@@ -2234,12 +2234,12 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
hni->specific_rbutton = gtk_radio_button_new(radio_group);
gtk_container_add(GTK_CONTAINER(hni->specific_rbutton),GTK_WIDGET(underlined_label));
g_signal_connect (G_OBJECT (hni->contents_rbutton), "toggled",
g_signal_connect (hni->contents_rbutton, "toggled",
G_CALLBACK(show_indexes_for_contents_selection_button),
hni);
g_signal_connect (G_OBJECT (hni->all_rbutton), "toggled",
g_signal_connect (hni->all_rbutton, "toggled",
G_CALLBACK(show_indexes_for_all_docs_button), hni);
g_signal_connect (G_OBJECT (hni->specific_rbutton), "toggled", G_CALLBACK(show_indexes_for_specific_docs_button), hni);
g_signal_connect (hni->specific_rbutton, "toggled", G_CALLBACK(show_indexes_for_specific_docs_button), hni);
gtk_box_pack_start(GTK_BOX(top_vbox), hni->contents_rbutton, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(top_vbox), hni->all_rbutton, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(top_hbox),hni->specific_rbutton,TRUE, TRUE, 0);
......@@ -2263,7 +2263,7 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
gtk_misc_set_alignment(GTK_MISC(underlined_label), 0.0, 0.5);
hni->all_terms_rbutton = gtk_radio_button_new(NULL);
gtk_container_add(GTK_CONTAINER(hni->all_terms_rbutton),GTK_WIDGET(underlined_label));
g_signal_connect (G_OBJECT (hni->all_terms_rbutton), "toggled",
g_signal_connect (hni->all_terms_rbutton, "toggled",
G_CALLBACK(show_index_for_all_terms), hni);
gtk_box_pack_start(GTK_BOX(mid_vbox), hni->all_terms_rbutton,FALSE,FALSE,0);
radio_group = gtk_radio_button_group(GTK_RADIO_BUTTON(hni->all_terms_rbutton));
......@@ -2273,14 +2273,14 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
gtk_misc_set_alignment(GTK_MISC(underlined_label), 0.0, 0.5);
hni->specific_terms_rbutton = gtk_radio_button_new( radio_group);
gtk_container_add(GTK_CONTAINER(hni->specific_terms_rbutton),GTK_WIDGET(underlined_label));
g_signal_connect (G_OBJECT (hni->specific_terms_rbutton), "toggled",
g_signal_connect (hni->specific_terms_rbutton, "toggled",
G_CALLBACK(show_index_for_selected_terms), hni);
gtk_box_pack_start(GTK_BOX(mid_vbox), hni->specific_terms_rbutton, FALSE, FALSE, 0);
hni->ent = gtk_entry_new();
g_signal_connect (G_OBJECT (hni->ent), "changed",
g_signal_connect (hni->ent, "changed",
hyperbola_navigation_index_ent_changed, hni);
g_signal_connect (G_OBJECT (hni->ent), "activate",
g_signal_connect (hni->ent, "activate",
hyperbola_navigation_index_ent_activate, hni);
gtk_container_add (GTK_CONTAINER (mid_hbox), hni->ent);
......@@ -2716,13 +2716,11 @@ make_index_page (HyperbolaNavigationIndex *hni)
gtk_clist_set_selection_mode (GTK_CLIST (hni->index_contents->ctree),
GTK_SELECTION_EXTENDED);
gtk_clist_thaw(GTK_CLIST (hni->index_contents->ctree));
select_handler_id = g_signal_connect (G_OBJECT (
hni->index_contents->ctree), "tree_select_row",
select_handler_id = g_signal_connect (hni->index_contents->ctree, "tree_select_row",
hyperbola_navigation_index_tree_select_row, hni);
g_signal_connect (G_OBJECT (
hni->index_contents->ctree), "tree_unselect_row",
g_signal_connect (hni->index_contents->ctree, "tree_unselect_row",
hyperbola_navigation_index_tree_unselect_row, hni);
g_signal_connect (G_OBJECT (hni->index_contents->ctree), "destroy",
g_signal_connect (hni->index_contents->ctree, "destroy",
hyperbola_navigation_tree_destroy, hni->index_contents);
/* The default is for Selection on Contents tab to be selected */
......
......@@ -160,9 +160,9 @@ hyperbola_navigation_search_new (void)
vbox = gtk_vbox_new (FALSE, GNOME_PAD);
hns->ent = gtk_entry_new ();
g_signal_connect (G_OBJECT (hns->ent), "changed",
g_signal_connect (hns->ent, "changed",
hyperbola_navigation_search_ent_changed, hns);
g_signal_connect (G_OBJECT (hns->ent), "activate",
g_signal_connect (hns->ent, "activate",
hyperbola_navigation_search_ent_activate, hns);
gtk_container_add (GTK_CONTAINER (vbox), hns->ent);
......@@ -171,7 +171,7 @@ hyperbola_navigation_search_new (void)
gtk_clist_set_selection_mode (GTK_CLIST (hns->clist),
GTK_SELECTION_BROWSE);
g_signal_connect (G_OBJECT (hns->clist), "select_row",
g_signal_connect (hns->clist, "select_row",
hyperbola_navigation_search_select_row, hns);
wtmp =
......
......@@ -261,9 +261,9 @@ make_contents_page(HyperbolaNavigationTree *contents)
gtk_clist_freeze (GTK_CLIST (contents->top_ctree));
gtk_clist_set_selection_mode (GTK_CLIST (contents->top_ctree),
GTK_SELECTION_BROWSE);
g_signal_connect (G_OBJECT (contents->top_ctree), "tree_select_row",
g_signal_connect (contents->top_ctree, "tree_select_row",
hyperbola_navigation_tree_select_row, contents);
g_signal_connect (G_OBJECT (contents->top_ctree), "destroy",
g_signal_connect (contents->top_ctree, "destroy",
hyperbola_navigation_tree_destroy, contents);
contents->ctree = gtk_ctree_new (1, 0);
......@@ -275,9 +275,9 @@ make_contents_page(HyperbolaNavigationTree *contents)
gtk_clist_freeze (GTK_CLIST (contents->ctree));
gtk_clist_set_selection_mode (GTK_CLIST (contents->ctree),
GTK_SELECTION_BROWSE);
g_signal_connect (G_OBJECT (contents->ctree), "tree_select_row",
g_signal_connect (contents->ctree, "tree_select_row",
hyperbola_navigation_tree_select_row, contents);
g_signal_connect (G_OBJECT (contents->ctree), "destroy",
g_signal_connect (contents->ctree, "destroy",
hyperbola_navigation_tree_destroy, contents);
contents->selected_ctree = NULL;
......@@ -501,7 +501,7 @@ hyperbola_navigation_tree_new (void)
gtk_signal_connect(GTK_OBJECT(notebook), "switch_page",
hyperbola_navigation_notebook_page_changed, index);
gtk_widget_show (notebook);
g_signal_connect (G_OBJECT (index->clist), "select_row",
g_signal_connect (index->clist, "select_row",
hyperbola_navigation_index_clist_select_row, index);
view_frame = nautilus_view_new (notebook);
......@@ -512,7 +512,7 @@ hyperbola_navigation_tree_new (void)
gtk_signal_connect(GTK_OBJECT(nautilus_view_get_bonobo_control(
NAUTILUS_VIEW(view_frame))), "activate",
merge_items_callback, index);
g_signal_connect (G_OBJECT (contents->view_frame), "load_location",
g_signal_connect (contents->view_frame, "load_location",
hyperbola_navigation_tree_load_location, contents);
return BONOBO_OBJECT (view_frame);
......@@ -536,9 +536,9 @@ hyperbola_navigation_tree_new (void)
gtk_clist_freeze (GTK_CLIST (view->ctree));
gtk_clist_set_selection_mode (GTK_CLIST (view->ctree),
GTK_SELECTION_BROWSE);
g_signal_connect (G_OBJECT (view->ctree), "tree_select_row",
g_signal_connect (view->ctree, "tree_select_row",
hyperbola_navigation_tree_select_row, view);
g_signal_connect (G_OBJECT (view->ctree), "destroy",
g_signal_connect (view->ctree, "destroy",
hyperbola_navigation_tree_destroy, view);
......@@ -569,7 +569,7 @@ hyperbola_navigation_tree_new (void)
view->view_frame = nautilus_view_new (wtmp);
g_signal_connect (G_OBJECT (view->view_frame), "load_location",
g_signal_connect (view->view_frame, "load_location",
hyperbola_navigation_tree_load_location, view);
return BONOBO_OBJECT (view->view_frame);
......
......@@ -300,16 +300,16 @@ nautilus_history_view_init (NautilusHistoryView *view)
g_object_ref (G_OBJECT (list));
view->list = list;
g_signal_connect (G_OBJECT (list),
g_signal_connect (list,
"button-press-event",
button_press_callback,
view);
g_signal_connect (G_OBJECT (list),
g_signal_connect (list,
"button-release-event",
button_release_callback,
view);
g_signal_connect (G_OBJECT (view),
g_signal_connect (view,
"history_changed",
history_changed_callback,
view);
......
......@@ -319,7 +319,7 @@ zoomable_zoom_in_callback (BonoboZoomable *zoomable, bonobo_object_data_t *bod)
new_zoom_level = zoom_level_from_index (index);
}
g_signal_emit_by_name (GTK_OBJECT (zoomable), "set_zoom_level",
g_signal_emit_by_name (zoomable, "set_zoom_level",
new_zoom_level);
}
......@@ -338,7 +338,7 @@ zoomable_zoom_out_callback (BonoboZoomable *zoomable, bonobo_object_data_t *bod)
index--;
new_zoom_level = zoom_level_from_index (index);
g_signal_emit_by_name (GTK_OBJECT (zoomable), "set_zoom_level",
g_signal_emit_by_name (zoomable, "set_zoom_level",
new_zoom_level);
}
......@@ -361,7 +361,7 @@ zoomable_zoom_to_fit_callback (BonoboZoomable *zoomable, bonobo_object_data_t *b
new_zoom_level = (x_level < y_level) ? x_level : y_level;
if (new_zoom_level > 0) {
g_signal_emit_by_name (GTK_OBJECT (zoomable), "set_zoom_level",
g_signal_emit_by_name (zoomable, "set_zoom_level",
new_zoom_level);
}
}
......@@ -369,7 +369,7 @@ zoomable_zoom_to_fit_callback (BonoboZoomable *zoomable, bonobo_object_data_t *b
static void
zoomable_zoom_to_default_callback (BonoboZoomable *zoomable, bonobo_object_data_t *bod)
{
g_signal_emit_by_name (GTK_OBJECT (zoomable), "set_zoom_level",
g_signal_emit_by_name (zoomable, "set_zoom_level",
1.0);
}
......@@ -665,7 +665,7 @@ control_factory_common (GtkWidget *scrolled_window)
bod->drawing_area = gtk_drawing_area_new ();
bod->scrolled_window = scrolled_window;
g_signal_connect (G_OBJECT (bod->drawing_area),
g_signal_connect (bod->drawing_area,
"expose_event",
G_CALLBACK (drawing_area_exposed), bod);
......@@ -689,20 +689,20 @@ control_factory_common (GtkWidget *scrolled_window)
*/
gtk_widget_ref (bod->drawing_area);
g_signal_connect (G_OBJECT (bod->control), "destroy",
g_signal_connect (bod->control, "destroy",
G_CALLBACK (control_destroy_callback), bod);
bod->zoomable = bonobo_zoomable_new ();
g_signal_connect (G_OBJECT (bod->zoomable), "set_zoom_level",
g_signal_connect (bod->zoomable, "set_zoom_level",
G_CALLBACK (zoomable_set_zoom_level_callback), bod);
g_signal_connect (G_OBJECT (bod->zoomable), "zoom_in",
g_signal_connect (bod->zoomable, "zoom_in",
G_CALLBACK (zoomable_zoom_in_callback), bod);
g_signal_connect (G_OBJECT (bod->zoomable), "zoom_out",
g_signal_connect (bod->zoomable, "zoom_out",
G_CALLBACK (zoomable_zoom_out_callback), bod);
g_signal_connect (G_OBJECT (bod->zoomable), "zoom_to_fit",
g_signal_connect (bod->zoomable, "zoom_to_fit",
G_CALLBACK (zoomable_zoom_to_fit_callback), bod);
g_signal_connect (G_OBJECT (bod->zoomable), "zoom_to_default",
g_signal_connect (bod->zoomable, "zoom_to_default",
G_CALLBACK (zoomable_zoom_to_default_callback), bod);
bod->zoom_level = 1.0;
......@@ -719,7 +719,7 @@ control_factory_common (GtkWidget *scrolled_window)
bonobo_object_add_interface (BONOBO_OBJECT (bod->control),
BONOBO_OBJECT (bod->zoomable));
g_signal_connect (G_OBJECT (bod->control), "activate",
g_signal_connect (bod->control, "activate",
G_CALLBACK (control_activate_callback), bod);
/*
......@@ -743,7 +743,7 @@ scaled_control_factory (void)
bod = control_factory_common (NULL);
g_signal_connect (G_OBJECT (bod->drawing_area), "size_allocate",
g_signal_connect (bod->drawing_area, "size_allocate",
G_CALLBACK (control_size_allocate_callback), bod);
return bod;
......@@ -763,11 +763,11 @@ scrollable_control_factory (void)
bod = control_factory_common (scroll);
g_signal_connect (G_OBJECT (bod->drawing_area), "size_allocate",
g_signal_connect (bod->drawing_area, "size_allocate",
G_CALLBACK (scrolled_control_size_allocate_callback),
bod);
g_signal_connect (G_OBJECT (bod->scrolled_window), "size_allocate",
g_signal_connect (bod->scrolled_window, "size_allocate",
G_CALLBACK (scrolled_window_size_allocate_callback),
bod);
......
......@@ -62,7 +62,7 @@ loser_make_object (BonoboGenericFactory *factory,
nautilus_view = nautilus_content_loser_get_nautilus_view (view);
g_signal_connect (G_OBJECT (nautilus_view), "destroy", loser_object_destroyed, NULL);
g_signal_connect (nautilus_view, "destroy", loser_object_destroyed, NULL);
nautilus_content_loser_maybe_fail ("post-make-object");
......
......@@ -77,7 +77,7 @@ nautilus_content_loser_init (NautilusContentLoser *view)
view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view));
g_signal_connect (G_OBJECT (view->details->nautilus_view),
g_signal_connect (view->details->nautilus_view,
"load_location",
G_CALLBACK (loser_load_location_callback),
view);
......@@ -85,11 +85,10 @@ nautilus_content_loser_init (NautilusContentLoser *view)
/* Get notified when our bonobo control is activated so we
* can merge menu & toolbar items into Nautilus's UI.
*/
g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control
(view->details->nautilus_view)),
"activate",
loser_merge_bonobo_items_callback,
view);
g_signal_connect (nautilus_view_get_bonobo_control (view->details->nautilus_view)),
"activate",
loser_merge_bonobo_items_callback,
view);
gtk_widget_show (GTK_WIDGET (view));
}
......
......@@ -62,7 +62,7 @@ loser_make_object (BonoboGenericFactory *factory,
nautilus_view = nautilus_sidebar_loser_get_nautilus_view (view);
g_signal_connect (G_OBJECT (nautilus_view), "destroy", loser_object_destroyed, NULL);
g_signal_connect (nautilus_view, "destroy", loser_object_destroyed, NULL);
nautilus_sidebar_loser_maybe_fail ("post-make-object");
......
......@@ -79,20 +79,19 @@ nautilus_sidebar_loser_init (NautilusSidebarLoser *view)
view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view));
g_signal_connect (G_OBJECT (view->details->nautilus_view),
"load_location",
G_CALLBACK (loser_load_location_callback),
view);
g_signal_connect (view->details->nautilus_view,
"load_location",
G_CALLBACK (loser_load_location_callback),
view);
/*
* Get notified when our bonobo control is activated so we
* can merge menu & toolbar items into Nautilus's UI.
*/
g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control
(view->details->nautilus_view)),
"activate",
loser_merge_bonobo_items_callback,
view);
g_signal_connect (nautilus_view_get_bonobo_control (view->details->nautilus_view)),
"activate",
loser_merge_bonobo_items_callback,
view);
gtk_widget_show (GTK_WIDGET (view));
}
......
......@@ -114,7 +114,7 @@ mozilla_make_object (BonoboGenericFactory *factory,
bonobo_object = nautilus_mozilla_content_view_new ();
g_signal_connect (G_OBJECT (bonobo_object), "destroy", mozilla_object_destroyed, NULL);
g_signal_connect (bonobo_object, "destroy", mozilla_object_destroyed, NULL);
/* Remove any pending quit-timeout callback */
if (quit_timeout_id != 0) {
......
......@@ -322,57 +322,57 @@ nautilus_mozilla_content_view_init (NautilusMozillaContentView *view)
post_widget_init ();
/* Add callbacks to the beast */
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"realize",
G_CALLBACK (mozilla_realize_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"title",
G_CALLBACK (mozilla_title_changed_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"location",
G_CALLBACK (mozilla_location_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"net_state",
G_CALLBACK (mozilla_net_state_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"net_start",
G_CALLBACK (mozilla_net_start_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"net_stop",
G_CALLBACK (mozilla_net_stop_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"link_message",
G_CALLBACK (mozilla_link_message_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"progress",
G_CALLBACK (mozilla_progress_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"dom_key_press",
G_CALLBACK (mozilla_dom_key_press_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"dom_mouse_click",
G_CALLBACK (mozilla_dom_mouse_click_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"new_window",
G_CALLBACK (mozilla_new_window_callback),
view);
......@@ -384,13 +384,13 @@ nautilus_mozilla_content_view_init (NautilusMozillaContentView *view)
view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view));
g_signal_connect (G_OBJECT (view->details->nautilus_view),
g_signal_connect (view->details->nautilus_view,
"load_location",
G_CALLBACK (view_load_location_callback),
view);
/* Connect to the active signal of the view to merge our menus */
g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control (view->details->nautilus_view)),
g_signal_connect (nautilus_view_get_bonobo_control (view->details->nautilus_view),
"activate",
bonobo_control_activate_callback,
view);
......@@ -873,16 +873,16 @@ mozilla_new_window_callback (GtkMozEmbed *mozilla, GtkMozEmbed **new_mozilla, gu
gtk_container_add (GTK_CONTAINER (chrome->toplevel_window), GTK_WIDGET (chrome->mozilla));
/* set up all the signals that we care about for chrome windows. */
g_signal_connect (G_OBJECT (chrome->mozilla), "visibility",
g_signal_connect (chrome->mozilla, "visibility",
G_CALLBACK (mozilla_chrome_visibility_callback),
chrome);
g_signal_connect (G_OBJECT (chrome->mozilla), "destroy_browser",
g_signal_connect (chrome->mozilla, "destroy_browser",
G_CALLBACK (mozilla_chrome_destroy_brsr_callback),
chrome);
g_signal_connect (G_OBJECT (chrome->mozilla), "size_to",
g_signal_connect (chrome->mozilla, "size_to",
G_CALLBACK (mozilla_chrome_size_to_callback),
chrome);
g_signal_connect (G_OBJECT (chrome->mozilla), "title",
g_signal_connect (chrome->mozilla, "title",
G_CALLBACK (mozilla_chrome_title_callback),
chrome);
......
......@@ -292,7 +292,7 @@ nautilus_music_view_init (NautilusMusicView *music_view)
music_view->details->event_box = gtk_event_box_new ();