diff options
97 files changed, 544 insertions, 545 deletions
@@ -1,5 +1,10 @@ 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 DISABLE_DEPRECATED. * libnautilus/Makefile.am: Turn on all DISABLE_DEPRECATED. diff --git a/components/adapter/main.c b/components/adapter/main.c index c04d1ffab..25844840e 100644 --- a/components/adapter/main.c +++ b/components/adapter/main.c @@ -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); diff --git a/components/adapter/nautilus-adapter-control-embed-strategy.c b/components/adapter/nautilus-adapter-control-embed-strategy.c index 83a46a85f..7e76fc8d9 100644 --- a/components/adapter/nautilus-adapter-control-embed-strategy.c +++ b/components/adapter/nautilus-adapter-control-embed-strategy.c @@ -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); diff --git a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c index 07d16aaba..028e6d63c 100644 --- a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c +++ b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c @@ -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); diff --git a/components/adapter/nautilus-adapter-embed-strategy.c b/components/adapter/nautilus-adapter-embed-strategy.c index 192daf80b..54a55cd76 100644 --- a/components/adapter/nautilus-adapter-embed-strategy.c +++ b/components/adapter/nautilus-adapter-embed-strategy.c @@ -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); } diff --git a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c index 07d16aaba..028e6d63c 100644 --- a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c +++ b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c @@ -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); diff --git a/components/adapter/nautilus-adapter-factory-server.c b/components/adapter/nautilus-adapter-factory-server.c index 1645646fa..ce9815ec3 100644 --- a/components/adapter/nautilus-adapter-factory-server.c +++ b/components/adapter/nautilus-adapter-factory-server.c @@ -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; diff --git a/components/adapter/nautilus-adapter-load-strategy.c b/components/adapter/nautilus-adapter-load-strategy.c index f71431707..6778719d8 100644 --- a/components/adapter/nautilus-adapter-load-strategy.c +++ b/components/adapter/nautilus-adapter-load-strategy.c @@ -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); } diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c index 22c55d557..5d0abb67c 100644 --- a/components/adapter/nautilus-adapter.c +++ b/components/adapter/nautilus-adapter.c @@ -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); diff --git a/components/hardware/main.c b/components/hardware/main.c index 7809e7529..61fd59eda 100644 --- a/components/hardware/main.c +++ b/components/hardware/main.c @@ -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); } diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c index 9822b33bf..393397f2d 100644 --- a/components/hardware/nautilus-hardware-view.c +++ b/components/hardware/nautilus-hardware-view.c @@ -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); diff --git a/components/help/hyperbola-main.c b/components/help/hyperbola-main.c index 84628d69c..686b23eaa 100644 --- a/components/help/hyperbola-main.c +++ b/components/help/hyperbola-main.c @@ -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); } diff --git a/components/help/hyperbola-nav-index.c b/components/help/hyperbola-nav-index.c index c7cfa1e06..7fb46fd83 100644 --- a/components/help/hyperbola-nav-index.c +++ b/components/help/hyperbola-nav-index.c @@ -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 */ diff --git a/components/help/hyperbola-nav-search.c b/components/help/hyperbola-nav-search.c index 2e0f8ad47..5b91169aa 100644 --- a/components/help/hyperbola-nav-search.c +++ b/components/help/hyperbola-nav-search.c @@ -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 = diff --git a/components/help/hyperbola-nav-tree.c b/components/help/hyperbola-nav-tree.c index 9d1857a84..838a5d742 100644 --- a/components/help/hyperbola-nav-tree.c +++ b/components/help/hyperbola-nav-tree.c @@ -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); diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c index 7519f66b1..95448f268 100644 --- a/components/history/nautilus-history-view.c +++ b/components/history/nautilus-history-view.c @@ -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); diff --git a/components/image-viewer/nautilus-image-view.c b/components/image-viewer/nautilus-image-view.c index 13796550a..45248741b 100644 --- a/components/image-viewer/nautilus-image-view.c +++ b/components/image-viewer/nautilus-image-view.c @@ -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); diff --git a/components/loser/content/main.c b/components/loser/content/main.c index b183f27d2..817c01618 100644 --- a/components/loser/content/main.c +++ b/components/loser/content/main.c @@ -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"); diff --git a/components/loser/content/nautilus-content-loser.c b/components/loser/content/nautilus-content-loser.c index 9f1620fe0..d9b89c413 100644 --- a/components/loser/content/nautilus-content-loser.c +++ b/components/loser/content/nautilus-content-loser.c @@ -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)); } diff --git a/components/loser/sidebar/main.c b/components/loser/sidebar/main.c index d32ee0805..797ffd99f 100644 --- a/components/loser/sidebar/main.c +++ b/components/loser/sidebar/main.c @@ -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"); diff --git a/components/loser/sidebar/nautilus-sidebar-loser.c b/components/loser/sidebar/nautilus-sidebar-loser.c index ef99cc7a5..123699e63 100644 --- a/components/loser/sidebar/nautilus-sidebar-loser.c +++ b/components/loser/sidebar/nautilus-sidebar-loser.c @@ -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)); } diff --git a/components/mozilla/main.c b/components/mozilla/main.c index d344cb867..d9cb6e131 100644 --- a/components/mozilla/main.c +++ b/components/mozilla/main.c @@ -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) { diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c index f54f24dc1..97e8e5d88 100644 --- a/components/mozilla/nautilus-mozilla-content-view.c +++ b/components/mozilla/nautilus-mozilla-content-view.c @@ -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); diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c index a757092a3..acf1165e3 100644 --- a/components/music/nautilus-music-view.c +++ b/components/music/nautilus-music-view.c @@ -292,7 +292,7 @@ nautilus_music_view_init (NautilusMusicView *music_view) music_view->details->event_box = gtk_event_box_new (); gtk_widget_show (music_view->details->event_box); - g_signal_connect (G_OBJECT (music_view->details->event_box), + g_signal_connect (music_view->details->event_box, "drag_data_received", nautilus_music_view_drag_data_received, music_view); @@ -301,12 +301,12 @@ nautilus_music_view_init (NautilusMusicView *music_view) music_view->details->event_box); - g_signal_connect (G_OBJECT (music_view), + g_signal_connect (music_view, "load_location", music_view_load_location_callback, music_view); - g_signal_connect (G_OBJECT (eel_get_widget_background (GTK_WIDGET (music_view->details->event_box))), + g_signal_connect (eel_get_widget_background (GTK_WIDGET (music_view->details->event_box)), "appearance_changed", music_view_background_appearance_changed_callback, music_view); @@ -339,7 +339,7 @@ nautilus_music_view_init (NautilusMusicView *music_view) gtk_widget_show (music_view->details->song_list); - g_signal_connect (G_OBJECT (music_view->details->song_list), + g_signal_connect (music_view->details->song_list, "get_cell_text", G_CALLBACK (get_cell_text), NULL); @@ -361,7 +361,7 @@ eel_clist_set_column_width (EEL_CLIST (music_view->details->song_list), BITRATE, eel_clist_set_column_justification(EEL_CLIST(music_view->details->song_list), BITRATE, GTK_JUSTIFY_RIGHT); eel_clist_set_column_justification(EEL_CLIST(music_view->details->song_list), TIME, GTK_JUSTIFY_RIGHT); - g_signal_connect (G_OBJECT (music_view->details->song_list), + g_signal_connect (music_view->details->song_list, "select-row", selection_callback, music_view); music_view->details->scroll_window = gtk_scrolled_window_new (NULL, eel_clist_get_vadjustment (EEL_CLIST (music_view->details->song_list))); @@ -373,11 +373,11 @@ eel_clist_set_column_width (EEL_CLIST (music_view->details->song_list), BITRATE, gtk_box_pack_start (GTK_BOX (music_view->details->album_container), music_view->details->scroll_window, TRUE, TRUE, 0); /* We have to know when we the adjustment is changed to cause a redraw due to a lame CList bug */ - g_signal_connect (G_OBJECT (eel_clist_get_vadjustment (EEL_CLIST (music_view->details->song_list))), + g_signal_connect (eel_clist_get_vadjustment (EEL_CLIST (music_view->details->song_list)), "value-changed", value_changed_callback, music_view->details->song_list); /* connect a signal to let us know when the column titles are clicked */ - g_signal_connect (G_OBJECT (music_view->details->song_list), "click_column", + g_signal_connect (music_view->details->song_list, "click_column", click_column_callback, music_view); gtk_widget_show (music_view->details->song_list); @@ -398,7 +398,7 @@ eel_clist_set_column_width (EEL_CLIST (music_view->details->song_list), BITRATE, gtk_widget_show (label); gtk_container_add (GTK_CONTAINER(button), label); gtk_box_pack_end (GTK_BOX(music_view->details->control_box), music_view->details->image_box, FALSE, FALSE, 4); - g_signal_connect (G_OBJECT (button), "clicked", image_button_callback, music_view); + g_signal_connect (button, "clicked", image_button_callback, music_view); /* prepare ourselves to receive dropped objects */ gtk_drag_dest_set (GTK_WIDGET (music_view->details->event_box), @@ -822,11 +822,11 @@ image_button_callback (GtkWidget * widget, NautilusMusicView *music_view) (_("Select an image file for the album cover:")); file_dialog = GTK_FILE_SELECTION (music_view->details->dialog); - g_signal_connect (G_OBJECT (music_view->details->dialog), + g_signal_connect (music_view->details->dialog, "destroy", (GtkSignalFunc) dialog_destroy, music_view); - g_signal_connect (G_OBJECT (file_dialog->ok_button), + g_signal_connect (file_dialog->ok_button, "clicked", (GtkSignalFunc) set_album_cover, music_view); @@ -1580,11 +1580,11 @@ add_play_controls (NautilusMusicView *music_view) music_view->details->playtime_adjustment = gtk_adjustment_new (0, 0, 101, 1, 5, 1); music_view->details->playtime_bar = gtk_hscale_new (GTK_ADJUSTMENT (music_view->details->playtime_adjustment)); - g_signal_connect (G_OBJECT (music_view->details->playtime_bar), "button_press_event", + g_signal_connect (music_view->details->playtime_bar, "button_press_event", G_CALLBACK (slider_press_callback), music_view); - g_signal_connect (G_OBJECT (music_view->details->playtime_bar), "button_release_event", + g_signal_connect (music_view->details->playtime_bar, "button_release_event", G_CALLBACK (slider_release_callback), music_view); - g_signal_connect (G_OBJECT (music_view->details->playtime_bar), "motion_notify_event", + g_signal_connect (music_view->details->playtime_bar, "motion_notify_event", G_CALLBACK (slider_moved_callback), music_view); gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), music_view->details->playtime_bar, @@ -1616,7 +1616,7 @@ add_play_controls (NautilusMusicView *music_view) music_view->details->previous_track_button = gtk_button_new (); gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), music_view->details->previous_track_button, _("Previous"), NULL); gtk_container_add (GTK_CONTAINER (music_view->details->previous_track_button), box); - g_signal_connect (G_OBJECT (music_view->details->previous_track_button), "clicked", G_CALLBACK (prev_button_callback), music_view); + g_signal_connect (music_view->details->previous_track_button, "clicked", G_CALLBACK (prev_button_callback), music_view); gtk_widget_set_sensitive (music_view->details->previous_track_button, TRUE); gtk_button_set_relief (GTK_BUTTON (music_view->details->previous_track_button), GTK_RELIEF_NORMAL); gtk_box_pack_start (GTK_BOX (hbox), music_view->details->previous_track_button, FALSE, FALSE, 0); @@ -1632,7 +1632,7 @@ add_play_controls (NautilusMusicView *music_view) gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NORMAL); gtk_container_add (GTK_CONTAINER (button), box); gtk_widget_set_sensitive (button, TRUE); - g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (play_button_callback), music_view); + g_signal_connect (button, "clicked", G_CALLBACK (play_button_callback), music_view); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_widget_show (button); @@ -1647,7 +1647,7 @@ add_play_controls (NautilusMusicView *music_view) gtk_container_add (GTK_CONTAINER (music_view->details->pause_button), box); gtk_widget_set_sensitive (music_view->details->pause_button, TRUE); - g_signal_connect (G_OBJECT (music_view->details->pause_button), "clicked", + g_signal_connect (music_view->details->pause_button, "clicked", G_CALLBACK(pause_button_callback), music_view); gtk_box_pack_start (GTK_BOX (hbox), music_view->details->pause_button, FALSE, FALSE, 0); gtk_widget_show (music_view->details->pause_button); @@ -1661,7 +1661,7 @@ add_play_controls (NautilusMusicView *music_view) gtk_container_add (GTK_CONTAINER (music_view->details->stop_button), box); gtk_widget_set_sensitive (music_view->details->stop_button, TRUE); - g_signal_connect (G_OBJECT (music_view->details->stop_button), "clicked", + g_signal_connect (music_view->details->stop_button, "clicked", G_CALLBACK (stop_button_callback), music_view); gtk_box_pack_start (GTK_BOX (hbox), music_view->details->stop_button, FALSE, FALSE, 0); gtk_widget_show (music_view->details->stop_button); @@ -1675,7 +1675,7 @@ add_play_controls (NautilusMusicView *music_view) gtk_container_add (GTK_CONTAINER (music_view->details->next_track_button), box); gtk_widget_set_sensitive (music_view->details->next_track_button, TRUE); - g_signal_connect (G_OBJECT (music_view->details->next_track_button), "clicked", + g_signal_connect (music_view->details->next_track_button, "clicked", G_CALLBACK (next_button_callback), music_view); gtk_box_pack_start (GTK_BOX (hbox), music_view->details->next_track_button, FALSE, FALSE, 0); gtk_widget_show (music_view->details->next_track_button); diff --git a/components/news/nautilus-news.c b/components/news/nautilus-news.c index 165ef4e38..3621c5928 100644 --- a/components/news/nautilus-news.c +++ b/components/news/nautilus-news.c @@ -2009,14 +2009,14 @@ add_command_buttons (News *news_data, const char* label, gboolean from_configure button = gtk_button_new_with_label (_("Edit")); gtk_container_add (GTK_CONTAINER (button_box), button); - g_signal_connect (G_OBJECT (button), "clicked", + g_signal_connect (button, "clicked", (GtkSignalFunc) add_site_button_clicked, news_data); } button = gtk_button_new_from_stock (label); gtk_container_add (GTK_CONTAINER (button_box), button); - g_signal_connect (G_OBJECT (button), "clicked", + g_signal_connect (button, "clicked", (GtkSignalFunc) configure_button_clicked, news_data); return frame; @@ -2111,7 +2111,7 @@ add_channel_entry (News *news_data, const char *channel_name, int index, gboolea gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), is_showing); gtk_box_pack_start (GTK_BOX (news_data->checkbox_list), check_button, FALSE, FALSE, 0); - g_signal_connect (G_OBJECT (check_button), "toggled", + g_signal_connect (check_button, "toggled", G_CALLBACK (check_button_toggled_callback), news_data); @@ -2253,7 +2253,7 @@ make_remove_widgets (News *news, GtkWidget *container) gtk_clist_set_selection_mode (GTK_CLIST (news->remove_site_list), GTK_SELECTION_BROWSE); gtk_clist_set_auto_sort (GTK_CLIST (news->remove_site_list), TRUE); - g_signal_connect (G_OBJECT (news->remove_site_list), "select_row", + g_signal_connect (news->remove_site_list, "select_row", G_CALLBACK (select_row_in_remove_list), news); scrolled_window = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new (NULL, NULL)); @@ -2271,7 +2271,7 @@ make_remove_widgets (News *news, GtkWidget *container) news->remove_button = gtk_button_new_with_label (_("Remove Site")); gtk_container_add (GTK_CONTAINER (button_box), news->remove_button); - g_signal_connect (G_OBJECT (news->remove_button), "clicked", + g_signal_connect (news->remove_button, "clicked", (GtkSignalFunc) remove_selected_site, news); } @@ -2316,7 +2316,7 @@ make_add_widgets (News *news, GtkWidget *container) button = gtk_button_new_with_label (_("Add New Site")); gtk_container_add (GTK_CONTAINER (button_box), button); - g_signal_connect (G_OBJECT (button), "clicked", + g_signal_connect (button, "clicked", (GtkSignalFunc) add_site_from_fields, news); } @@ -2423,16 +2423,16 @@ set_up_main_widgets (News *news, GtkWidget *container) TRUE, 0); /* connect the appropriate signals for drawing and event handling */ - g_signal_connect (G_OBJECT (news->news_display), "expose_event", + g_signal_connect (news->news_display, "expose_event", (GtkSignalFunc) nautilus_news_expose_event, news); gtk_signal_connect (GTK_OBJECT(news->news_display),"configure_event", (GtkSignalFunc) nautilus_news_configure_event, news); - g_signal_connect (G_OBJECT (news->news_display), "motion_notify_event", + g_signal_connect (news->news_display, "motion_notify_event", (GtkSignalFunc) nautilus_news_motion_notify_event, news); - g_signal_connect (G_OBJECT (news->news_display), "leave_notify_event", + g_signal_connect (news->news_display, "leave_notify_event", (GtkSignalFunc) nautilus_news_leave_notify_event, news); - g_signal_connect (G_OBJECT (news->news_display), "button_release_event", + g_signal_connect (news->news_display, "button_release_event", (GtkSignalFunc) nautilus_news_button_release_event, news); gtk_widget_set_events (news->news_display, GDK_EXPOSURE_MASK @@ -2488,14 +2488,14 @@ make_news_view (const char *iid, gpointer callback_data) news->timer_task = gtk_timeout_add (10000, check_for_updates, news); /* arrange for notification when we're resized */ - g_signal_connect (G_OBJECT (news->news_display), "size_allocate", news_display_size_allocate, news); - g_signal_connect (G_OBJECT (news->empty_message), "size_allocate", empty_message_size_allocate, news); + g_signal_connect (news->news_display, "size_allocate", news_display_size_allocate, news); + g_signal_connect (news->empty_message, "size_allocate", empty_message_size_allocate, news); /* Create the nautilus view CORBA object. */ news->view = nautilus_view_new (main_container); - g_signal_connect (G_OBJECT (news->view), "destroy", do_destroy, news); + g_signal_connect (news->view, "destroy", do_destroy, news); - g_signal_connect (G_OBJECT (news->view), "load_location", + g_signal_connect (news->view, "load_location", nautilus_news_load_location, news); /* allocate a property bag to reflect the TAB_IMAGE property */ diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c index 34ad841b1..3162274bd 100644 --- a/components/notes/nautilus-notes.c +++ b/components/notes/nautilus-notes.c @@ -223,7 +223,7 @@ notes_load_metainfo (Notes *notes) g_list_free (attributes); - g_signal_connect (G_OBJECT (notes->file), + g_signal_connect (notes->file, "changed", G_CALLBACK (load_note_text_from_metadata), notes); @@ -376,10 +376,10 @@ make_notes_view (const char *iid, gpointer callback_data) background = eel_get_widget_background (notes->note_text_field); eel_background_set_color (background, NOTES_DEFAULT_BACKGROUND_COLOR); - g_signal_connect (G_OBJECT (notes->note_text_field), "focus_out_event", + g_signal_connect (notes->note_text_field, "focus_out_event", G_CALLBACK (on_text_field_focus_out_event), notes); - g_signal_connect (G_OBJECT (notes->note_text_field), "changed", + g_signal_connect (notes->note_text_field, "changed", G_CALLBACK (on_changed), notes); @@ -387,7 +387,7 @@ make_notes_view (const char *iid, gpointer callback_data) /* Create CORBA object. */ notes->view = nautilus_view_new (vbox); - g_signal_connect (G_OBJECT (notes->view), "destroy", do_destroy, notes); + g_signal_connect (notes->view, "destroy", do_destroy, notes); /* allocate a property bag to reflect the TAB_IMAGE property */ notes->property_bag = bonobo_property_bag_new (get_bonobo_properties, set_bonobo_properties, notes); @@ -397,7 +397,7 @@ make_notes_view (const char *iid, gpointer callback_data) "image indicating that a note is present", 0); /* handle events */ - g_signal_connect (G_OBJECT (notes->view), "load_location", + g_signal_connect (notes->view, "load_location", notes_load_location, notes); /* handle selections */ diff --git a/components/sample/nautilus-sample-content-view.c b/components/sample/nautilus-sample-content-view.c index 3d1e14c52..ea7e9b78e 100644 --- a/components/sample/nautilus-sample-content-view.c +++ b/components/sample/nautilus-sample-content-view.c @@ -200,7 +200,7 @@ nautilus_sample_content_view_instance_init (NautilusSampleContentView *view) nautilus_view_construct (NAUTILUS_VIEW (view), view->details->label); - g_signal_connect (G_OBJECT (view), + g_signal_connect (view, "load_location", G_CALLBACK (sample_load_location_callback), NULL); @@ -208,7 +208,7 @@ nautilus_sample_content_view_instance_init (NautilusSampleContentView *view) /* Get notified when our bonobo control is activated so we can * merge menu & toolbar items into the shell's UI. */ - g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (view))), + g_signal_connect (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (view)), "activate", G_CALLBACK (sample_merge_bonobo_items_callback), view); diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c index 6e04f04a9..b075f52d4 100644 --- a/components/text/nautilus-text-view.c +++ b/components/text/nautilus-text-view.c @@ -159,13 +159,13 @@ nautilus_text_view_init (NautilusTextView *text_view) text_view->details->zoomable = bonobo_zoomable_new (); text_view->details->zoom_index = 3; - g_signal_connect (G_OBJECT (text_view->details->zoomable), "set_zoom_level", + g_signal_connect (text_view->details->zoomable, "set_zoom_level", G_CALLBACK (zoomable_set_zoom_level_callback), text_view); - g_signal_connect (G_OBJECT (text_view->details->zoomable), "zoom_in", + g_signal_connect (text_view->details->zoomable, "zoom_in", G_CALLBACK (zoomable_zoom_in_callback), text_view); - g_signal_connect (G_OBJECT (text_view->details->zoomable), "zoom_out", + g_signal_connect (text_view->details->zoomable, "zoom_out", G_CALLBACK (zoomable_zoom_out_callback), text_view); - g_signal_connect (G_OBJECT (text_view->details->zoomable), "zoom_to_fit", + g_signal_connect (text_view->details->zoomable, "zoom_to_fit", G_CALLBACK (zoomable_zoom_to_fit_callback), text_view); bonobo_zoomable_set_parameters_full (text_view->details->zoomable, @@ -177,7 +177,7 @@ nautilus_text_view_init (NautilusTextView *text_view) BONOBO_OBJECT (text_view->details->zoomable)); - g_signal_connect (G_OBJECT (text_view), + g_signal_connect (text_view, "load_location", text_view_load_location_callback, text_view); @@ -223,11 +223,10 @@ nautilus_text_view_init (NautilusTextView *text_view) gtk_container_add (GTK_CONTAINER (text_view->details->container), scrolled_window); /* get notified when we are activated so we can merge in our menu items */ - g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control - (NAUTILUS_VIEW (text_view))), - "activate", - merge_bonobo_menu_items, - text_view); + g_signal_connect (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (text_view))), + "activate", + merge_bonobo_menu_items, + text_view); /* finally, we can show everything */ gtk_widget_show_all (GTK_WIDGET (text_view->details->event_box)); @@ -779,7 +778,7 @@ merge_bonobo_menu_items (BonoboControl *control, gboolean state, gpointer user_d nautilus_text_view_build_service_menu (text_view, control); - g_signal_connect (G_OBJECT (bonobo_control_get_ui_component (control)), + g_signal_connect (bonobo_control_get_ui_component (control), "ui_event", handle_ui_event, text_view); nautilus_clipboard_set_up_editable_in_control (GTK_EDITABLE (text_view->details->text_display), diff --git a/components/throbber/main.c b/components/throbber/main.c index ecaf94156..5c87c2875 100644 --- a/components/throbber/main.c +++ b/components/throbber/main.c @@ -58,7 +58,7 @@ throbber_make_object (BonoboGenericFactory *factory, bonobo_control = nautilus_throbber_get_control (throbber); - g_signal_connect (G_OBJECT (bonobo_control), "destroy", throbber_object_destroyed, NULL); + g_signal_connect (bonobo_control, "destroy", throbber_object_destroyed, NULL); return bonobo_control; } diff --git a/components/tree/libmain.c b/components/tree/libmain.c index 4f750d87f..804f3b18a 100644 --- a/components/tree/libmain.c +++ b/components/tree/libmain.c @@ -55,7 +55,7 @@ tree_shlib_make_object (PortableServer_POA poa, view = NAUTILUS_TREE_VIEW (g_object_new (NAUTILUS_TYPE_TREE_VIEW, NULL)); #if 0 - g_signal_connect (G_OBJECT (view), "destroy", tree_shlib_object_destroyed, NULL); + g_signal_connect (view, "destroy", tree_shlib_object_destroyed, NULL); #endif bonobo_activation_plugin_use (poa, impl_ptr); diff --git a/components/tree/nautilus-tree-model.c b/components/tree/nautilus-tree-model.c index 44c295cee..745ef3f13 100644 --- a/components/tree/nautilus-tree-model.c +++ b/components/tree/nautilus-tree-model.c @@ -773,7 +773,7 @@ report_node_changed (NautilusTreeModel *model, nautilus_tree_node_get_file (node), node); - g_signal_emit (G_OBJECT (model), + g_signal_emit (model, signals[NODE_CHANGED], 0, node); @@ -786,7 +786,7 @@ report_node_changed (NautilusTreeModel *model, if (strcmp (file_uri, node_uri) == 0) { /* A normal change */ - g_signal_emit (G_OBJECT (model), + g_signal_emit (model, signals[NODE_CHANGED], 0, node); } else { @@ -799,7 +799,7 @@ report_node_changed (NautilusTreeModel *model, * it to propagate the expansion state from the old name to the * new name */ - g_signal_emit (G_OBJECT (model), + g_signal_emit (model, signals[NODE_BEING_RENAMED], 0, node->details->uri, file_uri); @@ -861,7 +861,7 @@ report_node_removed_internal (NautilusTreeModel *model, forget_unparented_node (model, node); if (signal) { - g_signal_emit (G_OBJECT (model), + g_signal_emit (model, signals[NODE_REMOVED], 0, node); } @@ -883,7 +883,7 @@ static void report_done_loading (NautilusTreeModel *model, NautilusTreeNode *node) { - g_signal_emit (G_OBJECT (model), + g_signal_emit (model, signals[DONE_LOADING_CHILDREN], 0, node); } diff --git a/components/tree/nautilus-tree-view-dnd.c b/components/tree/nautilus-tree-view-dnd.c index 5e8837ce1..d66cc1939 100644 --- a/components/tree/nautilus-tree-view-dnd.c +++ b/components/tree/nautilus-tree-view-dnd.c @@ -210,55 +210,55 @@ nautilus_tree_view_init_dnd (NautilusTreeView *view) | GDK_ACTION_ASK); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "drag_begin", G_CALLBACK(nautilus_tree_view_drag_begin), view); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "drag_end", G_CALLBACK(nautilus_tree_view_drag_end), view); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "drag_leave", G_CALLBACK(nautilus_tree_view_drag_leave), view); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "drag_motion", G_CALLBACK(nautilus_tree_view_drag_motion), view); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "drag_drop", G_CALLBACK(nautilus_tree_view_drag_drop), view); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "drag_data_received", G_CALLBACK(nautilus_tree_view_drag_data_received), view); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "drag_data_get", G_CALLBACK(nautilus_tree_view_drag_data_get), view); /* override the default handlers */ - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "button-press-event", G_CALLBACK (nautilus_tree_view_button_press), NULL); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "button-release-event", G_CALLBACK (nautilus_tree_view_button_release), NULL); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "motion-notify-event", G_CALLBACK (nautilus_tree_view_motion_notify), NULL); - g_signal_connect (G_OBJECT (view->details->tree), "realize", + g_signal_connect (view->details->tree, "realize", tree_view_realize_callback, view); } diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c index b1f4803f5..874253cda 100644 --- a/components/tree/nautilus-tree-view.c +++ b/components/tree/nautilus-tree-view.c @@ -783,19 +783,19 @@ nautilus_tree_view_load_from_filesystem (NautilusTreeView *view) nautilus_tree_view_model_node_changed_callback, view); - g_signal_connect (G_OBJECT (view->details->model), + g_signal_connect (view->details->model, "node_changed", nautilus_tree_view_model_node_changed_callback, view); - g_signal_connect (G_OBJECT (view->details->model), + g_signal_connect (view->details->model, "node_removed", nautilus_tree_view_model_node_removed_callback, view); - g_signal_connect (G_OBJECT (view->details->model), + g_signal_connect (view->details->model, "node_being_renamed", nautilus_tree_view_model_node_renamed_callback, view); - g_signal_connect (G_OBJECT (view->details->model), + g_signal_connect (view->details->model, "done_loading_children", nautilus_tree_view_model_done_loading_callback, view); @@ -946,17 +946,17 @@ create_tree (NautilusTreeView *view) + view->details->tree->style->font->descent)); eel_ctree_set_indent (EEL_CTREE (view->details->tree), 12); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "tree_expand", G_CALLBACK (tree_expand_callback), view); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "tree_collapse", G_CALLBACK (tree_collapse_callback), view); - g_signal_connect (G_OBJECT (view->details->tree), + g_signal_connect (view->details->tree, "tree_select_row", G_CALLBACK (tree_select_row_callback), view); @@ -1045,7 +1045,7 @@ nautilus_tree_view_init (NautilusTreeView *view) view->details->show_non_directories = ! eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES); - g_signal_connect (G_OBJECT (view), + g_signal_connect (view, "load_location", G_CALLBACK (tree_load_location_callback), view); @@ -1061,11 +1061,11 @@ nautilus_tree_view_init (NautilusTreeView *view) nautilus_view_construct (NAUTILUS_VIEW (view), view->details->scrolled_window); - g_signal_connect (G_OBJECT (view->details->scrolled_window), + g_signal_connect (view->details->scrolled_window, "map", tree_map_callback, view); - g_signal_connect (G_OBJECT (view->details->scrolled_window), + g_signal_connect (view->details->scrolled_window, "unmap", tree_unmap_callback, view); diff --git a/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c b/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c index d36675975..e6de3af41 100644 --- a/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c +++ b/cut-n-paste-code/widgets/gimphwrapbox/gtkhwrapbox.c @@ -540,12 +540,12 @@ layout_rows (GtkWrapBox *wbox, } GTK_HWRAP_BOX (wbox)->request_this_height_next_time = total_height; if (!(GTK_HWRAP_BOX (wbox)->request_stored_height )) { - g_signal_emit_by_name (GTK_OBJECT (wbox), "need_reallocation", NULL); + g_signal_emit_by_name (wbox, "need_reallocation", NULL); GTK_HWRAP_BOX (wbox)->request_stored_height = TRUE; } if (total_height > area->height) { shrink_height = total_height - area->height; - g_signal_emit_by_name (GTK_OBJECT (wbox), "need_reallocation", NULL); + g_signal_emit_by_name (wbox, "need_reallocation", NULL); } else shrink_height = 0; diff --git a/libnautilus-private/nautilus-authn-manager.c b/libnautilus-private/nautilus-authn-manager.c index 141162c51..cc5e93bd1 100644 --- a/libnautilus-private/nautilus-authn-manager.c +++ b/libnautilus-private/nautilus-authn-manager.c @@ -163,17 +163,17 @@ present_authentication_dialog_nonblocking (CallbackInfo *info) gtk_window_set_modal (GTK_WINDOW (dialog), FALSE); - g_signal_connect (G_OBJECT (dialog), + g_signal_connect (dialog, "clicked", G_CALLBACK (authentication_dialog_button_clicked), info); - g_signal_connect (G_OBJECT (dialog), + g_signal_connect (dialog, "close", G_CALLBACK (authentication_dialog_closed), info); - g_signal_connect (G_OBJECT (dialog), + g_signal_connect (dialog, "destroy", G_CALLBACK (authentication_dialog_destroyed), info); diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c index 20fc5226e..1aa0807df 100644 --- a/libnautilus-private/nautilus-bookmark.c +++ b/libnautilus-private/nautilus-bookmark.c @@ -298,7 +298,7 @@ nautilus_bookmark_set_name (NautilusBookmark *bookmark, const char *new_name) g_free (bookmark->details->name); bookmark->details->name = g_strdup (new_name); - g_signal_emit (G_OBJECT (bookmark), signals[APPEARANCE_CHANGED], 0); + g_signal_emit (bookmark, signals[APPEARANCE_CHANGED], 0); } static gboolean @@ -411,11 +411,11 @@ bookmark_file_changed_callback (NautilusFile *file, NautilusBookmark *bookmark) } if (should_emit_appearance_changed_signal) { - g_signal_emit (G_OBJECT (bookmark), signals[APPEARANCE_CHANGED], 0); + g_signal_emit (bookmark, signals[APPEARANCE_CHANGED], 0); } if (should_emit_contents_changed_signal) { - g_signal_emit (G_OBJECT (bookmark), signals[CONTENTS_CHANGED], 0); + g_signal_emit (bookmark, signals[CONTENTS_CHANGED], 0); } } @@ -495,7 +495,7 @@ nautilus_bookmark_connect_file (NautilusBookmark *bookmark) bookmark->details->file = nautilus_file_get (bookmark->details->uri); g_assert (!nautilus_file_is_gone (bookmark->details->file)); - g_signal_connect (G_OBJECT (bookmark->details->file), + g_signal_connect (bookmark->details->file, "changed", G_CALLBACK (bookmark_file_changed_callback), bookmark); diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c index 439bb347e..6ef421d97 100644 --- a/libnautilus-private/nautilus-directory-background.c +++ b/libnautilus-private/nautilus-directory-background.c @@ -110,7 +110,7 @@ nautilus_connect_desktop_background_to_file_metadata (NautilusIconContainer *ico if (GTK_WIDGET_REALIZED (icon_container)) { desktop_background_realized (icon_container, GINT_TO_POINTER (FALSE)); } else { - g_signal_connect (G_OBJECT (icon_container), "realize", G_CALLBACK (desktop_background_realized), GINT_TO_POINTER (TRUE)); + g_signal_connect (icon_container, "realize", G_CALLBACK (desktop_background_realized), GINT_TO_POINTER (TRUE)); } nautilus_file_background_receive_root_window_changes (background); @@ -542,7 +542,7 @@ nautilus_file_background_receive_root_window_changes (EelBackground *background) gdk_flush (); gdk_error_trap_pop (); - g_signal_connect (G_OBJECT (background), + g_signal_connect (background, "destroy", G_CALLBACK (desktop_background_destroyed_callback), NULL); @@ -672,7 +672,7 @@ nautilus_file_update_desktop_pixmaps (EelBackground *background) if (eel_background_is_loaded (background)) { image_loading_done_callback (background, TRUE, GINT_TO_POINTER (FALSE)); } else { - g_signal_connect (G_OBJECT (background), + g_signal_connect (background, "image_loading_done", G_CALLBACK (image_loading_done_callback), GINT_TO_POINTER (TRUE)); @@ -957,19 +957,19 @@ nautilus_connect_background_to_file_metadata (GtkWidget *widget, /* Connect new signal handlers. */ if (file != NULL) { - g_signal_connect (G_OBJECT (background), + g_signal_connect (background, "settings_changed", G_CALLBACK (background_changed_callback), file); - g_signal_connect (G_OBJECT (background), + g_signal_connect (background, "destroy", G_CALLBACK (background_destroyed_callback), file); - g_signal_connect (G_OBJECT (background), + g_signal_connect (background, "reset", G_CALLBACK (background_reset_callback), file); - g_signal_connect (G_OBJECT (file), + g_signal_connect (file, "changed", G_CALLBACK (saved_settings_changed_callback), background); diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c index 796be7e89..5d3a935dc 100644 --- a/libnautilus-private/nautilus-directory.c +++ b/libnautilus-private/nautilus-directory.c @@ -683,7 +683,7 @@ nautilus_directory_emit_files_added (NautilusDirectory *directory, GList *added_files) { if (added_files != NULL) { - g_signal_emit (G_OBJECT (directory), + g_signal_emit (directory, signals[FILES_ADDED], 0, added_files); } @@ -694,7 +694,7 @@ nautilus_directory_emit_files_changed (NautilusDirectory *directory, GList *changed_files) { if (changed_files != NULL) { - g_signal_emit (G_OBJECT (directory), + g_signal_emit (directory, signals[FILES_CHANGED], 0, changed_files); } @@ -715,7 +715,7 @@ nautilus_directory_emit_change_signals (NautilusDirectory *directory, void nautilus_directory_emit_done_loading (NautilusDirectory *directory) { - g_signal_emit (G_OBJECT (directory), + g_signal_emit (directory, signals[DONE_LOADING], 0); } @@ -723,7 +723,7 @@ void nautilus_directory_emit_load_error (NautilusDirectory *directory, GnomeVFSResult error_result) { - g_signal_emit (G_OBJECT (directory), + g_signal_emit (directory, signals[LOAD_ERROR], 0, error_result); } @@ -802,7 +802,7 @@ call_files_added_free_list (gpointer key, gpointer value, gpointer user_data) g_assert (value != NULL); g_assert (user_data == NULL); - g_signal_emit (G_OBJECT (key), + g_signal_emit (key, signals[FILES_ADDED], 0, value); g_list_free (value); diff --git a/libnautilus-private/nautilus-drag-window.c b/libnautilus-private/nautilus-drag-window.c index 798e345cf..756acaf90 100644 --- a/libnautilus-private/nautilus-drag-window.c +++ b/libnautilus-private/nautilus-drag-window.c @@ -408,8 +408,8 @@ nautilus_drag_window_register (GtkWindow *window) NAUTILUS_DRAG_WINDOW_DETAILS_KEY, details, g_free); - g_signal_connect (G_OBJECT (window), "realize", + g_signal_connect (window, "realize", G_CALLBACK (nautilus_drag_window_realize), NULL); - g_signal_connect (G_OBJECT (window), "destroy", + g_signal_connect (window, "destroy", G_CALLBACK (nautilus_drag_window_destroy), NULL); } diff --git a/libnautilus-private/nautilus-entry.c b/libnautilus-private/nautilus-entry.c index ee7889c9e..64f8043e4 100644 --- a/libnautilus-private/nautilus-entry.c +++ b/libnautilus-private/nautilus-entry.c @@ -200,7 +200,7 @@ nautilus_entry_key_press (GtkWidget *widget, GdkEventKey *event) if (result) { new_has = gtk_editable_get_selection_bounds (editable, NULL, NULL); if (old_has || new_has) { - g_signal_emit (G_OBJECT (widget), signals[SELECTION_CHANGED], 0); + g_signal_emit (widget, signals[SELECTION_CHANGED], 0); } } @@ -238,7 +238,7 @@ nautilus_entry_motion_notify (GtkWidget *widget, GdkEventMotion *event) if (result) { new_had = gtk_editable_get_selection_bounds (editable, &new_start, &new_end); if (old_had != new_had || (old_had && (old_start != new_start || old_end != new_end))) { - g_signal_emit (G_OBJECT (widget), signals[SELECTION_CHANGED], 0); + g_signal_emit (widget, signals[SELECTION_CHANGED], 0); } } @@ -318,7 +318,7 @@ nautilus_entry_set_text (NautilusEntry *entry, const gchar *text) gtk_entry_set_text (GTK_ENTRY (entry), text); entry->details->user_edit = TRUE; - g_signal_emit (G_OBJECT (entry), signals[SELECTION_CHANGED], 0); + g_signal_emit (entry, signals[SELECTION_CHANGED], 0); } #if GNOME2_CONVERSION_COMPLETE @@ -331,7 +331,7 @@ nautilus_entry_set_selection_bounds (GtkEditable *editable, EEL_CALL_PARENT (GTK_EDITABLE_CLASS, set_selection_bounds, (editable, start_pos, end_pos)); - g_signal_emit (G_OBJECT (editable), signals[SELECTION_CHANGED], 0); + g_signal_emit (editable, signals[SELECTION_CHANGED], 0); } #endif @@ -346,7 +346,7 @@ nautilus_entry_button_press (GtkWidget *widget, (GTK_WIDGET_CLASS, button_press_event, (widget, event)); if (result) { - g_signal_emit (G_OBJECT (widget), signals[SELECTION_CHANGED], 0); + g_signal_emit (widget, signals[SELECTION_CHANGED], 0); } return result; @@ -362,7 +362,7 @@ nautilus_entry_button_release (GtkWidget *widget, (GTK_WIDGET_CLASS, button_release_event, (widget, event)); if (result) { - g_signal_emit (G_OBJECT (widget), signals[SELECTION_CHANGED], 0); + g_signal_emit (widget, signals[SELECTION_CHANGED], 0); } return result; @@ -380,13 +380,13 @@ nautilus_entry_insert_text (GtkEditable *editable, const gchar *text, /* Fire off user changed signals */ if (entry->details->user_edit) { - g_signal_emit (G_OBJECT (editable), signals[USER_CHANGED], 0); + g_signal_emit (editable, signals[USER_CHANGED], 0); } EEL_CALL_PARENT (GTK_EDITABLE_CLASS, insert_text, (editable, text, length, position)); - g_signal_emit (G_OBJECT (editable), signals[SELECTION_CHANGED], 0); + g_signal_emit (editable, signals[SELECTION_CHANGED], 0); } static void @@ -398,13 +398,13 @@ nautilus_entry_delete_text (GtkEditable *editable, int start_pos, int end_pos) /* Fire off user changed signals */ if (entry->details->user_edit) { - g_signal_emit (G_OBJECT (editable), signals[USER_CHANGED], 0); + g_signal_emit (editable, signals[USER_CHANGED], 0); } EEL_CALL_PARENT (GTK_EDITABLE_CLASS, delete_text, (editable, start_pos, end_pos)); - g_signal_emit (G_OBJECT (editable), signals[SELECTION_CHANGED], 0); + g_signal_emit (editable, signals[SELECTION_CHANGED], 0); } #endif diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c index ddbf0a675..505b653f5 100644 --- a/libnautilus-private/nautilus-file-operations.c +++ b/libnautilus-private/nautilus-file-operations.c @@ -360,11 +360,11 @@ create_transfer_dialog (const GnomeVFSXferProgressInfo *progress_info, /* Treat clicking on the close box or use of the escape key * the same as clicking cancel. */ - g_signal_connect (G_OBJECT (transfer_info->progress_dialog), + g_signal_connect (transfer_info->progress_dialog, "response", G_CALLBACK (handle_response_callback), NULL); - g_signal_connect (G_OBJECT (transfer_info->progress_dialog), + g_signal_connect (transfer_info->progress_dialog, "close", G_CALLBACK (handle_close_callback), transfer_info); diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 45d6d6e80..2f11dde95 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -4674,7 +4674,7 @@ nautilus_file_updated_deep_count_in_progress (NautilusFile *file) { g_assert (nautilus_file_is_directory (file)); /* Send out a signal. */ - g_signal_emit (G_OBJECT (file), signals[UPDATED_DEEP_COUNT_IN_PROGRESS], 0, file); + g_signal_emit (file, signals[UPDATED_DEEP_COUNT_IN_PROGRESS], 0, file); /* Tell link files pointing to this object about the change. */ link_files = get_link_files (file); @@ -4709,7 +4709,7 @@ nautilus_file_emit_changed (NautilusFile *file) file->details->compare_by_emblem_cache = NULL; /* Send out a signal. */ - g_signal_emit (G_OBJECT (file), signals[CHANGED], 0, file); + g_signal_emit (file, signals[CHANGED], 0, file); /* Tell link files pointing to this object about the change. */ link_files = get_link_files (file); diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c index b9070336f..16e759e14 100644 --- a/libnautilus-private/nautilus-icon-canvas-item.c +++ b/libnautilus-private/nautilus-icon-canvas-item.c @@ -584,7 +584,7 @@ nautilus_icon_canvas_item_update_bounds (NautilusIconCanvasItem *item) /* Send out the bounds_changed signal and queue a redraw. */ eel_gnome_canvas_request_redraw_rectangle (GNOME_CANVAS_ITEM (item)->canvas, before); - g_signal_emit (G_OBJECT (item), + g_signal_emit (item, signals[BOUNDS_CHANGED], 0); eel_gnome_canvas_item_request_redraw (GNOME_CANVAS_ITEM (item)); diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c index 75f2a392b..7427b35fd 100644 --- a/libnautilus-private/nautilus-icon-container.c +++ b/libnautilus-private/nautilus-icon-container.c @@ -313,7 +313,7 @@ icon_raise (NautilusIcon *icon) static void emit_stretch_started (NautilusIconContainer *container, NautilusIcon *icon) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[ICON_STRETCH_STARTED], 0, icon->data); } @@ -321,7 +321,7 @@ emit_stretch_started (NautilusIconContainer *container, NautilusIcon *icon) static void emit_stretch_ended (NautilusIconContainer *container, NautilusIcon *icon) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[ICON_STRETCH_ENDED], 0, icon->data); } @@ -449,7 +449,7 @@ set_pending_icon_to_reveal (NautilusIconContainer *container, NautilusIcon *icon } if (icon != NULL) { - g_signal_connect (G_OBJECT (icon->item), "destroy", + g_signal_connect (icon->item, "destroy", G_CALLBACK (pending_icon_to_reveal_destroy_callback), container); } @@ -707,7 +707,7 @@ compare_icons (gconstpointer a, gconstpointer b) icon_b = b; result = 0; - g_signal_emit (G_OBJECT (sort_hack_container), + g_signal_emit (sort_hack_container, signals[COMPARE_ICONS], 0, icon_a->data, icon_b->data, @@ -733,7 +733,7 @@ compare_icons_by_name (gconstpointer a, gconstpointer b) icon_b = b; result = 0; - g_signal_emit (G_OBJECT (sort_hack_container), + g_signal_emit (sort_hack_container, signals[COMPARE_ICONS_BY_NAME], 0, icon_a->data, icon_b->data, @@ -1246,7 +1246,7 @@ reload_icon_positions (NautilusIconContainer *container) icon = p->data; have_stored_position = FALSE; - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[GET_STORED_ICON_POSITION], 0, icon->data, &position, @@ -1360,7 +1360,7 @@ nautilus_icon_container_move_icon (NautilusIconContainer *container, position.y = icon->y; position.scale_x = scale_x; position.scale_y = scale_y; - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[ICON_POSITION_CHANGED], 0, icon->data, &position); } @@ -1414,7 +1414,7 @@ rubberband_select (NautilusIconContainer *container, } if (selection_changed) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -1533,7 +1533,7 @@ start_rubberbanding (NautilusIconContainer *container, details = container->details; band_info = &details->rubberband_info; - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[BAND_SELECT_STARTED], 0); for (p = details->icons; p != NULL; p = p->next) { @@ -1637,7 +1637,7 @@ stop_rubberbanding (NautilusIconContainer *container, band_info->selection_rectangle = NULL; - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[BAND_SELECT_ENDED], 0); } @@ -1956,7 +1956,7 @@ keyboard_move_to (NautilusIconContainer *container, /* Select icons and get rid of the special keyboard focus. */ clear_keyboard_focus (container); if (select_one_unselect_others (container, icon)) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -2130,7 +2130,7 @@ keyboard_space (NautilusIconContainer *container, if (container->details->keyboard_focus != NULL && (event->state & GDK_CONTROL_MASK) != 0) { icon_toggle_selected (container, container->details->keyboard_focus); - g_signal_emit (G_OBJECT (container), signals[SELECTION_CHANGED], 0); + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -2222,7 +2222,7 @@ select_matching_name (NautilusIconContainer *container, /* Select icons and get rid of the special keyboard focus. */ clear_keyboard_focus (container); if (select_one_unselect_others (container, icon)) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } schedule_keyboard_icon_reveal (container, icon); @@ -2498,7 +2498,7 @@ button_press_event (GtkWidget *widget, if (! button_event_modifies_selection (event)) { selection_changed = unselect_all (container); if (selection_changed) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -2514,19 +2514,19 @@ button_press_event (GtkWidget *widget, /* Button 2 may be passed to the window manager. */ if (event->button == MIDDLE_BUTTON) { - g_signal_emit (G_OBJECT (widget), signals[MIDDLE_CLICK], 0, event); + g_signal_emit (widget, signals[MIDDLE_CLICK], 0, event); return TRUE; } /* Button 3 does a contextual menu. */ if (event->button == CONTEXTUAL_MENU_BUTTON) { end_renaming_mode (container, TRUE); - g_signal_emit (G_OBJECT (widget), signals[CONTEXT_CLICK_BACKGROUND], 0, event); + g_signal_emit (widget, signals[CONTEXT_CLICK_BACKGROUND], 0, event); return TRUE; } /* Otherwise, we emit a button_press message. */ - g_signal_emit (G_OBJECT (widget), + g_signal_emit (widget, signals[BUTTON_PRESS], 0, event, &return_value); return return_value; @@ -2546,7 +2546,7 @@ nautilus_icon_container_did_not_drag (NautilusIconContainer *container, (container, details->drag_icon); if (selection_changed) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -2707,7 +2707,7 @@ end_stretching (NautilusIconContainer *container, position.y = icon->y; position.scale_x = icon->scale_x; position.scale_y = icon->scale_y; - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[ICON_POSITION_CHANGED], 0, icon->data, &position); @@ -2771,7 +2771,7 @@ button_release_event (GtkWidget *widget, * show context menu. */ clear_drag_state (container); - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[CONTEXT_CLICK_SELECTION], 0, event); break; @@ -3413,7 +3413,7 @@ nautilus_icon_container_init (NautilusIconContainer *container) GTK_OBJECT (container)); - g_signal_connect (G_OBJECT (container), "focus-out-event", + g_signal_connect (container, "focus-out-event", G_CALLBACK (handle_focus_out_event), NULL); /* FIXME: The code to extract colors from the theme should be in FMDirectoryView, not here. @@ -3465,7 +3465,7 @@ show_context_menu_callback (void *cast_to_parameters) * odd case is if this click deselected the icon under * the mouse, but at least the behavior is consistent. */ - g_signal_emit (G_OBJECT (parameters->container), + g_signal_emit (parameters->container, signals[CONTEXT_CLICK_SELECTION], 0, parameters->event); } @@ -3537,12 +3537,12 @@ handle_icon_button_press (NautilusIconContainer *container, */ if (button_event_modifies_selection (event)) { icon_toggle_selected (container, icon); - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } else if (!icon->is_selected) { unselect_all (container); icon_set_selected (container, icon, TRUE); - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } @@ -3709,7 +3709,7 @@ icon_destroy (NautilusIconContainer *container, icon_free (icon); if (was_selected) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -3724,7 +3724,7 @@ activate_selected_items (NautilusIconContainer *container) selection = nautilus_icon_container_get_selection (container); if (selection != NULL) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[ACTIVATE], 0, selection); } @@ -3772,7 +3772,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container, details = container->details; /* Get the icons. */ - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[GET_ICON_IMAGES], 0, icon->data, (icon == details->drop_target) ? "accept" : "", @@ -3839,7 +3839,7 @@ nautilus_icon_container_update_icon (NautilusIconContainer *container, nautilus_scalable_icon_list_free (emblem_scalable_icons); /* Get both editable and non-editable icon text */ - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[GET_ICON_TEXT], 0, icon->data, &editable_text, @@ -3892,7 +3892,7 @@ assign_icon_position (NautilusIconContainer *container, have_stored_position = FALSE; position.scale_x = 1.0; position.scale_y = 1.0; - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[GET_STORED_ICON_POSITION], 0, icon->data, &position, @@ -3916,7 +3916,7 @@ finish_adding_icon (NautilusIconContainer *container, nautilus_icon_container_update_icon (container, icon); gnome_canvas_item_show (GNOME_CANVAS_ITEM (icon->item)); - g_signal_connect (G_OBJECT (icon->item), "event", + g_signal_connect (icon->item, "event", G_CALLBACK (item_event_callback), container); } @@ -4276,7 +4276,7 @@ nautilus_icon_container_select_all (NautilusIconContainer *container) } if (selection_changed) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -4316,7 +4316,7 @@ nautilus_icon_container_set_selection (NautilusIconContainer *container, g_hash_table_destroy (hash); if (selection_changed) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -4355,7 +4355,7 @@ nautilus_icon_container_select_list_unselect_others (NautilusIconContainer *cont g_hash_table_destroy (hash); if (selection_changed) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -4370,7 +4370,7 @@ void nautilus_icon_container_unselect_all (NautilusIconContainer *container) { if (unselect_all (container)) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[SELECTION_CHANGED], 0); } } @@ -4603,7 +4603,7 @@ nautilus_icon_container_get_icon_uri (NautilusIconContainer *container, char *uri; uri = NULL; - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[GET_ICON_URI], 0, icon->data, &uri); @@ -4617,7 +4617,7 @@ nautilus_icon_container_get_icon_drop_target_uri (NautilusIconContainer *contain char *uri; uri = NULL; - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[GET_ICON_DROP_TARGET_URI], 0, icon->data, &uri); @@ -4660,7 +4660,7 @@ nautilus_icon_container_set_auto_layout (NautilusIconContainer *container, redo_layout (container); - g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0); + g_signal_emit (container, signals[LAYOUT_CHANGED], 0); } @@ -4682,7 +4682,7 @@ nautilus_icon_container_set_tighter_layout (NautilusIconContainer *container, invalidate_label_sizes (container); redo_layout (container); - g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0); + g_signal_emit (container, signals[LAYOUT_CHANGED], 0); } else { /* in manual layout, label sizes still change, even though * the icons don't move. @@ -4703,7 +4703,7 @@ nautilus_icon_container_set_layout_mode (NautilusIconContainer *container, redo_layout (container); - g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0); + g_signal_emit (container, signals[LAYOUT_CHANGED], 0); } @@ -4729,12 +4729,12 @@ nautilus_icon_container_freeze_icon_positions (NautilusIconContainer *container) position.y = icon->y; position.scale_x = icon->scale_x; position.scale_y = icon->scale_y; - g_signal_emit (G_OBJECT (container), signals[ICON_POSITION_CHANGED], 0, + g_signal_emit (container, signals[ICON_POSITION_CHANGED], 0, icon->data, &position); } if (changed) { - g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0); + g_signal_emit (container, signals[LAYOUT_CHANGED], 0); } } @@ -4751,7 +4751,7 @@ nautilus_icon_container_sort (NautilusIconContainer *container) redo_layout (container); if (changed) { - g_signal_emit (G_OBJECT (container), signals[LAYOUT_CHANGED], 0); + g_signal_emit (container, signals[LAYOUT_CHANGED], 0); } } @@ -4803,7 +4803,7 @@ set_pending_icon_to_rename (NautilusIconContainer *container, NautilusIcon *icon } if (icon != NULL) { - g_signal_connect (G_OBJECT (icon->item), "destroy", + g_signal_connect (icon->item, "destroy", G_CALLBACK (pending_icon_to_rename_destroy_callback), container); } @@ -4915,7 +4915,7 @@ nautilus_icon_container_start_renaming_selected_item (NautilusIconContainer *con nautilus_icon_text_item_start_editing (details->rename_widget); - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[RENAMING_ICON], 0, nautilus_icon_text_item_get_renaming_editable (details->rename_widget)); #endif @@ -4947,7 +4947,7 @@ end_renaming_mode (NautilusIconContainer *container, gboolean commit) /* Verify that text has been modified before signalling change. */ changed_text = nautilus_icon_text_item_get_text (container->details->rename_widget); if (strcmp (container->details->original_text, changed_text) != 0) { - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[ICON_TEXT_CHANGED], 0, icon->data, changed_text); @@ -4979,7 +4979,7 @@ nautilus_icon_container_emit_preview_signal (NautilusIconContainer *icon_contain g_return_val_if_fail (start_flag == FALSE || start_flag == TRUE, FALSE); result = FALSE; - g_signal_emit (G_OBJECT (icon_container), + g_signal_emit (icon_container, signals[PREVIEW], 0, icon->data, start_flag, @@ -5000,7 +5000,7 @@ nautilus_icon_container_has_stored_icon_positions (NautilusIconContainer *contai icon = p->data; have_stored_position = FALSE; - g_signal_emit (G_OBJECT (container), + g_signal_emit (container, signals[GET_STORED_ICON_POSITION], 0, icon->data, &position, diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c index 21ecd88f1..852e4e60c 100644 --- a/libnautilus-private/nautilus-icon-dnd.c +++ b/libnautilus-private/nautilus-icon-dnd.c @@ -577,19 +577,19 @@ nautilus_icon_container_item_at (NautilusIconContainer *container, } static char * -get_container_uri (const NautilusIconContainer *container) +get_container_uri (NautilusIconContainer *container) { char *uri; /* get the URI associated with the container */ uri = NULL; - g_signal_emit_by_name (GTK_OBJECT (container), "get_container_uri", &uri); + g_signal_emit_by_name (container, "get_container_uri", &uri); return uri; } static gboolean -nautilus_icon_container_selection_items_local (const NautilusIconContainer *container, - const GList *items) +nautilus_icon_container_selection_items_local (NautilusIconContainer *container, + GList *items) { char *container_uri_string; gboolean result; @@ -668,7 +668,7 @@ receive_dropped_uri_list (NautilusIconContainer *container, char *uri_list, GdkD return; } - g_signal_emit_by_name (GTK_OBJECT (container), "handle_uri_list", + g_signal_emit_by_name (container, "handle_uri_list", uri_list, action, x, y); @@ -878,7 +878,7 @@ handle_nonlocal_move (NautilusIconContainer *container, } /* start the copy */ - g_signal_emit_by_name (GTK_OBJECT (container), "move_copy_items", + g_signal_emit_by_name (container, "move_copy_items", source_uris, source_item_locations, target_uri, @@ -1232,19 +1232,19 @@ nautilus_icon_dnd_init (NautilusIconContainer *container, | GDK_ACTION_ASK); /* Messages for outgoing drag. */ - g_signal_connect (G_OBJECT (container), "drag_data_get", + g_signal_connect (container, "drag_data_get", G_CALLBACK (drag_data_get_callback), NULL); - g_signal_connect (G_OBJECT (container), "drag_end", + g_signal_connect (container, "drag_end", G_CALLBACK (drag_end_callback), NULL); /* Messages for incoming drag. */ - g_signal_connect (G_OBJECT (container), "drag_data_received", + g_signal_connect (container, "drag_data_received", G_CALLBACK (drag_data_received_callback), NULL); - g_signal_connect (G_OBJECT (container), "drag_motion", + g_signal_connect (container, "drag_motion", G_CALLBACK (drag_motion_callback), NULL); - g_signal_connect (G_OBJECT (container), "drag_drop", + g_signal_connect (container, "drag_drop", G_CALLBACK (drag_drop_callback), NULL); - g_signal_connect (G_OBJECT (container), "drag_leave", + g_signal_connect (container, "drag_leave", G_CALLBACK (drag_leave_callback), NULL); } diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c index b2dc54c9f..0c10abc9c 100644 --- a/libnautilus-private/nautilus-icon-factory.c +++ b/libnautilus-private/nautilus-icon-factory.c @@ -286,7 +286,7 @@ get_icon_factory (void) thumbnail_limit_changed_callback, NULL); - g_signal_connect (G_OBJECT (gnome_vfs_mime_monitor_get ()), + g_signal_connect (gnome_vfs_mime_monitor_get (), "data_changed", G_CALLBACK (mime_type_data_changed_callback), NULL); @@ -857,7 +857,7 @@ icon_theme_changed_callback (gpointer user_data) nautilus_icon_factory_clear (); load_thumbnail_frames (factory); - g_signal_emit (G_OBJECT (factory), + g_signal_emit (factory, signals[ICONS_CHANGED], 0); } @@ -874,7 +874,7 @@ thumbnail_limit_changed_callback (gpointer user_data) * signal to mean only "thumbnails might have changed" if this ends up being slow * for some reason. */ - g_signal_emit (G_OBJECT (global_icon_factory), + g_signal_emit (global_icon_factory, signals[ICONS_CHANGED], 0); } @@ -887,7 +887,7 @@ mime_type_data_changed_callback (GnomeVFSMIMEMonitor *monitor, gpointer user_dat /* We don't know which data changed, so we have to assume that * any or all icons might have changed. */ - g_signal_emit (G_OBJECT (get_icon_factory ()), + g_signal_emit (get_icon_factory (), signals[ICONS_CHANGED], 0); } diff --git a/libnautilus-private/nautilus-icon-text-item.c b/libnautilus-private/nautilus-icon-text-item.c index 24b10ccea..94636506b 100644 --- a/libnautilus-private/nautilus-icon-text-item.c +++ b/libnautilus-private/nautilus-icon-text-item.c @@ -136,7 +136,7 @@ iti_stop_editing (Iti *iti) gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (iti)); - g_signal_emit (G_OBJECT (iti), iti_signals[EDITING_STOPPED], 0); + g_signal_emit (iti, iti_signals[EDITING_STOPPED], 0); } /* Lays out the text in an icon item */ @@ -179,12 +179,12 @@ layout_text (Iti *iti) height = iti->ti->height + 2 * MARGIN_Y; if (width != old_width) - g_signal_emit (G_OBJECT (iti), iti_signals[WIDTH_CHANGED], 0); + g_signal_emit (iti, iti_signals[WIDTH_CHANGED], 0); if (height != old_height) - g_signal_emit (G_OBJECT (iti), iti_signals[HEIGHT_CHANGED], 0); + g_signal_emit (iti, iti_signals[HEIGHT_CHANGED], 0); - g_signal_emit (G_OBJECT (iti), iti_signals [TEXT_EDITED], 0); + g_signal_emit (iti, iti_signals [TEXT_EDITED], 0); } /* Accepts the text in the off-screen entry of an icon text item */ @@ -197,7 +197,7 @@ iti_edition_accept (Iti *iti) priv = iti->priv; accept = TRUE; - g_signal_emit (G_OBJECT (iti), iti_signals [TEXT_CHANGED], 0, &accept); + g_signal_emit (iti, iti_signals [TEXT_CHANGED], 0, &accept); if (iti->editing){ if (accept) { @@ -263,7 +263,7 @@ iti_start_editing (Iti *iti) if (priv->entry_top == NULL) { priv->entry = (NautilusEntry *) nautilus_entry_new (); - g_signal_connect (G_OBJECT (priv->entry), "activate", + g_signal_connect (priv->entry, "activate", G_CALLBACK (iti_entry_activate), iti); /* Make clipboard functions cause an update the appearance of the icon text item itself, since the clipboard functions @@ -287,7 +287,7 @@ iti_start_editing (Iti *iti) gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (iti)); - g_signal_emit (G_OBJECT (iti), iti_signals[EDITING_STARTED], 0); + g_signal_emit (iti, iti_signals[EDITING_STARTED], 0); } /* Destroy method handler for the icon text item */ @@ -854,7 +854,7 @@ iti_start_selecting (Iti *iti, int idx, guint32 event_time) gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (iti)); - g_signal_emit (G_OBJECT (iti), iti_signals[SELECTION_STARTED], 0); + g_signal_emit (iti, iti_signals[SELECTION_STARTED], 0); } /* Stops the selection state in the icon text item */ @@ -874,9 +874,9 @@ iti_stop_selecting (Iti *iti, guint32 event_time) iti->selecting = FALSE; gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (iti)); - g_signal_emit (G_OBJECT (iti), iti_signals[SELECTION_STOPPED], 0); + g_signal_emit (iti, iti_signals[SELECTION_STOPPED], 0); /* Hack, since the real nautilus entry can't get this information */ - g_signal_emit_by_name (GTK_OBJECT (priv->entry), "selection_changed"); + g_signal_emit_by_name (priv->entry, "selection_changed"); } /* Handles selection range changes on the icon text item */ diff --git a/libnautilus-private/nautilus-merged-directory.c b/libnautilus-private/nautilus-merged-directory.c index f782f9993..e839514c3 100644 --- a/libnautilus-private/nautilus-merged-directory.c +++ b/libnautilus-private/nautilus-merged-directory.c @@ -500,7 +500,7 @@ merged_add_real_directory (NautilusMergedDirectory *merged, merged->details->directories_not_done_loading = g_list_prepend (merged->details->directories_not_done_loading, real_directory); - g_signal_connect (G_OBJECT (real_directory), + g_signal_connect (real_directory, "done_loading", G_CALLBACK (done_loading_callback), merged); @@ -515,11 +515,11 @@ merged_add_real_directory (NautilusMergedDirectory *merged, real_directory); /* FIXME bugzilla.gnome.org 42541: Do we need to add the directory to callbacks too? */ - g_signal_connect (G_OBJECT (real_directory), + g_signal_connect (real_directory, "files_added", G_CALLBACK (forward_files_added_cover), merged); - g_signal_connect (G_OBJECT (real_directory), + g_signal_connect (real_directory, "files_changed", G_CALLBACK (forward_files_changed_cover), merged); @@ -538,7 +538,7 @@ nautilus_merged_directory_add_real_directory (NautilusMergedDirectory *merged, return; } - g_signal_emit (G_OBJECT (merged), + g_signal_emit (merged, signals[ADD_REAL_DIRECTORY], 0, real_directory); } @@ -607,7 +607,7 @@ nautilus_merged_directory_remove_real_directory (NautilusMergedDirectory *merged return; } - g_signal_emit (G_OBJECT (merged), + g_signal_emit (merged, signals[REMOVE_REAL_DIRECTORY], 0, real_directory); } diff --git a/libnautilus-private/nautilus-program-chooser.c b/libnautilus-private/nautilus-program-chooser.c index f8482d6f1..1ed175765 100644 --- a/libnautilus-private/nautilus-program-chooser.c +++ b/libnautilus-private/nautilus-program-chooser.c @@ -1216,7 +1216,7 @@ create_program_clist () */ gtk_clist_set_compare_func (clist, compare_program_file_pairs); - g_signal_connect (G_OBJECT (clist), + g_signal_connect (clist, "click_column", G_CALLBACK (switch_sort_column), NULL); @@ -1332,7 +1332,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type, gtk_widget_show (change_button); gtk_box_pack_end (GTK_BOX (change_button_holder), change_button, TRUE, FALSE, 0); - g_signal_connect (G_OBJECT (change_button), + g_signal_connect (change_button, "clicked", G_CALLBACK (run_program_configurator_callback), window); @@ -1352,7 +1352,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type, gtk_box_pack_end (GTK_BOX (capplet_hbox), capplet_button_vbox, FALSE, FALSE, 0); capplet_button = gtk_button_new_with_mnemonic (_("_Go There")); - g_signal_connect (G_OBJECT (capplet_button), + g_signal_connect (capplet_button, "clicked", G_CALLBACK (launch_mime_capplet_and_close_dialog), window); @@ -1378,7 +1378,7 @@ nautilus_program_chooser_new (GnomeVFSMimeActionType action_type, update_selected_item_details (GTK_DIALOG (window)); /* Update selected item info whenever selection changes. */ - g_signal_connect (G_OBJECT (clist), + g_signal_connect (clist, "select_row", G_CALLBACK (program_list_selection_changed_callback), window); @@ -1491,7 +1491,7 @@ nautilus_program_chooser_show_no_choices_message (GnomeVFSMimeActionType action_ dialog = eel_show_yes_no_dialog (prompt, dialog_title, GTK_STOCK_OK, GTK_STOCK_CANCEL, parent_window); - g_signal_connect (G_OBJECT (dialog), "response", + g_signal_connect (dialog, "response", G_CALLBACK (launch_mime_capplet_on_ok), nautilus_file_get_mime_type (file)); diff --git a/libnautilus-private/nautilus-trash-file.c b/libnautilus-private/nautilus-trash-file.c index 57b70685e..db6689f64 100644 --- a/libnautilus-private/nautilus-trash-file.c +++ b/libnautilus-private/nautilus-trash-file.c @@ -284,7 +284,7 @@ add_real_file (NautilusTrashFile *trash, trash->details->files = g_list_prepend (trash->details->files, real_file); - g_signal_connect (G_OBJECT (real_file), + g_signal_connect (real_file, "changed", G_CALLBACK (real_file_changed_callback), trash); diff --git a/libnautilus-private/nautilus-trash-monitor.c b/libnautilus-private/nautilus-trash-monitor.c index 43e25f426..8317aedc3 100644 --- a/libnautilus-private/nautilus-trash-monitor.c +++ b/libnautilus-private/nautilus-trash-monitor.c @@ -112,7 +112,7 @@ nautilus_trash_files_changed_callback (NautilusDirectory *directory, GList *file nautilus_file_unref (file); /* trash got empty or full, notify everyone who cares */ - g_signal_emit (G_OBJECT (trash_monitor), + g_signal_emit (trash_monitor, signals[TRASH_STATE_CHANGED], 0, trash_monitor->details->empty); } @@ -273,7 +273,7 @@ add_one_trash_directory_if_needed (const NautilusVolume *volume, NautilusTrashMonitor *trash_monitor; trash_monitor = NAUTILUS_TRASH_MONITOR (callback_data); - g_signal_emit (G_OBJECT (trash_monitor), + g_signal_emit (trash_monitor, signals[CHECK_TRASH_DIRECTORY_ADDED], 0, volume); diff --git a/libnautilus-private/nautilus-undo-manager.c b/libnautilus-private/nautilus-undo-manager.c index 7f75860da..09b1eebb0 100644 --- a/libnautilus-private/nautilus-undo-manager.c +++ b/libnautilus-private/nautilus-undo-manager.c @@ -119,7 +119,7 @@ corba_append (PortableServer_Servant servant, manager->details->new_transaction_is_redo; /* Fire off signal indicating that the undo state has changed. */ - g_signal_emit (G_OBJECT (manager), signals[CHANGED], 0); + g_signal_emit (manager, signals[CHANGED], 0); } static void @@ -142,7 +142,7 @@ corba_forget (PortableServer_Servant servant, release_transaction (manager); /* Fire off signal indicating that the undo state has changed. */ - g_signal_emit (G_OBJECT (manager), signals[CHANGED], 0); + g_signal_emit (manager, signals[CHANGED], 0); } static void @@ -198,7 +198,7 @@ nautilus_undo_manager_undo (NautilusUndoManager *manager) bonobo_object_release_unref (transaction, &ev); /* Fire off signal indicating the undo state has changed. */ - g_signal_emit (G_OBJECT (manager), signals[CHANGED], 0); + g_signal_emit (manager, signals[CHANGED], 0); } CORBA_exception_free (&ev); diff --git a/libnautilus-private/nautilus-undo-signal-handlers.c b/libnautilus-private/nautilus-undo-signal-handlers.c index ef4207325..82040b7cd 100644 --- a/libnautilus-private/nautilus-undo-signal-handlers.c +++ b/libnautilus-private/nautilus-undo-signal-handlers.c @@ -80,7 +80,7 @@ nautilus_undo_set_up_nautilus_entry_for_undo (NautilusEntry *entry) data, free_editable_object_data); /* Connect to entry signals */ - g_signal_connect (G_OBJECT (entry), + g_signal_connect (entry, "user_changed", G_CALLBACK (nautilus_entry_user_changed_callback), NULL); @@ -192,12 +192,12 @@ nautilus_undo_set_up_editable_for_undo (GtkEditable *editable) } /* Connect to editable signals */ - g_signal_connect (G_OBJECT (editable), + g_signal_connect (editable, "insert_text", G_CALLBACK (editable_insert_text_callback), NULL); - g_signal_connect (G_OBJECT (editable), + g_signal_connect (editable, "delete_text", G_CALLBACK (editable_delete_text_callback), NULL); @@ -328,7 +328,7 @@ nautilus_undo_editable_set_undo_key (GtkEditable *editable, gboolean value) #ifdef UNDO_ENABLED if (value) { /* Connect to entry signals */ - g_signal_connect (G_OBJECT (editable), + g_signal_connect (editable, "key_press_event", G_CALLBACK (editable_key_press_event), NULL); diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c index ddc319ad9..81767fd8a 100644 --- a/libnautilus-private/nautilus-volume-monitor.c +++ b/libnautilus-private/nautilus-volume-monitor.c @@ -800,7 +800,7 @@ mount_volume_make_name (NautilusVolume *volume) static void mount_volume_activate (NautilusVolumeMonitor *monitor, NautilusVolume *volume) { - g_signal_emit (G_OBJECT (monitor), + g_signal_emit (monitor, signals[VOLUME_MOUNTED], 0, volume); } @@ -839,7 +839,7 @@ mount_volume_deactivate (NautilusVolumeMonitor *monitor, NautilusVolume *volume) default: } - g_signal_emit (G_OBJECT (monitor), + g_signal_emit (monitor, signals[VOLUME_UNMOUNTED], 0, volume); } @@ -1387,7 +1387,7 @@ display_mount_error (gpointer callback_data) for (p = monitor->details->mounts; p != NULL; p = p->next) { volume = (NautilusVolume *)p->data; if (strcmp (volume->mount_path, info->mount_point) == 0) { - g_signal_emit (G_OBJECT (monitor), signals[VOLUME_UNMOUNT_FAILED], 0, volume); + g_signal_emit (monitor, signals[VOLUME_UNMOUNT_FAILED], 0, volume); break; } } @@ -1568,7 +1568,7 @@ nautilus_volume_monitor_mount_unmount_removable (NautilusVolumeMonitor *monitor, command = find_command (UMOUNT_COMMAND); command_string = g_strconcat (command, UMOUNT_SEPARATOR, name, NULL); if (volume != NULL) { - g_signal_emit (G_OBJECT (monitor), signals[VOLUME_UNMOUNT_STARTED], 0, volume); + g_signal_emit (monitor, signals[VOLUME_UNMOUNT_STARTED], 0, volume); } } diff --git a/libnautilus/nautilus-clipboard.c b/libnautilus/nautilus-clipboard.c index 0867b35ff..d5857ac66 100644 --- a/libnautilus/nautilus-clipboard.c +++ b/libnautilus/nautilus-clipboard.c @@ -237,7 +237,7 @@ merge_in_clipboard_menu_items (GObject *widget_as_object, "nautilus", NULL); if (add_selection_callback) { - g_signal_connect_after (GTK_OBJECT (widget_as_object), "selection_changed", + g_signal_connect_after (widget_as_object, "selection_changed", G_CALLBACK (selection_changed_callback), target_data); selection_changed_callback (GTK_WIDGET (widget_as_object), target_data); @@ -395,7 +395,7 @@ nautilus_clipboard_set_up_editable (GtkEditable *target, g_signal_connect_after (target, "focus_out_event", G_CALLBACK (focus_changed_callback), target_data); - g_signal_connect (G_OBJECT (target), "destroy", + g_signal_connect (target, "destroy", G_CALLBACK (target_destroy_callback), target_data); /* Call the focus changed callback once to merge if the window is @@ -465,11 +465,11 @@ nautilus_clipboard_set_up_editable_in_control (GtkEditable *target, g_object_set_data (G_OBJECT (target), "Nautilus:shares_selection_changes", GINT_TO_POINTER (shares_selection_changes)); - g_signal_connect (G_OBJECT (target), + g_signal_connect (target, "focus_in_event", G_CALLBACK (first_focus_callback), control); - g_signal_connect (G_OBJECT (target), + g_signal_connect (target, "destroy", G_CALLBACK (control_destroyed_callback), control); diff --git a/libnautilus/nautilus-undo.c b/libnautilus/nautilus-undo.c index f2cce7486..b2d760a93 100644 --- a/libnautilus/nautilus-undo.c +++ b/libnautilus/nautilus-undo.c @@ -279,6 +279,6 @@ nautilus_undo_set_up_bonobo_control (BonoboControl *control) g_return_if_fail (BONOBO_IS_CONTROL (control)); set_up_bonobo_control (control); - g_signal_connect (G_OBJECT (control), "set_frame", + g_signal_connect (control, "set_frame", G_CALLBACK (set_up_bonobo_control), NULL); } diff --git a/libnautilus/nautilus-view-standard-main.c b/libnautilus/nautilus-view-standard-main.c index 47a20ba28..dbc7395b1 100644 --- a/libnautilus/nautilus-view-standard-main.c +++ b/libnautilus/nautilus-view-standard-main.c @@ -109,7 +109,7 @@ make_object (BonoboGenericFactory *factory, g_source_remove (callback_data->delayed_quit_timeout_id); callback_data->delayed_quit_timeout_id = 0; } - g_signal_connect (G_OBJECT (view), "destroy", + g_signal_connect (view, "destroy", G_CALLBACK (object_destroyed), callback_data); return BONOBO_OBJECT (view); diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c index 4f11921c5..b775becb7 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -151,7 +151,7 @@ static void call_load_location (NautilusView *view, gpointer callback_data) { - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[LOAD_LOCATION], 0, callback_data); } @@ -160,7 +160,7 @@ static void call_stop_loading (NautilusView *view, gpointer callback_data) { - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[STOP_LOADING], 0); } @@ -168,7 +168,7 @@ static void call_selection_changed (NautilusView *view, gpointer callback_data) { - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[SELECTION_CHANGED], 0, callback_data); } @@ -177,7 +177,7 @@ static void call_title_changed (NautilusView *view, gpointer callback_data) { - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[TITLE_CHANGED], 0, callback_data); } @@ -186,7 +186,7 @@ static void call_history_changed (NautilusView *view, gpointer callback_data) { - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[HISTORY_CHANGED], 0, callback_data); } diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index 178facbde..de108c450 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -531,10 +531,9 @@ delayed_init (FMDesktopIconView *desktop_icon_view) { /* Keep track of the load time. */ desktop_icon_view->details->done_loading_signal = - g_signal_connect (G_OBJECT (fm_directory_view_get_model - (FM_DIRECTORY_VIEW (desktop_icon_view))), - "done_loading", - G_CALLBACK (done_loading), desktop_icon_view); + g_signal_connect (fm_directory_view_get_model (FM_DIRECTORY_VIEW (desktop_icon_view)), + "done_loading", + G_CALLBACK (done_loading), desktop_icon_view); /* Monitor desktop directory. */ desktop_icon_view->details->reload_desktop_timeout = @@ -610,17 +609,17 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view) create_one_mount_link, desktop_icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "middle_click", G_CALLBACK (fm_desktop_icon_view_handle_middle_click), desktop_icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "compare_icons", G_CALLBACK (desktop_icons_compare_callback), desktop_icon_view); - g_signal_connect (G_OBJECT (desktop_icon_view), + g_signal_connect (desktop_icon_view, "event", G_CALLBACK (event_callback), desktop_icon_view); diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index aa4dd9a14..c3be47ed9 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -1148,12 +1148,12 @@ add_scripts_directory (FMDirectoryView *view, g_list_free (attributes); - g_signal_connect (G_OBJECT (directory), + g_signal_connect (directory, "files_added", G_CALLBACK (scripts_added_or_changed_callback), view); - g_signal_connect (G_OBJECT (directory), + g_signal_connect (directory, "files_changed", G_CALLBACK (scripts_added_or_changed_callback), view); @@ -1204,37 +1204,37 @@ fm_directory_view_init (FMDirectoryView *view) view->details->sort_directories_first = eel_preferences_get_boolean (NAUTILUS_PREFERENCES_SORT_DIRECTORIES_FIRST); - g_signal_connect (G_OBJECT (view->details->nautilus_view), + g_signal_connect (view->details->nautilus_view, "stop_loading", G_CALLBACK (stop_loading_callback), view); - g_signal_connect (G_OBJECT (view->details->nautilus_view), + g_signal_connect (view->details->nautilus_view, "load_location", G_CALLBACK (load_location_callback), view); - g_signal_connect (G_OBJECT (view->details->nautilus_view), + g_signal_connect (view->details->nautilus_view, "selection_changed", G_CALLBACK (selection_changed_callback), view); - g_signal_connect (G_OBJECT (fm_directory_view_get_bonobo_control (view)), + g_signal_connect (fm_directory_view_get_bonobo_control (view), "activate", G_CALLBACK (bonobo_control_activate_callback), view); - g_signal_connect (G_OBJECT (view->details->zoomable), + g_signal_connect (view->details->zoomable, "zoom_in", G_CALLBACK (zoomable_zoom_in_callback), view); - g_signal_connect (G_OBJECT (view->details->zoomable), + g_signal_connect (view->details->zoomable, "zoom_out", G_CALLBACK (zoomable_zoom_out_callback), view); - g_signal_connect (G_OBJECT (view->details->zoomable), + g_signal_connect (view->details->zoomable, "set_zoom_level", G_CALLBACK (zoomable_set_zoom_level_callback), view); - g_signal_connect (G_OBJECT (view->details->zoomable), + g_signal_connect (view->details->zoomable, "zoom_to_fit", G_CALLBACK (zoomable_zoom_to_fit_callback), view); @@ -1834,7 +1834,7 @@ pre_copy_move (FMDirectoryView *directory_view) * operate on. The ADD_FILE signal is registered as G_SIGNAL_RUN_LAST, so we * must use connect_after. */ - g_signal_connect (G_OBJECT (directory_view), + g_signal_connect (directory_view, "add_file", G_CALLBACK (pre_copy_move_add_file_callback), copy_move_done_data); @@ -2080,23 +2080,23 @@ process_old_files (FMDirectoryView *view) send_selection_change = FALSE; if (files_added != NULL || files_changed != NULL) { - g_signal_emit (G_OBJECT (view), signals[BEGIN_FILE_CHANGES], 0); + g_signal_emit (view, signals[BEGIN_FILE_CHANGES], 0); for (node = files_added; node != NULL; node = node->next) { file = NAUTILUS_FILE (node->data); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[ADD_FILE], 0, file); } for (node = files_changed; node != NULL; node = node->next) { file = NAUTILUS_FILE (node->data); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[still_should_show_file (view, file) ? FILE_CHANGED : REMOVE_FILE], 0, file); } - g_signal_emit (G_OBJECT (view), signals[END_FILE_CHANGES], 0); + g_signal_emit (view, signals[END_FILE_CHANGES], 0); if (files_changed != NULL) { selection = fm_directory_view_get_selection (view); @@ -2353,7 +2353,7 @@ load_error_callback (NautilusDirectory *directory, /* Emit a signal to tell subclasses that a load error has * occurred, so they can handle it in the UI. */ - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[LOAD_ERROR], 0, load_error_code); } @@ -2409,7 +2409,7 @@ fm_directory_view_clear (FMDirectoryView *view) { g_return_if_fail (FM_IS_DIRECTORY_VIEW (view)); - g_signal_emit (G_OBJECT (view), signals[CLEAR], 0); + g_signal_emit (view, signals[CLEAR], 0); } /** @@ -2426,7 +2426,7 @@ fm_directory_view_begin_loading (FMDirectoryView *view) { g_return_if_fail (FM_IS_DIRECTORY_VIEW (view)); - g_signal_emit (G_OBJECT (view), signals[BEGIN_LOADING], 0); + g_signal_emit (view, signals[BEGIN_LOADING], 0); } /** @@ -2443,7 +2443,7 @@ fm_directory_view_end_loading (FMDirectoryView *view) { g_return_if_fail (FM_IS_DIRECTORY_VIEW (view)); - g_signal_emit (G_OBJECT (view), signals[END_LOADING], 0); + g_signal_emit (view, signals[END_LOADING], 0); } /** diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index e0e655d01..3436f037f 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -1326,7 +1326,7 @@ fm_icon_view_merge_menus (FMDirectoryView *view) icon_view = FM_ICON_VIEW (view); icon_view->details->ui = bonobo_ui_component_new ("Icon View"); - g_signal_connect (G_OBJECT (icon_view->details->ui), + g_signal_connect (icon_view->details->ui, "ui_event", G_CALLBACK (handle_ui_event), icon_view); bonobo_ui_component_set_container (icon_view->details->ui, fm_directory_view_get_bonobo_ui_container (view), @@ -2435,87 +2435,87 @@ create_icon_container (FMIconView *icon_view) GTK_WIDGET_SET_FLAGS (icon_container, GTK_CAN_FOCUS); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "activate", G_CALLBACK (icon_container_activate_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "band_select_started", G_CALLBACK (band_select_started_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "band_select_ended", G_CALLBACK (band_select_ended_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "compare_icons", G_CALLBACK (icon_container_compare_icons_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "compare_icons_by_name", G_CALLBACK (icon_container_compare_icons_by_name_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "context_click_selection", G_CALLBACK (icon_container_context_click_selection_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "context_click_background", G_CALLBACK (icon_container_context_click_background_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "icon_position_changed", G_CALLBACK (icon_position_changed_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "icon_text_changed", G_CALLBACK (fm_icon_view_icon_text_changed_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "selection_changed", G_CALLBACK (selection_changed_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "get_icon_images", G_CALLBACK (get_icon_images_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "get_icon_uri", G_CALLBACK (get_icon_uri_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "get_icon_drop_target_uri", G_CALLBACK (get_icon_drop_target_uri_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "get_icon_text", G_CALLBACK (get_icon_text_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "move_copy_items", G_CALLBACK (icon_view_move_copy_items), directory_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "get_container_uri", G_CALLBACK (icon_view_get_container_uri), directory_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "can_accept_item", G_CALLBACK (icon_view_can_accept_item), directory_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "get_stored_icon_position", G_CALLBACK (get_stored_icon_position_callback), directory_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "layout_changed", G_CALLBACK (layout_changed_callback), directory_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "preview", G_CALLBACK (icon_container_preview_callback), icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "renaming_icon", G_CALLBACK (renaming_icon_callback), directory_view); @@ -2800,7 +2800,7 @@ fm_icon_view_init (FMIconView *icon_view) G_OBJECT (icon_view)); icon_container = get_icon_container (icon_view); - g_signal_connect (G_OBJECT (icon_container), + g_signal_connect (icon_container, "handle_uri_list", G_CALLBACK (icon_view_handle_uri_list), icon_view); diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index 32ff9f0f1..ba02c398e 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -1146,63 +1146,63 @@ set_up_list (FMListView *list_view) GTK_WIDGET_SET_FLAGS (list, GTK_CAN_FOCUS); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "activate", G_CALLBACK (list_activate_callback), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "selection_changed", G_CALLBACK (list_selection_changed_callback), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "click_column", G_CALLBACK (column_clicked_callback), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "context_click_selection", G_CALLBACK (context_click_selection_callback), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "context_click_background", G_CALLBACK (context_click_background_callback), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "select_matching_name", G_CALLBACK (select_matching_name_callback), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "select_previous_name", G_CALLBACK (select_previous_name_callback), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "select_next_name", G_CALLBACK (select_next_name_callback), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "handle_dragged_items", G_CALLBACK (fm_list_handle_dragged_items), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "handle_dropped_items", G_CALLBACK (fm_list_handle_dropped_items), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "get_default_action", G_CALLBACK (fm_list_get_default_action), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "drag_data_get", G_CALLBACK (fm_list_drag_data_get), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "get_drag_pixbuf", G_CALLBACK (fm_list_get_drag_pixbuf), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "get_sort_column_index", G_CALLBACK (fm_list_get_sort_column_index), list_view); - g_signal_connect (G_OBJECT (list), + g_signal_connect (list, "get_cell_text", G_CALLBACK (get_cell_text), list_view); @@ -1213,7 +1213,7 @@ set_up_list (FMListView *list_view) * the "realize" signal is slightly too early, so we connect to * "map". */ - g_signal_connect (G_OBJECT (list_view), + g_signal_connect (list_view, "map", G_CALLBACK (fm_list_view_reset_row_height), NULL); diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c index 6f1f1ba55..d951ad990 100644 --- a/src/file-manager/fm-properties-window.c +++ b/src/file-manager/fm-properties-window.c @@ -1591,11 +1591,11 @@ create_basic_page (FMPropertiesWindow *window) nautilus_undo_editable_set_undo_key (GTK_EDITABLE (name_field), TRUE); #endif - g_signal_connect (G_OBJECT (name_field), "focus_out_event", + g_signal_connect (name_field, "focus_out_event", G_CALLBACK (name_field_focus_out), window); - g_signal_connect (G_OBJECT (name_field), "activate", + g_signal_connect (name_field, "activate", G_CALLBACK (name_field_activate), window); @@ -1652,7 +1652,7 @@ create_basic_page (FMPropertiesWindow *window) gtk_widget_show (temp_button); gtk_box_pack_start (GTK_BOX(button_box), temp_button, FALSE, FALSE, 4); - g_signal_connect (G_OBJECT (temp_button), "clicked", G_CALLBACK (remove_image_button_callback), window); + g_signal_connect (temp_button, "clicked", G_CALLBACK (remove_image_button_callback), window); window->details->remove_image_button = temp_button; @@ -1704,10 +1704,10 @@ create_emblems_page (FMPropertiesWindow *window) * This must be done after the widget is realized, due to * an apparent bug in gtk_viewport_set_shadow_type. */ - g_signal_connect (G_OBJECT (GTK_BIN (scroller)->child), - "realize", - G_CALLBACK (remove_default_viewport_shadow), - NULL); + g_signal_connect (GTK_BIN (scroller)->child, + "realize", + G_CALLBACK (remove_default_viewport_shadow), + NULL); gtk_notebook_append_page (window->details->notebook, scroller, gtk_label_new (_("Emblems"))); @@ -1754,7 +1754,7 @@ create_emblems_page (FMPropertiesWindow *window) file, (GtkDestroyNotify) nautilus_file_unref); - g_signal_connect (G_OBJECT (button), + g_signal_connect (button, "toggled", G_CALLBACK (property_button_toggled), NULL); @@ -1877,7 +1877,7 @@ set_up_permissions_checkbox (GtkWidget *check_button, { guint toggled_signal_id; - toggled_signal_id = g_signal_connect (G_OBJECT (check_button), "toggled", + toggled_signal_id = g_signal_connect (check_button, "toggled", G_CALLBACK (permissions_check_button_toggled), file); @@ -2417,7 +2417,7 @@ fm_properties_window_present (NautilusFile *original_file, FMDirectoryView *dire */ g_hash_table_insert (pending_files, target_file, target_file); - g_signal_connect (G_OBJECT (directory_view), + g_signal_connect (directory_view, "destroy", G_CALLBACK (directory_view_destroyed_callback), startup_data); diff --git a/src/file-manager/fm-search-list-view.c b/src/file-manager/fm-search-list-view.c index a6c53eabd..ec9bcc3ee 100644 --- a/src/file-manager/fm-search-list-view.c +++ b/src/file-manager/fm-search-list-view.c @@ -387,7 +387,7 @@ fm_search_list_view_init (gpointer object, nautilus_view = fm_directory_view_get_nautilus_view (directory_view); - g_signal_connect (G_OBJECT (nautilus_view), + g_signal_connect (nautilus_view, "load_location", G_CALLBACK (load_location_callback), NULL); diff --git a/src/file-manager/nautilus-indexing-info.c b/src/file-manager/nautilus-indexing-info.c index c886b1667..0f880c176 100644 --- a/src/file-manager/nautilus-indexing-info.c +++ b/src/file-manager/nautilus-indexing-info.c @@ -230,7 +230,7 @@ index_progress_dialog_new (void) NULL, progress_data, g_free); - g_signal_connect (G_OBJECT (progress_bar_hbox), + g_signal_connect (progress_bar_hbox, "destroy", timeout_remove_callback, GUINT_TO_POINTER (timeout_id)); diff --git a/src/nautilus-about.c b/src/nautilus-about.c index afe61daff..de27f5583 100644 --- a/src/nautilus-about.c +++ b/src/nautilus-about.c @@ -161,7 +161,7 @@ nautilus_about_init (NautilusAbout *about) area_width, area_height); gtk_widget_set_events (about->details->drawing_area, GDK_EXPOSURE_MASK); - g_signal_connect (G_OBJECT (about->details->drawing_area), "expose_event", + g_signal_connect (about->details->drawing_area, "expose_event", G_CALLBACK (nautilus_about_repaint), about); gtk_widget_show (about->details->drawing_area); diff --git a/src/nautilus-application.c b/src/nautilus-application.c index 11973949f..1a4e2e6f9 100644 --- a/src/nautilus-application.c +++ b/src/nautilus-application.c @@ -146,13 +146,13 @@ nautilus_application_init (NautilusApplication *application) application->undo_manager = nautilus_undo_manager_new (); /* Watch for volume mounts so we can restore open windows */ - g_signal_connect (G_OBJECT (nautilus_volume_monitor_get ()), + g_signal_connect (nautilus_volume_monitor_get (), "volume_mounted", G_CALLBACK (volume_mounted_callback), application); /* Watch for volume unmounts so we can close open windows */ - g_signal_connect (G_OBJECT (nautilus_volume_monitor_get ()), + g_signal_connect (nautilus_volume_monitor_get (), "volume_unmounted", G_CALLBACK (volume_unmounted_callback), application); @@ -664,11 +664,11 @@ nautilus_application_create_window (NautilusApplication *application) "app", G_OBJECT (application), "app_id", "nautilus", NULL)); - g_signal_connect (G_OBJECT (window), + g_signal_connect (window, "delete_event", G_CALLBACK (nautilus_window_delete_event_callback), NULL); - g_signal_connect (G_OBJECT (window), + g_signal_connect (window, "destroy", G_CALLBACK (nautilus_application_destroyed_window), application); @@ -899,11 +899,11 @@ init_session (void) client = gnome_master_client (); - g_signal_connect (G_OBJECT (client), "save_yourself", + g_signal_connect (client, "save_yourself", (GtkSignalFunc) save_session, NULL); - g_signal_connect (G_OBJECT (client), "die", + g_signal_connect (client, "die", (GtkSignalFunc) removed_from_session, NULL); diff --git a/src/nautilus-bookmark-list.c b/src/nautilus-bookmark-list.c index 5918ba79b..0157bbf49 100644 --- a/src/nautilus-bookmark-list.c +++ b/src/nautilus-bookmark-list.c @@ -192,12 +192,12 @@ insert_bookmark_internal (NautilusBookmarkList *bookmarks, bookmark, index); - g_signal_connect (G_OBJECT (bookmark), + g_signal_connect (bookmark, "appearance_changed", G_CALLBACK (bookmark_in_list_changed_callback), bookmarks); - g_signal_connect (G_OBJECT (bookmark), + g_signal_connect (bookmark, "contents_changed", G_CALLBACK (bookmark_in_list_changed_callback), bookmarks); @@ -258,7 +258,7 @@ nautilus_bookmark_list_contents_changed (NautilusBookmarkList *bookmarks) g_return_if_fail (NAUTILUS_IS_BOOKMARK_LIST (bookmarks)); nautilus_bookmark_list_save_file (bookmarks); - g_signal_emit (G_OBJECT (bookmarks), + g_signal_emit (bookmarks, signals[CONTENTS_CHANGED], 0); } diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c index 063ee4722..45a270bac 100644 --- a/src/nautilus-bookmarks-window.c +++ b/src/nautilus-bookmarks-window.c @@ -206,45 +206,45 @@ create_bookmarks_window (NautilusBookmarkList *list, GObject *undo_manager_sourc G_CALLBACK(on_select_row), NULL); - g_signal_connect (G_OBJECT (window), "delete_event", + g_signal_connect (window, "delete_event", G_CALLBACK (on_window_delete_event), NULL); - g_signal_connect (G_OBJECT (window), "hide", + g_signal_connect (window, "hide", G_CALLBACK (on_window_hide_event), NULL); - g_signal_connect (G_OBJECT (window), "destroy", + g_signal_connect (window, "destroy", G_CALLBACK (on_window_destroy_event), NULL); name_field_changed_signalID = - g_signal_connect (G_OBJECT (name_field), "changed", + g_signal_connect (name_field, "changed", G_CALLBACK (on_name_field_changed), NULL); - g_signal_connect (G_OBJECT (name_field), "focus_out_event", + g_signal_connect (name_field, "focus_out_event", G_CALLBACK (on_text_field_focus_out_event), NULL); - g_signal_connect (G_OBJECT (name_field), "activate", + g_signal_connect (name_field, "activate", G_CALLBACK (name_or_uri_field_activate), NULL); uri_field_changed_signalID = - g_signal_connect (G_OBJECT (uri_field), "changed", + g_signal_connect (uri_field, "changed", G_CALLBACK (on_uri_field_changed), NULL); - g_signal_connect (G_OBJECT (uri_field), "focus_out_event", + g_signal_connect (uri_field, "focus_out_event", G_CALLBACK (on_text_field_focus_out_event), NULL); - g_signal_connect (G_OBJECT (uri_field), "activate", + g_signal_connect (uri_field, "activate", G_CALLBACK (name_or_uri_field_activate), NULL); - g_signal_connect (G_OBJECT (remove_button), "clicked", + g_signal_connect (remove_button, "clicked", G_CALLBACK (on_remove_button_clicked), NULL); @@ -666,7 +666,7 @@ set_up_close_accelerator (GtkWidget *window) * here because we have to handle saving geometry before hiding the * window. */ - g_signal_connect (G_OBJECT (window), + g_signal_connect (window, "key_press_event", G_CALLBACK (handle_close_accelerator), NULL); diff --git a/src/nautilus-complex-search-bar.c b/src/nautilus-complex-search-bar.c index de1f74a78..8abe1163d 100644 --- a/src/nautilus-complex-search-bar.c +++ b/src/nautilus-complex-search-bar.c @@ -103,7 +103,7 @@ search_bar_criterion_type_changed_callback (GObject *old_criterion_object, new_type = GPOINTER_TO_INT (g_object_get_data (old_criterion_object, "type")); new_criterion = nautilus_search_bar_criterion_new_with_type (new_type, bar); - g_signal_connect (G_OBJECT (new_criterion), + g_signal_connect (new_criterion, "criterion_type_changed", G_CALLBACK (search_bar_criterion_type_changed_callback), bar); @@ -178,7 +178,7 @@ nautilus_complex_search_bar_init (NautilusComplexSearchBar *bar) file_name_criterion = nautilus_search_bar_criterion_first_new (bar); - g_signal_connect (G_OBJECT (file_name_criterion), + g_signal_connect (file_name_criterion, "criterion_type_changed", G_CALLBACK (search_bar_criterion_type_changed_callback), bar); @@ -197,13 +197,13 @@ nautilus_complex_search_bar_init (NautilusComplexSearchBar *bar) hbox = gtk_hwrap_box_new (FALSE); - g_signal_connect (G_OBJECT (hbox), + g_signal_connect (hbox, "need_reallocation", G_CALLBACK (queue_search_bar_resize_callback), bar); bar->details->more_options = gtk_button_new_with_label (_("More Options")); - g_signal_connect (G_OBJECT (bar->details->more_options), "clicked", + g_signal_connect (bar->details->more_options, "clicked", G_CALLBACK (more_options_callback), bar); @@ -213,7 +213,7 @@ nautilus_complex_search_bar_init (NautilusComplexSearchBar *bar) gtk_widget_show (bar->details->more_options); bar->details->fewer_options = gtk_button_new_with_label (_("Fewer Options")); - g_signal_connect (G_OBJECT (bar->details->fewer_options), "clicked", + g_signal_connect (bar->details->fewer_options, "clicked", G_CALLBACK (fewer_options_callback), bar); gtk_wrap_box_pack (GTK_WRAP_BOX (hbox), @@ -502,7 +502,7 @@ more_options_callback (GtkObject *object, last_criterion = (NautilusSearchBarCriterion *)((g_slist_last (list))->data); criterion = nautilus_search_bar_criterion_next_new (last_criterion->details->type, bar); - g_signal_connect (G_OBJECT (criterion), + g_signal_connect (criterion, "criterion_type_changed", G_CALLBACK (search_bar_criterion_type_changed_callback), bar); diff --git a/src/nautilus-desktop-window.c b/src/nautilus-desktop-window.c index 6978d8da1..fa170df03 100644 --- a/src/nautilus-desktop-window.c +++ b/src/nautilus-desktop-window.c @@ -134,8 +134,8 @@ nautilus_desktop_window_new (NautilusApplication *application) /* Special sawmill setting*/ gtk_window_set_wmclass (GTK_WINDOW (window), "desktop_window", "Nautilus"); - g_signal_connect (G_OBJECT (window), "realize", G_CALLBACK (nautilus_desktop_window_realized), NULL); - g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (nautilus_desktop_window_delete_event), NULL); + g_signal_connect (window, "realize", G_CALLBACK (nautilus_desktop_window_realized), NULL); + g_signal_connect (window, "delete_event", G_CALLBACK (nautilus_desktop_window_delete_event), NULL); /* Point window at the desktop folder. * Note that nautilus_desktop_window_init is too early to do this. diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index 0a188ddc7..27f1f4812 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -545,7 +545,7 @@ nautilus_sidebar_create_context_menu (NautilusSidebar *sidebar) gtk_widget_show (menu_item); gtk_menu_append (GTK_MENU(menu), menu_item); gtk_widget_set_sensitive (menu_item, has_background); - g_signal_connect (G_OBJECT (menu_item), "activate", + g_signal_connect (menu_item, "activate", G_CALLBACK (reset_background_callback), sidebar); /* add a separator */ @@ -709,7 +709,7 @@ receive_dropped_uri_list (NautilusSidebar *sidebar, (eel_get_widget_background (GTK_WIDGET (sidebar)), uris[0]); } else if (exactly_one) { - g_signal_emit (G_OBJECT (sidebar), + g_signal_emit (sidebar, signals[LOCATION_CHANGED], 0, uris[0]); } @@ -915,7 +915,7 @@ nautilus_sidebar_add_panel (NautilusSidebar *sidebar, NautilusViewFrame *panel) gtk_widget_show (label); - g_signal_connect (G_OBJECT (panel), "view_loaded", + g_signal_connect (panel, "view_loaded", G_CALLBACK (view_loaded_callback), sidebar); gtk_notebook_append_page (GTK_NOTEBOOK (sidebar->details->notebook), @@ -1375,7 +1375,7 @@ add_command_buttons (NautilusSidebar *sidebar, GList *application_list) /* Catch-all button after all the others. */ temp_button = gtk_button_new_with_label (_("Open with...")); - g_signal_connect (G_OBJECT (temp_button), "clicked", + g_signal_connect (temp_button, "clicked", G_CALLBACK (open_with_callback), NULL); gtk_object_set_user_data (GTK_OBJECT (temp_button), sidebar); gtk_widget_show (temp_button); @@ -1491,7 +1491,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar) gtk_widget_show (temp_button); sidebar->details->has_buttons = TRUE; - g_signal_connect (G_OBJECT (temp_button), "clicked", + g_signal_connect (temp_button, "clicked", G_CALLBACK (empty_trash_callback), NULL); gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_trash_monitor_get ()), @@ -1536,11 +1536,11 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar) background = eel_get_widget_background (GTK_WIDGET (sidebar)); if (!sidebar->details->background_connected) { sidebar->details->background_connected = TRUE; - g_signal_connect (G_OBJECT (background), + g_signal_connect (background, "settings_changed", G_CALLBACK (background_settings_changed_callback), sidebar); - g_signal_connect (G_OBJECT (background), + g_signal_connect (background, "reset", G_CALLBACK (background_reset_callback), sidebar); diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c index c8f6287ce..731e6b940 100644 --- a/src/nautilus-location-bar.c +++ b/src/nautilus-location-bar.c @@ -643,7 +643,7 @@ nautilus_location_bar_init (NautilusLocationBar *bar) gtk_container_add (GTK_CONTAINER (event_box), label); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); gtk_misc_set_alignment (GTK_MISC (label), 1, 0.5); - g_signal_connect (G_OBJECT (label), "style_set", + g_signal_connect (label, "style_set", G_CALLBACK (style_set_handler), NULL); gtk_box_pack_start (GTK_BOX (hbox), event_box, FALSE, TRUE, @@ -686,7 +686,7 @@ nautilus_location_bar_init (NautilusLocationBar *bar) GTK_DEST_DEFAULT_ALL, drop_types, G_N_ELEMENTS (drop_types), GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK); - g_signal_connect (G_OBJECT (bar), "drag_data_received", + g_signal_connect (bar, "drag_data_received", G_CALLBACK (drag_data_received_callback), NULL); diff --git a/src/nautilus-navigation-bar.c b/src/nautilus-navigation-bar.c index 1d033a6aa..727e17fd0 100644 --- a/src/nautilus-navigation-bar.c +++ b/src/nautilus-navigation-bar.c @@ -98,7 +98,7 @@ nautilus_navigation_bar_activate (NautilusNavigationBar *bar) { g_return_if_fail (NAUTILUS_IS_NAVIGATION_BAR (bar)); - g_signal_emit (G_OBJECT (bar), signals[ACTIVATE], 0); + g_signal_emit (bar, signals[ACTIVATE], 0); } /** @@ -145,7 +145,7 @@ nautilus_navigation_bar_location_changed (NautilusNavigationBar *bar) g_return_if_fail (NAUTILUS_IS_NAVIGATION_BAR (bar)); location = nautilus_navigation_bar_get_location (bar); - g_signal_emit (G_OBJECT (bar), + g_signal_emit (bar, signals[LOCATION_CHANGED], 0, location); g_free (location); diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c index 38667db89..91b846269 100644 --- a/src/nautilus-navigation-window-menus.c +++ b/src/nautilus-navigation-window-menus.c @@ -379,7 +379,7 @@ forget_history_if_confirmed (NautilusWindow *window) GTK_WINDOW (window)); g_free (prompt); - g_signal_connect (GTK_OBJECT (dialog), + g_signal_connect (dialog, "response", G_CALLBACK (forget_history_if_yes), NULL); @@ -1333,7 +1333,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window) user_level_changed_callback (window); /* Register to catch Bonobo UI events so we can notice View As changes */ - g_signal_connect (G_OBJECT (window->details->shell_ui), "ui_event", + g_signal_connect (window->details->shell_ui, "ui_event", G_CALLBACK (nautilus_window_handle_ui_event_callback), window); bonobo_ui_component_thaw (window->details->shell_ui, NULL); diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c index 766af2ce5..8e4fa28f6 100644 --- a/src/nautilus-navigation-window.c +++ b/src/nautilus-navigation-window.c @@ -632,10 +632,10 @@ nautilus_window_constructed (NautilusWindow *window) window->navigation_bar = nautilus_switchable_navigation_bar_new (window); gtk_widget_show (GTK_WIDGET (window->navigation_bar)); - g_signal_connect (G_OBJECT (window->navigation_bar), "location_changed", + g_signal_connect (window->navigation_bar, "location_changed", G_CALLBACK (navigation_bar_location_changed_callback), window); - g_signal_connect (G_OBJECT (window->navigation_bar), "mode_changed", + g_signal_connect (window->navigation_bar, "mode_changed", G_CALLBACK (navigation_bar_mode_changed_callback), window); gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar, @@ -699,7 +699,7 @@ nautilus_window_constructed (NautilusWindow *window) /* set up the sidebar */ window->sidebar = nautilus_sidebar_new (); gtk_widget_show (GTK_WIDGET (window->sidebar)); - g_signal_connect (G_OBJECT (window->sidebar), "location_changed", + g_signal_connect (window->sidebar, "location_changed", G_CALLBACK (go_to_callback), window); gtk_paned_pack1 (GTK_PANED (window->content_hbox), GTK_WIDGET (window->sidebar), @@ -1142,7 +1142,7 @@ create_view_as_menu_item (NautilusWindow *window, menu_item = gtk_menu_item_new_with_label (menu_label); g_free (menu_label); - g_signal_connect (G_OBJECT (menu_item), + g_signal_connect (menu_item, "activate", G_CALLBACK (view_as_menu_switch_views_callback), window); @@ -1479,7 +1479,7 @@ load_view_as_menus_callback (NautilusFile *file, /* Add "View as..." extra bonus choice. */ menu_item = gtk_menu_item_new_with_label (_("View as...")); - g_signal_connect (G_OBJECT (menu_item), + g_signal_connect (menu_item, "activate", G_CALLBACK (view_as_menu_choose_view_callback), window); diff --git a/src/nautilus-object-window.c b/src/nautilus-object-window.c index 766af2ce5..8e4fa28f6 100644 --- a/src/nautilus-object-window.c +++ b/src/nautilus-object-window.c @@ -632,10 +632,10 @@ nautilus_window_constructed (NautilusWindow *window) window->navigation_bar = nautilus_switchable_navigation_bar_new (window); gtk_widget_show (GTK_WIDGET (window->navigation_bar)); - g_signal_connect (G_OBJECT (window->navigation_bar), "location_changed", + g_signal_connect (window->navigation_bar, "location_changed", G_CALLBACK (navigation_bar_location_changed_callback), window); - g_signal_connect (G_OBJECT (window->navigation_bar), "mode_changed", + g_signal_connect (window->navigation_bar, "mode_changed", G_CALLBACK (navigation_bar_mode_changed_callback), window); gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar, @@ -699,7 +699,7 @@ nautilus_window_constructed (NautilusWindow *window) /* set up the sidebar */ window->sidebar = nautilus_sidebar_new (); gtk_widget_show (GTK_WIDGET (window->sidebar)); - g_signal_connect (G_OBJECT (window->sidebar), "location_changed", + g_signal_connect (window->sidebar, "location_changed", G_CALLBACK (go_to_callback), window); gtk_paned_pack1 (GTK_PANED (window->content_hbox), GTK_WIDGET (window->sidebar), @@ -1142,7 +1142,7 @@ create_view_as_menu_item (NautilusWindow *window, menu_item = gtk_menu_item_new_with_label (menu_label); g_free (menu_label); - g_signal_connect (G_OBJECT (menu_item), + g_signal_connect (menu_item, "activate", G_CALLBACK (view_as_menu_switch_views_callback), window); @@ -1479,7 +1479,7 @@ load_view_as_menus_callback (NautilusFile *file, /* Add "View as..." extra bonus choice. */ menu_item = gtk_menu_item_new_with_label (_("View as...")); - g_signal_connect (G_OBJECT (menu_item), + g_signal_connect (menu_item, "activate", G_CALLBACK (view_as_menu_choose_view_callback), window); diff --git a/src/nautilus-preferences-dialog.c b/src/nautilus-preferences-dialog.c index 069d7cdb7..620fcd5c6 100644 --- a/src/nautilus-preferences-dialog.c +++ b/src/nautilus-preferences-dialog.c @@ -440,7 +440,7 @@ preferences_dialog_create (void) gtk_window_set_wmclass (GTK_WINDOW (dialog), "nautilus_preferences", "Nautilus"); - g_signal_connect (G_OBJECT (dialog), + g_signal_connect (dialog, "response", G_CALLBACK (dialog_button_response_callback), dialog); @@ -542,7 +542,7 @@ preferences_dialog_populate_themes_group (EelPreferencesGroup *group) "theme_changed", 0); /* Keep track of theme chooser changes */ - g_signal_connect (G_OBJECT (child), + g_signal_connect (child, "theme_changed", G_CALLBACK (theme_changed_callback), NULL); @@ -550,7 +550,7 @@ preferences_dialog_populate_themes_group (EelPreferencesGroup *group) /* Have the custom preferences item tell us when its time to update the displayed * with with the one stored in preferences */ - g_signal_connect (G_OBJECT (item), + g_signal_connect (item, "custom_update_displayed_value", G_CALLBACK (update_theme_selector_displayed_value_callback), child); diff --git a/src/nautilus-profiler.c b/src/nautilus-profiler.c index 331749b15..26a1cad8b 100644 --- a/src/nautilus-profiler.c +++ b/src/nautilus-profiler.c @@ -182,7 +182,7 @@ dump_dialog_new (const char *title) dump_dialog->window = gtk_window_new (GTK_WINDOW_DIALOG); eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (dump_dialog->window)); - g_signal_connect (G_OBJECT (dump_dialog->window), + g_signal_connect (dump_dialog->window, "delete_event", G_CALLBACK (window_delete_event), dump_dialog->window); @@ -201,12 +201,12 @@ dump_dialog_new (const char *title) gtk_widget_set_sensitive (print_button, FALSE); gtk_widget_set_sensitive (save_button, FALSE); - g_signal_connect (G_OBJECT (print_button), + g_signal_connect (print_button, "clicked", G_CALLBACK (window_print_button_callback), dump_dialog); - g_signal_connect (G_OBJECT (save_button), + g_signal_connect (save_button, "clicked", G_CALLBACK (window_save_button_callback), dump_dialog); diff --git a/src/nautilus-property-browser.c b/src/nautilus-property-browser.c index 0e2ce4ca8..95b608932 100644 --- a/src/nautilus-property-browser.c +++ b/src/nautilus-property-browser.c @@ -374,7 +374,7 @@ nautilus_property_browser_init (GtkObject *object) gtk_box_pack_end (GTK_BOX(property_browser->details->bottom_box), property_browser->details->add_button, FALSE, FALSE, GNOME_PAD_SMALL); - g_signal_connect (G_OBJECT (property_browser->details->add_button), "clicked", + g_signal_connect (property_browser->details->add_button, "clicked", G_CALLBACK (add_new_button_callback), property_browser); /* now create the "remove" button */ @@ -393,7 +393,7 @@ nautilus_property_browser_init (GtkObject *object) FALSE, GNOME_PAD_SMALL); - g_signal_connect (G_OBJECT (property_browser->details->remove_button), + g_signal_connect (property_browser->details->remove_button, "clicked", G_CALLBACK (remove_button_callback), property_browser); @@ -413,11 +413,11 @@ nautilus_property_browser_init (GtkObject *object) nautilus_property_browser_theme_changed, property_browser); - g_signal_connect (G_OBJECT (property_browser), "delete_event", + g_signal_connect (property_browser, "delete_event", G_CALLBACK (nautilus_property_browser_delete_event_callback), NULL); - g_signal_connect (G_OBJECT (property_browser), "hide", + g_signal_connect (property_browser, "hide", G_CALLBACK (nautilus_property_browser_hide_callback), NULL); @@ -1197,7 +1197,7 @@ show_color_selection_window (GtkWidget *widget, gpointer *data) eel_nullify_when_destroyed (&property_browser->details->dialog); - g_signal_connect (G_OBJECT (property_browser->details->dialog), + g_signal_connect (property_browser->details->dialog, "clicked", (GtkSignalFunc) add_color_to_browser, property_browser); gtk_window_set_position (GTK_WINDOW (property_browser->details->dialog), GTK_WIN_POS_MOUSE); @@ -1224,7 +1224,7 @@ add_new_color (NautilusPropertyBrowser *property_browser) eel_nullify_when_destroyed (&property_browser->details->dialog); - g_signal_connect (G_OBJECT (color_dialog->ok_button), + g_signal_connect (color_dialog->ok_button, "clicked", (GtkSignalFunc) show_color_selection_window, property_browser); gtk_signal_connect_object (GTK_OBJECT (color_dialog->cancel_button), @@ -1392,7 +1392,7 @@ add_new_emblem (NautilusPropertyBrowser *property_browser) eel_nullify_when_destroyed (&property_browser->details->dialog); - g_signal_connect (G_OBJECT (property_browser->details->dialog), + g_signal_connect (property_browser->details->dialog, "clicked", (GtkSignalFunc) emblem_dialog_clicked, property_browser); gtk_window_set_position (GTK_WINDOW (property_browser->details->dialog), GTK_WIN_POS_MOUSE); @@ -1948,7 +1948,7 @@ nautilus_property_browser_update_contents (NautilusPropertyBrowser *property_bro eel_wrap_table_set_y_spacing (EEL_WRAP_TABLE (property_browser->details->content_table), IMAGE_TABLE_Y_SPACING); - g_signal_connect (G_OBJECT (property_browser->details->content_table), + g_signal_connect (property_browser->details->content_table, "child_pressed", G_CALLBACK (element_clicked_callback), property_browser); diff --git a/src/nautilus-search-bar-criterion.c b/src/nautilus-search-bar-criterion.c index a871adeac..c9961cc8c 100644 --- a/src/nautilus-search-bar-criterion.c +++ b/src/nautilus-search-bar-criterion.c @@ -297,7 +297,7 @@ nautilus_search_bar_criterion_new_from_values (NautilusSearchBarCriterionType ty details->bar = bar; details->box = gtk_hwrap_box_new (FALSE); - g_signal_connect (G_OBJECT (details->box), + g_signal_connect (details->box, "need_reallocation", G_CALLBACK (queue_bar_resize_callback), bar); @@ -317,7 +317,7 @@ nautilus_search_bar_criterion_new_from_values (NautilusSearchBarCriterionType ty g_free (context_stripped_criteria_title); g_object_set_data (G_OBJECT(item), "type", GINT_TO_POINTER(i)); - g_signal_connect (G_OBJECT (item), + g_signal_connect (item, "activate", G_CALLBACK (criterion_type_changed_callback), criterion); @@ -355,12 +355,12 @@ nautilus_search_bar_criterion_new_from_values (NautilusSearchBarCriterionType ty don't need a date, like "yesterday" */ if (details->type == NAUTILUS_DATE_MODIFIED_SEARCH_CRITERION) { if (modified_relation_should_show_value (i)) { - g_signal_connect (G_OBJECT (item), "activate", + g_signal_connect (item, "activate", G_CALLBACK (show_date_widget), criterion); } else { - g_signal_connect (G_OBJECT (item), "activate", + g_signal_connect (item, "activate", G_CALLBACK (hide_date_widget), criterion); } @@ -718,7 +718,7 @@ nautilus_search_bar_criterion_update_valid_criteria_choices (NautilusSearchBarCr g_object_set_data (G_OBJECT(item), "type", GINT_TO_POINTER(i)); - g_signal_connect (G_OBJECT (item), + g_signal_connect (item, "activate", G_CALLBACK (criterion_type_changed_callback), criterion); @@ -1046,7 +1046,7 @@ criterion_type_changed_callback (GtkObject *object, g_return_if_fail (NAUTILUS_IS_COMPLEX_SEARCH_BAR (criterion->details->bar)); g_object_set_data (G_OBJECT (criterion), "type", g_object_get_data (G_OBJECT (menu_item), "type")); - g_signal_emit (G_OBJECT (criterion), + g_signal_emit (criterion, signals[CRITERION_TYPE_CHANGED], 0); } diff --git a/src/nautilus-sidebar-title.c b/src/nautilus-sidebar-title.c index 0446f83ee..a834c9a6d 100644 --- a/src/nautilus-sidebar-title.c +++ b/src/nautilus-sidebar-title.c @@ -211,7 +211,7 @@ nautilus_sidebar_title_init (NautilusSidebarTitle *sidebar_title) "icons_changed", G_CALLBACK (update_icon), GTK_OBJECT (sidebar_title)); - g_signal_connect (G_OBJECT (sidebar_title), "realize", + g_signal_connect (sidebar_title, "realize", G_CALLBACK (realize_callback), NULL); /* Create the icon */ diff --git a/src/nautilus-sidebar.c b/src/nautilus-sidebar.c index 0a188ddc7..27f1f4812 100644 --- a/src/nautilus-sidebar.c +++ b/src/nautilus-sidebar.c @@ -545,7 +545,7 @@ nautilus_sidebar_create_context_menu (NautilusSidebar *sidebar) gtk_widget_show (menu_item); gtk_menu_append (GTK_MENU(menu), menu_item); gtk_widget_set_sensitive (menu_item, has_background); - g_signal_connect (G_OBJECT (menu_item), "activate", + g_signal_connect (menu_item, "activate", G_CALLBACK (reset_background_callback), sidebar); /* add a separator */ @@ -709,7 +709,7 @@ receive_dropped_uri_list (NautilusSidebar *sidebar, (eel_get_widget_background (GTK_WIDGET (sidebar)), uris[0]); } else if (exactly_one) { - g_signal_emit (G_OBJECT (sidebar), + g_signal_emit (sidebar, signals[LOCATION_CHANGED], 0, uris[0]); } @@ -915,7 +915,7 @@ nautilus_sidebar_add_panel (NautilusSidebar *sidebar, NautilusViewFrame *panel) gtk_widget_show (label); - g_signal_connect (G_OBJECT (panel), "view_loaded", + g_signal_connect (panel, "view_loaded", G_CALLBACK (view_loaded_callback), sidebar); gtk_notebook_append_page (GTK_NOTEBOOK (sidebar->details->notebook), @@ -1375,7 +1375,7 @@ add_command_buttons (NautilusSidebar *sidebar, GList *application_list) /* Catch-all button after all the others. */ temp_button = gtk_button_new_with_label (_("Open with...")); - g_signal_connect (G_OBJECT (temp_button), "clicked", + g_signal_connect (temp_button, "clicked", G_CALLBACK (open_with_callback), NULL); gtk_object_set_user_data (GTK_OBJECT (temp_button), sidebar); gtk_widget_show (temp_button); @@ -1491,7 +1491,7 @@ nautilus_sidebar_update_buttons (NautilusSidebar *sidebar) gtk_widget_show (temp_button); sidebar->details->has_buttons = TRUE; - g_signal_connect (G_OBJECT (temp_button), "clicked", + g_signal_connect (temp_button, "clicked", G_CALLBACK (empty_trash_callback), NULL); gtk_signal_connect_while_alive (GTK_OBJECT (nautilus_trash_monitor_get ()), @@ -1536,11 +1536,11 @@ nautilus_sidebar_update_appearance (NautilusSidebar *sidebar) background = eel_get_widget_background (GTK_WIDGET (sidebar)); if (!sidebar->details->background_connected) { sidebar->details->background_connected = TRUE; - g_signal_connect (G_OBJECT (background), + g_signal_connect (background, "settings_changed", G_CALLBACK (background_settings_changed_callback), sidebar); - g_signal_connect (G_OBJECT (background), + g_signal_connect (background, "reset", G_CALLBACK (background_reset_callback), sidebar); diff --git a/src/nautilus-spatial-window.c b/src/nautilus-spatial-window.c index 766af2ce5..8e4fa28f6 100644 --- a/src/nautilus-spatial-window.c +++ b/src/nautilus-spatial-window.c @@ -632,10 +632,10 @@ nautilus_window_constructed (NautilusWindow *window) window->navigation_bar = nautilus_switchable_navigation_bar_new (window); gtk_widget_show (GTK_WIDGET (window->navigation_bar)); - g_signal_connect (G_OBJECT (window->navigation_bar), "location_changed", + g_signal_connect (window->navigation_bar, "location_changed", G_CALLBACK (navigation_bar_location_changed_callback), window); - g_signal_connect (G_OBJECT (window->navigation_bar), "mode_changed", + g_signal_connect (window->navigation_bar, "mode_changed", G_CALLBACK (navigation_bar_mode_changed_callback), window); gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar, @@ -699,7 +699,7 @@ nautilus_window_constructed (NautilusWindow *window) /* set up the sidebar */ window->sidebar = nautilus_sidebar_new (); gtk_widget_show (GTK_WIDGET (window->sidebar)); - g_signal_connect (G_OBJECT (window->sidebar), "location_changed", + g_signal_connect (window->sidebar, "location_changed", G_CALLBACK (go_to_callback), window); gtk_paned_pack1 (GTK_PANED (window->content_hbox), GTK_WIDGET (window->sidebar), @@ -1142,7 +1142,7 @@ create_view_as_menu_item (NautilusWindow *window, menu_item = gtk_menu_item_new_with_label (menu_label); g_free (menu_label); - g_signal_connect (G_OBJECT (menu_item), + g_signal_connect (menu_item, "activate", G_CALLBACK (view_as_menu_switch_views_callback), window); @@ -1479,7 +1479,7 @@ load_view_as_menus_callback (NautilusFile *file, /* Add "View as..." extra bonus choice. */ menu_item = gtk_menu_item_new_with_label (_("View as...")); - g_signal_connect (G_OBJECT (menu_item), + g_signal_connect (menu_item, "activate", G_CALLBACK (view_as_menu_choose_view_callback), window); diff --git a/src/nautilus-switchable-navigation-bar.c b/src/nautilus-switchable-navigation-bar.c index 66bb18eec..d7be42513 100644 --- a/src/nautilus-switchable-navigation-bar.c +++ b/src/nautilus-switchable-navigation-bar.c @@ -218,7 +218,7 @@ nautilus_switchable_navigation_bar_set_mode (NautilusSwitchableNavigationBar } #endif - g_signal_emit (G_OBJECT (bar), signals[MODE_CHANGED], 0, mode); + g_signal_emit (bar, signals[MODE_CHANGED], 0, mode); } static char * diff --git a/src/nautilus-theme-selector.c b/src/nautilus-theme-selector.c index 7f07cce1a..37cfd11a0 100644 --- a/src/nautilus-theme-selector.c +++ b/src/nautilus-theme-selector.c @@ -177,19 +177,19 @@ nautilus_theme_selector_init (NautilusThemeSelector *theme_selector) gtk_box_pack_end (GTK_BOX (alignment_box), button_box, FALSE, FALSE, 2); theme_selector->details->install_theme_button = gtk_button_new_with_label (_("Add New Theme...")); - g_signal_connect (G_OBJECT (theme_selector->details->install_theme_button), + g_signal_connect (theme_selector->details->install_theme_button, "clicked", G_CALLBACK (install_theme_button_clicked_callback), theme_selector); theme_selector->details->remove_theme_button = gtk_button_new_with_label (_("Remove Theme...")); - g_signal_connect (G_OBJECT (theme_selector->details->remove_theme_button), + g_signal_connect (theme_selector->details->remove_theme_button, "clicked", G_CALLBACK (remove_theme_button_clicked_callback), theme_selector); theme_selector->details->cancel_remove_button = gtk_button_new_with_label (_("Cancel Remove")); - g_signal_connect (G_OBJECT (theme_selector->details->cancel_remove_button), + g_signal_connect (theme_selector->details->cancel_remove_button, "clicked", G_CALLBACK (cancel_remove_button_clicked_callback), theme_selector); @@ -220,13 +220,13 @@ nautilus_theme_selector_init (NautilusThemeSelector *theme_selector) theme_selector_update_remove_theme_button (theme_selector); - g_signal_connect (G_OBJECT (theme_selector->details->theme_selector), + g_signal_connect (theme_selector->details->theme_selector, "selection_changed", G_CALLBACK (theme_selector_changed_callback), theme_selector); theme_selector->details->theme_selector_changed_connection = - g_signal_connect (G_OBJECT (theme_selector->details->remove_theme_selector), + g_signal_connect (theme_selector->details->remove_theme_selector, "selection_changed", G_CALLBACK (remove_theme_selector_changed_callback), theme_selector); @@ -332,18 +332,18 @@ install_theme_button_clicked_callback (GtkWidget *button, eel_gtk_window_set_up_close_accelerator (GTK_WINDOW (file_selection_dialog)); g_object_set_data (G_OBJECT (file_selection_dialog), - THEME_SELECTOR_DATA_KEY, - callback_data); - - g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_selection_dialog)->ok_button), - "clicked", - G_CALLBACK (file_selection_ok_clicked_callback), - file_selection_dialog); - - g_signal_connect (G_OBJECT (GTK_FILE_SELECTION (file_selection_dialog)->cancel_button), - "clicked", - G_CALLBACK (file_selection_cancel_clicked_callback), - file_selection_dialog); + THEME_SELECTOR_DATA_KEY, + callback_data); + + g_signal_connect (GTK_FILE_SELECTION (file_selection_dialog)->ok_button, + "clicked", + G_CALLBACK (file_selection_ok_clicked_callback), + file_selection_dialog); + + g_signal_connect (GTK_FILE_SELECTION (file_selection_dialog)->cancel_button, + "clicked", + G_CALLBACK (file_selection_cancel_clicked_callback), + file_selection_dialog); gtk_window_set_position (GTK_WINDOW (file_selection_dialog), GTK_WIN_POS_MOUSE); if (theme_selector->details->parent_window != NULL) { @@ -513,7 +513,7 @@ theme_selector_changed_callback (EelImageChooser *image_chooser, selected_row_position = eel_image_chooser_get_selected_row (image_chooser); - g_signal_emit (G_OBJECT (callback_data), + g_signal_emit (callback_data, theme_selector_signals[THEME_CHANGED], 0); } diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c index 04d74eb95..93f8cf01e 100644 --- a/src/nautilus-view-frame.c +++ b/src/nautilus-view-frame.c @@ -258,7 +258,7 @@ static void emit_zoom_parameters_changed (NautilusViewFrame *view) { if (view->details->zoomable_frame != NULL) { - g_signal_emit (G_OBJECT (view), signals[ZOOM_PARAMETERS_CHANGED], 0); + g_signal_emit (view, signals[ZOOM_PARAMETERS_CHANGED], 0); } } @@ -271,7 +271,7 @@ view_frame_activated (NautilusViewFrame *view) switch (view->details->state) { case VIEW_FRAME_EMPTY: view->details->state = VIEW_FRAME_NO_LOCATION; - g_signal_emit (G_OBJECT (view), signals[VIEW_LOADED], 0); + g_signal_emit (view, signals[VIEW_LOADED], 0); emit_zoom_parameters_changed (view); send_history (view); return; @@ -328,7 +328,7 @@ view_frame_underway (NautilusViewFrame *view) case VIEW_FRAME_WAITING: case VIEW_FRAME_LOADED: view->details->state = VIEW_FRAME_UNDERWAY; - g_signal_emit (G_OBJECT (view), signals[LOAD_UNDERWAY], 0); + g_signal_emit (view, signals[LOAD_UNDERWAY], 0); return; case VIEW_FRAME_UNDERWAY: case VIEW_FRAME_FAILED: @@ -387,7 +387,7 @@ view_frame_loaded (NautilusViewFrame *view) /* fall through */ case VIEW_FRAME_UNDERWAY: view->details->state = VIEW_FRAME_LOADED; - g_signal_emit (G_OBJECT (view), signals[LOAD_COMPLETE], 0); + g_signal_emit (view, signals[LOAD_COMPLETE], 0); return; case VIEW_FRAME_LOADED: case VIEW_FRAME_FAILED: @@ -412,7 +412,7 @@ view_frame_failed (NautilusViewFrame *view) view->details->state = VIEW_FRAME_FAILED; stop_activation (view); destroy_view (view); - g_signal_emit (G_OBJECT (view), signals[FAILED], 0); + g_signal_emit (view, signals[FAILED], 0); return; case VIEW_FRAME_FAILED: return; @@ -460,7 +460,7 @@ static void emit_zoom_level_changed_callback (gpointer data, gpointer callback_data) { - g_signal_emit (G_OBJECT (data), + g_signal_emit (data, signals[ZOOM_LEVEL_CHANGED], 0, * (float *) callback_data); } @@ -732,7 +732,7 @@ nautilus_view_frame_load_location (NautilusViewFrame *view, g_free (view->details->title); view->details->title = NULL; - g_signal_emit (G_OBJECT (view), signals[TITLE_CHANGED], 0); + g_signal_emit (view, signals[TITLE_CHANGED], 0); view_frame_wait (view); @@ -974,7 +974,7 @@ nautilus_view_frame_open_location_in_this_window (NautilusViewFrame *view, } view_frame_wait_is_over (view); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[OPEN_LOCATION_IN_THIS_WINDOW], 0, location); } @@ -989,7 +989,7 @@ nautilus_view_frame_open_location_prefer_existing_window (NautilusViewFrame *vie } view_frame_wait_is_over (view); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[OPEN_LOCATION_PREFER_EXISTING_WINDOW], 0, location); } @@ -1005,7 +1005,7 @@ nautilus_view_frame_open_location_force_new_window (NautilusViewFrame *view, } view_frame_wait_is_over (view); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[OPEN_LOCATION_FORCE_NEW_WINDOW], 0, location, selection); } @@ -1026,7 +1026,7 @@ nautilus_view_frame_report_location_change (NautilusViewFrame *view, view->details->title = g_strdup (title); view_frame_wait_is_over (view); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[REPORT_LOCATION_CHANGE], 0, location, selection, title); } @@ -1048,7 +1048,7 @@ nautilus_view_frame_report_redirect (NautilusViewFrame *view, view->details->title = g_strdup (title); view_frame_wait_is_over (view); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[REPORT_REDIRECT], 0, from_location, to_location, selection, title); } @@ -1064,7 +1064,7 @@ nautilus_view_frame_report_selection_change (NautilusViewFrame *view, } view_frame_wait_is_over (view); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[CHANGE_SELECTION], 0, selection); } @@ -1079,7 +1079,7 @@ nautilus_view_frame_report_status (NautilusViewFrame *view, } view_frame_wait_is_over (view); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[CHANGE_STATUS], 0, status); } @@ -1102,7 +1102,7 @@ nautilus_view_frame_report_load_progress (NautilusViewFrame *view, } view_frame_underway (view); - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[LOAD_PROGRESS_CHANGED], 0); } @@ -1137,7 +1137,7 @@ nautilus_view_frame_go_back (NautilusViewFrame *view) { g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view)); - g_signal_emit (G_OBJECT (view), signals[GO_BACK], 0); + g_signal_emit (view, signals[GO_BACK], 0); } void @@ -1162,7 +1162,7 @@ nautilus_view_frame_set_title (NautilusViewFrame *view, view_frame_wait_is_over (view); if (changed) { - g_signal_emit (G_OBJECT (view), signals[TITLE_CHANGED], 0); + g_signal_emit (view, signals[TITLE_CHANGED], 0); } } @@ -1217,7 +1217,7 @@ get_history_list (NautilusViewFrame *view) Nautilus_History *history_list; history_list = NULL; - g_signal_emit (G_OBJECT (view), + g_signal_emit (view, signals[GET_HISTORY_LIST], 0, &history_list); return history_list; diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c index bea87e2b2..59f15ebdc 100644 --- a/src/nautilus-window-manage-views.c +++ b/src/nautilus-window-manage-views.c @@ -592,7 +592,7 @@ update_for_new_location (NautilusWindow *window) file = nautilus_file_get (window->details->location); nautilus_window_set_viewed_file (window, file); window->details->viewed_file_seen = !nautilus_file_is_not_yet_confirmed (file); - g_signal_connect (G_OBJECT (file), + g_signal_connect (file, "changed", G_CALLBACK (viewed_file_changed_callback), window); diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c index 38667db89..91b846269 100644 --- a/src/nautilus-window-menus.c +++ b/src/nautilus-window-menus.c @@ -379,7 +379,7 @@ forget_history_if_confirmed (NautilusWindow *window) GTK_WINDOW (window)); g_free (prompt); - g_signal_connect (GTK_OBJECT (dialog), + g_signal_connect (dialog, "response", G_CALLBACK (forget_history_if_yes), NULL); @@ -1333,7 +1333,7 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window) user_level_changed_callback (window); /* Register to catch Bonobo UI events so we can notice View As changes */ - g_signal_connect (G_OBJECT (window->details->shell_ui), "ui_event", + g_signal_connect (window->details->shell_ui, "ui_event", G_CALLBACK (nautilus_window_handle_ui_event_callback), window); bonobo_ui_component_thaw (window->details->shell_ui, NULL); diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c index d473b8a36..d182aa319 100644 --- a/src/nautilus-window-toolbars.c +++ b/src/nautilus-window-toolbars.c @@ -372,11 +372,11 @@ set_up_back_or_forward_toolbar_item (NautilusWindow *window, gtk_widget_show (GTK_WIDGET (item)); button = bonobo_ui_toolbar_button_item_get_button_widget (item); - g_signal_connect (G_OBJECT (button), + g_signal_connect (button, "button_press_event", G_CALLBACK (back_or_forward_button_pressed_callback), window); - g_signal_connect (G_OBJECT (button), + g_signal_connect (button, "clicked", G_CALLBACK (back_or_forward_button_clicked_callback), window); diff --git a/src/nautilus-window.c b/src/nautilus-window.c index 766af2ce5..8e4fa28f6 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -632,10 +632,10 @@ nautilus_window_constructed (NautilusWindow *window) window->navigation_bar = nautilus_switchable_navigation_bar_new (window); gtk_widget_show (GTK_WIDGET (window->navigation_bar)); - g_signal_connect (G_OBJECT (window->navigation_bar), "location_changed", + g_signal_connect (window->navigation_bar, "location_changed", G_CALLBACK (navigation_bar_location_changed_callback), window); - g_signal_connect (G_OBJECT (window->navigation_bar), "mode_changed", + g_signal_connect (window->navigation_bar, "mode_changed", G_CALLBACK (navigation_bar_mode_changed_callback), window); gtk_box_pack_start (GTK_BOX (location_bar_box), window->navigation_bar, @@ -699,7 +699,7 @@ nautilus_window_constructed (NautilusWindow *window) /* set up the sidebar */ window->sidebar = nautilus_sidebar_new (); gtk_widget_show (GTK_WIDGET (window->sidebar)); - g_signal_connect (G_OBJECT (window->sidebar), "location_changed", + g_signal_connect (window->sidebar, "location_changed", G_CALLBACK (go_to_callback), window); gtk_paned_pack1 (GTK_PANED (window->content_hbox), GTK_WIDGET (window->sidebar), @@ -1142,7 +1142,7 @@ create_view_as_menu_item (NautilusWindow *window, menu_item = gtk_menu_item_new_with_label (menu_label); g_free (menu_label); - g_signal_connect (G_OBJECT (menu_item), + g_signal_connect (menu_item, "activate", G_CALLBACK (view_as_menu_switch_views_callback), window); @@ -1479,7 +1479,7 @@ load_view_as_menus_callback (NautilusFile *file, /* Add "View as..." extra bonus choice. */ menu_item = gtk_menu_item_new_with_label (_("View as...")); - g_signal_connect (G_OBJECT (menu_item), + g_signal_connect (menu_item, "activate", G_CALLBACK (view_as_menu_choose_view_callback), window); diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c index a647f9bbf..d18088c0f 100644 --- a/src/nautilus-zoom-control.c +++ b/src/nautilus-zoom-control.c @@ -474,7 +474,7 @@ zoom_menu_callback (GtkMenuItem *item, gpointer callback_data) /* if we can zoom */ if (can_zoom) { - g_signal_emit (G_OBJECT (zoom_control), signals[ZOOM_TO_LEVEL], 0, zoom_level); + g_signal_emit (zoom_control, signals[ZOOM_TO_LEVEL], 0, zoom_level); } } @@ -515,7 +515,7 @@ create_zoom_menu_item (GtkMenu *menu, GtkWidget *widget, float zoom_level, zoom_level == zoom_control->details->zoom_level); g_object_set_data_full (G_OBJECT (menu_item), "zoom_level", zoom_level_ptr, g_free); - g_signal_connect (G_OBJECT (menu_item), "activate", + g_signal_connect (menu_item, "activate", G_CALLBACK (zoom_menu_callback), zoom_control); @@ -566,11 +566,11 @@ nautilus_zoom_control_button_press_event (GtkWidget *widget, GdkEventButton *eve } if ((event->x < (width / 3)) && nautilus_zoom_control_can_zoom_out (zoom_control)) { - g_signal_emit (G_OBJECT (widget), signals[ZOOM_OUT], 0); + g_signal_emit (widget, signals[ZOOM_OUT], 0); } else if ((event->x > ((2 * width) / 3)) && nautilus_zoom_control_can_zoom_in (zoom_control)) { - g_signal_emit (G_OBJECT (widget), signals[ZOOM_IN], 0); + g_signal_emit (widget, signals[ZOOM_IN], 0); } else if ((event->x >= (center - (width >> 3))) && (event->x <= (center + (width >> 3)))) { - g_signal_emit (G_OBJECT (widget), signals[ZOOM_TO_FIT], 0); + g_signal_emit (widget, signals[ZOOM_TO_FIT], 0); } /* diff --git a/test/test-nautilus-async-activation.c b/test/test-nautilus-async-activation.c index c3abb9f4e..7a1efa51e 100644 --- a/test/test-nautilus-async-activation.c +++ b/test/test-nautilus-async-activation.c @@ -67,7 +67,7 @@ main (int argc, char *argv[]) bonobo_poa_manager ()); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_signal_connect (G_OBJECT (window), "destroy", + g_signal_connect (window, "destroy", gtk_main_quit, NULL); gtk_widget_show_all (GTK_WIDGET (window)); diff --git a/test/test-nautilus-preferences-change.c b/test/test-nautilus-preferences-change.c index d4c526104..acbf8030b 100644 --- a/test/test-nautilus-preferences-change.c +++ b/test/test-nautilus-preferences-change.c @@ -94,7 +94,7 @@ picker_new (const char *name, string_picker = eel_string_picker_new (); eel_caption_set_title_label (EEL_CAPTION (string_picker), name); - g_signal_connect (G_OBJECT (string_picker), "changed", G_CALLBACK (int_picker_changed_callback), + g_signal_connect (string_picker, "changed", G_CALLBACK (int_picker_changed_callback), (gpointer) name); eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries); @@ -118,7 +118,7 @@ user_level_picker_new (const char *name, string_picker = eel_string_picker_new (); eel_caption_set_title_label (EEL_CAPTION (string_picker), name); - g_signal_connect (G_OBJECT (string_picker), "changed", G_CALLBACK (user_level_picker_changed_callback), + g_signal_connect (string_picker, "changed", G_CALLBACK (user_level_picker_changed_callback), (gpointer) name); eel_string_picker_set_string_list (EEL_STRING_PICKER (string_picker), entries); diff --git a/test/test-nautilus-smooth-graphics.c b/test/test-nautilus-smooth-graphics.c index 30b68c701..3795cd711 100644 --- a/test/test-nautilus-smooth-graphics.c +++ b/test/test-nautilus-smooth-graphics.c @@ -40,7 +40,7 @@ main (int argc, char * argv[]) nautilus_global_preferences_init (); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - g_signal_connect (G_OBJECT (window), "delete_event", G_CALLBACK (delete_event), NULL); + g_signal_connect (window, "delete_event", G_CALLBACK (delete_event), NULL); button = gtk_toggle_button_new_with_label ("Smooth Graphics"); @@ -49,7 +49,7 @@ main (int argc, char * argv[]) gtk_container_add (GTK_CONTAINER (window), button); - g_signal_connect (G_OBJECT (button), + g_signal_connect (button, "toggled", G_CALLBACK (button_toggled), NULL); diff --git a/test/test-nautilus-wrap-table.c b/test/test-nautilus-wrap-table.c index dc48467ee..6eb5a84ba 100644 --- a/test/test-nautilus-wrap-table.c +++ b/test/test-nautilus-wrap-table.c @@ -45,7 +45,7 @@ main (int argc, char* argv[]) * This must be done after the widget is realized, due to * an apparent bug in gtk_viewport_set_shadow_type. */ -// g_signal_connect (G_OBJECT (GTK_BIN (scroller)->child), +// g_signal_connect (GTK_BIN (scroller->child), // "realize", // remove_default_viewport_shadow, // NULL); diff --git a/test/test.c b/test/test.c index 5569134c4..bab6c0f7f 100644 --- a/test/test.c +++ b/test/test.c @@ -58,7 +58,7 @@ test_window_new (const char *title, guint border_width) gtk_window_set_title (GTK_WINDOW (window), title); } - g_signal_connect (G_OBJECT (window), + g_signal_connect (window, "delete_event", G_CALLBACK (test_delete_event), NULL); |