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

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> 2001-11-08 Darin Adler <darin@bentspoon.com>
* components/sample/Makefile.am: Cleanup, turn on all * components/sample/Makefile.am: Cleanup, turn on all
......
...@@ -78,7 +78,7 @@ adapter_factory_make_object (BonoboGenericFactory *factory, ...@@ -78,7 +78,7 @@ adapter_factory_make_object (BonoboGenericFactory *factory,
* when there are no more objects outstanding. * when there are no more objects outstanding.
*/ */
object_count++; object_count++;
g_signal_connect (G_OBJECT (adapter), "destroy", g_signal_connect (adapter, "destroy",
adapter_factory_object_destroyed, NULL); adapter_factory_object_destroyed, NULL);
return BONOBO_OBJECT (adapter); return BONOBO_OBJECT (adapter);
......
...@@ -166,7 +166,7 @@ nautilus_adapter_control_embed_strategy_new (Bonobo_Control control, ...@@ -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); 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); "activate_uri", G_CALLBACK (activate_uri_callback), strategy);
CORBA_exception_init (&ev); CORBA_exception_init (&ev);
......
...@@ -203,7 +203,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable, ...@@ -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_wrapper_set_visibility (BONOBO_WRAPPER (strategy->details->client_widget), FALSE);
bonobo_view_frame_set_covered (strategy->details->view_frame, 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); "activate_uri", G_CALLBACK (activate_uri_callback), strategy);
gtk_widget_show (strategy->details->client_widget); gtk_widget_show (strategy->details->client_widget);
......
...@@ -155,7 +155,7 @@ void ...@@ -155,7 +155,7 @@ void
nautilus_adapter_embed_strategy_activate (NautilusAdapterEmbedStrategy *strategy, nautilus_adapter_embed_strategy_activate (NautilusAdapterEmbedStrategy *strategy,
Bonobo_UIContainer ui_container) Bonobo_UIContainer ui_container)
{ {
g_signal_emit (G_OBJECT (strategy), g_signal_emit (strategy,
signals[ACTIVATE], 0, signals[ACTIVATE], 0,
ui_container); ui_container);
} }
...@@ -163,7 +163,7 @@ nautilus_adapter_embed_strategy_activate (NautilusAdapterEmbedStrategy *strategy ...@@ -163,7 +163,7 @@ nautilus_adapter_embed_strategy_activate (NautilusAdapterEmbedStrategy *strategy
void void
nautilus_adapter_embed_strategy_deactivate (NautilusAdapterEmbedStrategy *strategy) nautilus_adapter_embed_strategy_deactivate (NautilusAdapterEmbedStrategy *strategy)
{ {
g_signal_emit (G_OBJECT (strategy), g_signal_emit (strategy,
signals[DEACTIVATE], 0); signals[DEACTIVATE], 0);
} }
...@@ -171,7 +171,7 @@ void ...@@ -171,7 +171,7 @@ void
nautilus_adapter_embed_strategy_emit_open_location (NautilusAdapterEmbedStrategy *strategy, nautilus_adapter_embed_strategy_emit_open_location (NautilusAdapterEmbedStrategy *strategy,
const char *uri) const char *uri)
{ {
g_signal_emit (G_OBJECT (strategy), g_signal_emit (strategy,
signals[OPEN_LOCATION], 0, signals[OPEN_LOCATION], 0,
uri); uri);
} }
...@@ -203,7 +203,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable, ...@@ -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_wrapper_set_visibility (BONOBO_WRAPPER (strategy->details->client_widget), FALSE);
bonobo_view_frame_set_covered (strategy->details->view_frame, 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); "activate_uri", G_CALLBACK (activate_uri_callback), strategy);
gtk_widget_show (strategy->details->client_widget); gtk_widget_show (strategy->details->client_widget);
......
...@@ -123,7 +123,7 @@ impl_Nautilus_ComponentAdapterFactory_create_adapter (PortableServer_Servant se ...@@ -123,7 +123,7 @@ impl_Nautilus_ComponentAdapterFactory_create_adapter (PortableServer_Servant se
adapter_view = nautilus_adapter_get_nautilus_view (adapter); 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); adapter_object_destroyed, factory_servant->bonobo_object);
return CORBA_Object_duplicate return CORBA_Object_duplicate
...@@ -164,7 +164,7 @@ impl_Nautilus_ComponentAdapterFactory__create (NautilusAdapterFactoryServer *bon ...@@ -164,7 +164,7 @@ impl_Nautilus_ComponentAdapterFactory__create (NautilusAdapterFactoryServer *bon
servant->servant.vepv = &impl_Nautilus_ComponentAdapterFactory_vepv; servant->servant.vepv = &impl_Nautilus_ComponentAdapterFactory_vepv;
POA_Nautilus_ComponentAdapterFactory__init ((PortableServer_Servant) servant, ev); 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); G_CALLBACK (impl_Nautilus_ComponentAdapterFactory__destroy), servant);
servant->bonobo_object = bonobo_object; servant->bonobo_object = bonobo_object;
......
...@@ -200,7 +200,7 @@ nautilus_adapter_load_strategy_stop_loading (NautilusAdapterLoadStrategy *strat ...@@ -200,7 +200,7 @@ nautilus_adapter_load_strategy_stop_loading (NautilusAdapterLoadStrategy *strat
void void
nautilus_adapter_load_strategy_report_load_underway (NautilusAdapterLoadStrategy *strategy) nautilus_adapter_load_strategy_report_load_underway (NautilusAdapterLoadStrategy *strategy)
{ {
g_signal_emit (G_OBJECT (strategy), g_signal_emit (strategy,
signals[REPORT_LOAD_UNDERWAY], 0); signals[REPORT_LOAD_UNDERWAY], 0);
} }
...@@ -208,7 +208,7 @@ void ...@@ -208,7 +208,7 @@ void
nautilus_adapter_load_strategy_report_load_progress (NautilusAdapterLoadStrategy *strategy, nautilus_adapter_load_strategy_report_load_progress (NautilusAdapterLoadStrategy *strategy,
double fraction_done) double fraction_done)
{ {
g_signal_emit (G_OBJECT (strategy), g_signal_emit (strategy,
signals[REPORT_LOAD_PROGRESS], 0, signals[REPORT_LOAD_PROGRESS], 0,
fraction_done); fraction_done);
} }
...@@ -216,13 +216,13 @@ nautilus_adapter_load_strategy_report_load_progress (NautilusAdapterLoadStrateg ...@@ -216,13 +216,13 @@ nautilus_adapter_load_strategy_report_load_progress (NautilusAdapterLoadStrateg
void void
nautilus_adapter_load_strategy_report_load_complete (NautilusAdapterLoadStrategy *strategy) nautilus_adapter_load_strategy_report_load_complete (NautilusAdapterLoadStrategy *strategy)
{ {
g_signal_emit (G_OBJECT (strategy), g_signal_emit (strategy,
signals[REPORT_LOAD_COMPLETE], 0); signals[REPORT_LOAD_COMPLETE], 0);
} }
void void
nautilus_adapter_load_strategy_report_load_failed (NautilusAdapterLoadStrategy *strategy) nautilus_adapter_load_strategy_report_load_failed (NautilusAdapterLoadStrategy *strategy)
{ {
g_signal_emit (G_OBJECT (strategy), g_signal_emit (strategy,
signals[REPORT_LOAD_FAILED], 0); signals[REPORT_LOAD_FAILED], 0);
} }
...@@ -169,11 +169,11 @@ nautilus_adapter_new (Bonobo_Unknown component) ...@@ -169,11 +169,11 @@ nautilus_adapter_new (Bonobo_Unknown component)
if (zoomable != NULL) if (zoomable != NULL)
bonobo_object_add_interface (BONOBO_OBJECT (control), zoomable); 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), G_CALLBACK (nautilus_adapter_activate_callback),
adapter); 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); nautilus_adapter_open_location_callback, adapter);
...@@ -211,11 +211,11 @@ nautilus_adapter_new (Bonobo_Unknown component) ...@@ -211,11 +211,11 @@ nautilus_adapter_new (Bonobo_Unknown component)
nautilus_adapter_embed_strategy_get_widget (adapter->details->embed_strategy)); nautilus_adapter_embed_strategy_get_widget (adapter->details->embed_strategy));
/* hook up view signals. */ /* hook up view signals. */
g_signal_connect (G_OBJECT (adapter->details->nautilus_view), g_signal_connect (adapter->details->nautilus_view,
"load_location", "load_location",
nautilus_adapter_load_location_callback, nautilus_adapter_load_location_callback,
adapter); adapter);
g_signal_connect (G_OBJECT (adapter->details->nautilus_view), g_signal_connect (adapter->details->nautilus_view,
"stop_loading", "stop_loading",
nautilus_adapter_stop_loading_callback, nautilus_adapter_stop_loading_callback,
adapter); adapter);
......
...@@ -58,7 +58,7 @@ hardware_view_make_object (BonoboGenericFactory *factory, ...@@ -58,7 +58,7 @@ hardware_view_make_object (BonoboGenericFactory *factory,
object_count++; 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); return BONOBO_OBJECT (view);
} }
......
...@@ -158,7 +158,7 @@ nautilus_hardware_view_init (NautilusHardwareView *hardware_view) ...@@ -158,7 +158,7 @@ nautilus_hardware_view_init (NautilusHardwareView *hardware_view)
hardware_view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (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", "load_location",
G_CALLBACK (hardware_view_load_location_callback), G_CALLBACK (hardware_view_load_location_callback),
hardware_view); hardware_view);
......
...@@ -78,7 +78,7 @@ make_obj (BonoboGenericFactory * Factory, const char *goad_id, void *closure) ...@@ -78,7 +78,7 @@ make_obj (BonoboGenericFactory * Factory, const char *goad_id, void *closure)
if (retval) { if (retval) {
object_count++; object_count++;
g_signal_connect (G_OBJECT (retval), "destroy", g_signal_connect (retval, "destroy",
do_destroy, NULL); do_destroy, NULL);
} }
......
...@@ -1749,9 +1749,9 @@ hyperbola_navigation_index_new (void) ...@@ -1749,9 +1749,9 @@ hyperbola_navigation_index_new (void)
vbox = gtk_vbox_new (FALSE, GNOME_PAD); vbox = gtk_vbox_new (FALSE, GNOME_PAD);
hni->ent = gtk_entry_new (); 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); 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); hyperbola_navigation_index_ent_activate, hni);
gtk_container_add (GTK_CONTAINER (vbox), hni->ent); gtk_container_add (GTK_CONTAINER (vbox), hni->ent);
...@@ -1760,7 +1760,7 @@ hyperbola_navigation_index_new (void) ...@@ -1760,7 +1760,7 @@ hyperbola_navigation_index_new (void)
gtk_clist_set_selection_mode (GTK_CLIST (hni->clist), gtk_clist_set_selection_mode (GTK_CLIST (hni->clist),
GTK_SELECTION_BROWSE); 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); hyperbola_navigation_index_select_row, hni);
wtmp = wtmp =
...@@ -2234,12 +2234,12 @@ make_index_display_page(HyperbolaNavigationIndex *hni) ...@@ -2234,12 +2234,12 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
hni->specific_rbutton = gtk_radio_button_new(radio_group); hni->specific_rbutton = gtk_radio_button_new(radio_group);
gtk_container_add(GTK_CONTAINER(hni->specific_rbutton),GTK_WIDGET(underlined_label)); 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), G_CALLBACK(show_indexes_for_contents_selection_button),
hni); 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_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->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_vbox), hni->all_rbutton, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(top_hbox),hni->specific_rbutton,TRUE, TRUE, 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) ...@@ -2263,7 +2263,7 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
gtk_misc_set_alignment(GTK_MISC(underlined_label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(underlined_label), 0.0, 0.5);
hni->all_terms_rbutton = gtk_radio_button_new(NULL); hni->all_terms_rbutton = gtk_radio_button_new(NULL);
gtk_container_add(GTK_CONTAINER(hni->all_terms_rbutton),GTK_WIDGET(underlined_label)); 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); G_CALLBACK(show_index_for_all_terms), hni);
gtk_box_pack_start(GTK_BOX(mid_vbox), hni->all_terms_rbutton,FALSE,FALSE,0); 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)); radio_group = gtk_radio_button_group(GTK_RADIO_BUTTON(hni->all_terms_rbutton));
...@@ -2273,14 +2273,14 @@ make_index_display_page(HyperbolaNavigationIndex *hni) ...@@ -2273,14 +2273,14 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
gtk_misc_set_alignment(GTK_MISC(underlined_label), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(underlined_label), 0.0, 0.5);
hni->specific_terms_rbutton = gtk_radio_button_new( radio_group); hni->specific_terms_rbutton = gtk_radio_button_new( radio_group);
gtk_container_add(GTK_CONTAINER(hni->specific_terms_rbutton),GTK_WIDGET(underlined_label)); 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); G_CALLBACK(show_index_for_selected_terms), hni);
gtk_box_pack_start(GTK_BOX(mid_vbox), hni->specific_terms_rbutton, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(mid_vbox), hni->specific_terms_rbutton, FALSE, FALSE, 0);
hni->ent = gtk_entry_new(); 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); 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); hyperbola_navigation_index_ent_activate, hni);
gtk_container_add (GTK_CONTAINER (mid_hbox), hni->ent); gtk_container_add (GTK_CONTAINER (mid_hbox), hni->ent);
...@@ -2716,13 +2716,11 @@ make_index_page (HyperbolaNavigationIndex *hni) ...@@ -2716,13 +2716,11 @@ make_index_page (HyperbolaNavigationIndex *hni)
gtk_clist_set_selection_mode (GTK_CLIST (hni->index_contents->ctree), gtk_clist_set_selection_mode (GTK_CLIST (hni->index_contents->ctree),
GTK_SELECTION_EXTENDED); GTK_SELECTION_EXTENDED);
gtk_clist_thaw(GTK_CLIST (hni->index_contents->ctree)); gtk_clist_thaw(GTK_CLIST (hni->index_contents->ctree));
select_handler_id = g_signal_connect (G_OBJECT ( select_handler_id = g_signal_connect (hni->index_contents->ctree, "tree_select_row",
hni->index_contents->ctree), "tree_select_row",
hyperbola_navigation_index_tree_select_row, hni); hyperbola_navigation_index_tree_select_row, hni);
g_signal_connect (G_OBJECT ( g_signal_connect (hni->index_contents->ctree, "tree_unselect_row",
hni->index_contents->ctree), "tree_unselect_row",
hyperbola_navigation_index_tree_unselect_row, hni); 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); hyperbola_navigation_tree_destroy, hni->index_contents);
/* The default is for Selection on Contents tab to be selected */ /* The default is for Selection on Contents tab to be selected */
......
...@@ -160,9 +160,9 @@ hyperbola_navigation_search_new (void) ...@@ -160,9 +160,9 @@ hyperbola_navigation_search_new (void)
vbox = gtk_vbox_new (FALSE, GNOME_PAD); vbox = gtk_vbox_new (FALSE, GNOME_PAD);
hns->ent = gtk_entry_new (); 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); 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); hyperbola_navigation_search_ent_activate, hns);
gtk_container_add (GTK_CONTAINER (vbox), hns->ent); gtk_container_add (GTK_CONTAINER (vbox), hns->ent);
...@@ -171,7 +171,7 @@ hyperbola_navigation_search_new (void) ...@@ -171,7 +171,7 @@ hyperbola_navigation_search_new (void)
gtk_clist_set_selection_mode (GTK_CLIST (hns->clist), gtk_clist_set_selection_mode (GTK_CLIST (hns->clist),
GTK_SELECTION_BROWSE); 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); hyperbola_navigation_search_select_row, hns);
wtmp = wtmp =
......
...@@ -261,9 +261,9 @@ make_contents_page(HyperbolaNavigationTree *contents) ...@@ -261,9 +261,9 @@ make_contents_page(HyperbolaNavigationTree *contents)
gtk_clist_freeze (GTK_CLIST (contents->top_ctree)); gtk_clist_freeze (GTK_CLIST (contents->top_ctree));
gtk_clist_set_selection_mode (GTK_CLIST (contents->top_ctree), gtk_clist_set_selection_mode (GTK_CLIST (contents->top_ctree),
GTK_SELECTION_BROWSE); 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); 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); hyperbola_navigation_tree_destroy, contents);
contents->ctree = gtk_ctree_new (1, 0); contents->ctree = gtk_ctree_new (1, 0);
...@@ -275,9 +275,9 @@ make_contents_page(HyperbolaNavigationTree *contents) ...@@ -275,9 +275,9 @@ make_contents_page(HyperbolaNavigationTree *contents)
gtk_clist_freeze (GTK_CLIST (contents->ctree)); gtk_clist_freeze (GTK_CLIST (contents->ctree));
gtk_clist_set_selection_mode (GTK_CLIST (contents->ctree), gtk_clist_set_selection_mode (GTK_CLIST (contents->ctree),
GTK_SELECTION_BROWSE); 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); 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); hyperbola_navigation_tree_destroy, contents);
contents->selected_ctree = NULL; contents->selected_ctree = NULL;
...@@ -501,7 +501,7 @@ hyperbola_navigation_tree_new (void) ...@@ -501,7 +501,7 @@ hyperbola_navigation_tree_new (void)
gtk_signal_connect(GTK_OBJECT(notebook), "switch_page", gtk_signal_connect(GTK_OBJECT(notebook), "switch_page",
hyperbola_navigation_notebook_page_changed, index); hyperbola_navigation_notebook_page_changed, index);
gtk_widget_show (notebook); 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); hyperbola_navigation_index_clist_select_row, index);
view_frame = nautilus_view_new (notebook); view_frame = nautilus_view_new (notebook);
...@@ -512,7 +512,7 @@ hyperbola_navigation_tree_new (void) ...@@ -512,7 +512,7 @@ hyperbola_navigation_tree_new (void)
gtk_signal_connect(GTK_OBJECT(nautilus_view_get_bonobo_control( gtk_signal_connect(GTK_OBJECT(nautilus_view_get_bonobo_control(
NAUTILUS_VIEW(view_frame))), "activate", NAUTILUS_VIEW(view_frame))), "activate",
merge_items_callback, index); 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); hyperbola_navigation_tree_load_location, contents);
return BONOBO_OBJECT (view_frame); return BONOBO_OBJECT (view_frame);
...@@ -536,9 +536,9 @@ hyperbola_navigation_tree_new (void) ...@@ -536,9 +536,9 @@ hyperbola_navigation_tree_new (void)
gtk_clist_freeze (GTK_CLIST (view->ctree)); gtk_clist_freeze (GTK_CLIST (view->ctree));
gtk_clist_set_selection_mode (GTK_CLIST (view->ctree), gtk_clist_set_selection_mode (GTK_CLIST (view->ctree),
GTK_SELECTION_BROWSE); 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); 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); hyperbola_navigation_tree_destroy, view);
...@@ -569,7 +569,7 @@ hyperbola_navigation_tree_new (void) ...@@ -569,7 +569,7 @@ hyperbola_navigation_tree_new (void)
view->view_frame = nautilus_view_new (wtmp); 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); hyperbola_navigation_tree_load_location, view);
return BONOBO_OBJECT (view->view_frame); return BONOBO_OBJECT (view->view_frame);
......
...@@ -300,16 +300,16 @@ nautilus_history_view_init (NautilusHistoryView *view) ...@@ -300,16 +300,16 @@ nautilus_history_view_init (NautilusHistoryView *view)
g_object_ref (G_OBJECT (list)); g_object_ref (G_OBJECT (list));
view->list = list; view->list = list;
g_signal_connect (G_OBJECT (list), g_signal_connect (list,
"button-press-event", "button-press-event",
button_press_callback, button_press_callback,
view); view);
g_signal_connect (G_OBJECT (list), g_signal_connect (list,
"button-release-event", "button-release-event",
button_release_callback, button_release_callback,
view); view);
g_signal_connect (G_OBJECT (view), g_signal_connect (view,
"history_changed", "history_changed",
history_changed_callback, history_changed_callback,
view); view);
......
...@@ -319,7 +319,7 @@ zoomable_zoom_in_callback (BonoboZoomable *zoomable, bonobo_object_data_t *bod) ...@@ -319,7 +319,7 @@ zoomable_zoom_in_callback (BonoboZoomable *zoomable, bonobo_object_data_t *bod)
new_zoom_level = zoom_level_from_index (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); new_zoom_level);
} }
...@@ -338,7 +338,7 @@ zoomable_zoom_out_callback (BonoboZoomable *zoomable, bonobo_object_data_t *bod) ...@@ -338,7 +338,7 @@ zoomable_zoom_out_callback (BonoboZoomable *zoomable, bonobo_object_data_t *bod)
index--; index--;
new_zoom_level = zoom_level_from_index (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); new_zoom_level);
} }
...@@ -361,7 +361,7 @@ zoomable_zoom_to_fit_callback (BonoboZoomable *zoomable, bonobo_object_data_t *b ...@@ -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; new_zoom_level = (x_level < y_level) ? x_level : y_level;