diff options
34 files changed, 175 insertions, 219 deletions
@@ -1,18 +1,6 @@ 2001-11-03 Darin Adler <darin@bentspoon.com> - * components/text/nautilus-text-view.c: (nautilus_text_view_init): - * libnautilus/nautilus-view.c: - * src/file-manager/fm-icon-view.c: (fm_icon_view_init): - * src/file-manager/fm-properties-window.c: - (append_directory_contents_fields), - (append_special_execution_flags): - * src/nautilus-application.c: (nautilus_application_startup), - (nautilus_application_create_window): - * src/nautilus-sidebar-title.c: (nautilus_sidebar_title_init): - * src/nautilus-window-menus.c: - (nautilus_window_initialize_bookmarks_menu), - (nautilus_window_initialize_menus_part_1): - * src/nautilus-window.c: (add_sidebar_panel_callback): + * Tons of files. More GtkObject -> GObject stuff. 2001-11-03 Darin Adler <darin@bentspoon.com> diff --git a/components/adapter/bonobo-stream-vfs.c b/components/adapter/bonobo-stream-vfs.c index f0b559de7..c87bd09ff 100644 --- a/components/adapter/bonobo-stream-vfs.c +++ b/components/adapter/bonobo-stream-vfs.c @@ -450,7 +450,7 @@ bonobo_stream_vfs_new_internal (GnomeVFSHandle *handle) Bonobo_Stream corba_stream; CORBA_Environment ev; - stream_vfs = BONOBO_STREAM_VFS (gtk_object_new (bonobo_stream_vfs_get_type (), NULL)); + stream_vfs = BONOBO_STREAM_VFS (g_object_new (bonobo_stream_vfs_get_type (), NULL)); stream_vfs->details->handle = handle; diff --git a/components/adapter/main.c b/components/adapter/main.c index e3b61a11f..c04d1ffab 100644 --- a/components/adapter/main.c +++ b/components/adapter/main.c @@ -72,13 +72,13 @@ adapter_factory_make_object (BonoboGenericFactory *factory, return NULL; } - adapter = NAUTILUS_ADAPTER_FACTORY_SERVER (gtk_object_new (NAUTILUS_TYPE_ADAPTER_FACTORY_SERVER, NULL)); + adapter = NAUTILUS_ADAPTER_FACTORY_SERVER (g_object_new (NAUTILUS_TYPE_ADAPTER_FACTORY_SERVER, NULL)); /* Connect a handler that will get us out of the main loop * when there are no more objects outstanding. */ object_count++; - gtk_signal_connect (GTK_OBJECT (adapter), "destroy", + g_signal_connect (G_OBJECT (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 ac65d319f..8602d828d 100644 --- a/components/adapter/nautilus-adapter-control-embed-strategy.c +++ b/components/adapter/nautilus-adapter-control-embed-strategy.c @@ -156,7 +156,7 @@ nautilus_adapter_control_embed_strategy_new (Bonobo_Control control, Bonobo_Zoomable corba_zoomable; CORBA_Environment ev; - strategy = NAUTILUS_ADAPTER_CONTROL_EMBED_STRATEGY (gtk_object_new (NAUTILUS_TYPE_ADAPTER_CONTROL_EMBED_STRATEGY, NULL)); + strategy = NAUTILUS_ADAPTER_CONTROL_EMBED_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_CONTROL_EMBED_STRATEGY, NULL)); gtk_object_ref (GTK_OBJECT (strategy)); gtk_object_sink (GTK_OBJECT (strategy)); @@ -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); - gtk_signal_connect (GTK_OBJECT (strategy->details->control_frame), + g_signal_connect (G_OBJECT (strategy->details->control_frame), "activate_uri", GTK_SIGNAL_FUNC (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 07f5bad9c..a24a26d71 100644 --- a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c +++ b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c @@ -168,7 +168,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable, Bonobo_View corba_view; CORBA_Environment ev; - strategy = NAUTILUS_ADAPTER_EMBEDDABLE_EMBED_STRATEGY (gtk_object_new (NAUTILUS_TYPE_ADAPTER_EMBEDDABLE_EMBED_STRATEGY, NULL)); + strategy = NAUTILUS_ADAPTER_EMBEDDABLE_EMBED_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_EMBEDDABLE_EMBED_STRATEGY, NULL)); gtk_object_ref (GTK_OBJECT (strategy)); gtk_object_sink (GTK_OBJECT (strategy)); @@ -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); - gtk_signal_connect (GTK_OBJECT (strategy->details->view_frame), + g_signal_connect (G_OBJECT (strategy->details->view_frame), "activate_uri", GTK_SIGNAL_FUNC (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 59bf98133..ee1f8ed40 100644 --- a/components/adapter/nautilus-adapter-embed-strategy.c +++ b/components/adapter/nautilus-adapter-embed-strategy.c @@ -71,7 +71,7 @@ nautilus_adapter_embed_strategy_class_init (NautilusAdapterEmbedStrategyClass *k G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NautilusAdapterEmbedStrategyClass, activate), NULL, NULL, - gtk_marshal_NONE__POINTER, + gtk_marshal_VOID__POINTER, GTK_TYPE_POINTER, 0); signals[DEACTIVATE] = g_signal_new ("deactivate", @@ -79,7 +79,7 @@ nautilus_adapter_embed_strategy_class_init (NautilusAdapterEmbedStrategyClass *k G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NautilusAdapterEmbedStrategyClass, deactivate), NULL, NULL, - gtk_marshal_NONE__NONE, + gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[OPEN_LOCATION] = g_signal_new ("open_location", @@ -155,23 +155,23 @@ void nautilus_adapter_embed_strategy_activate (NautilusAdapterEmbedStrategy *strategy, Bonobo_UIContainer ui_container) { - gtk_signal_emit (GTK_OBJECT (strategy), - signals[ACTIVATE], + g_signal_emit (G_OBJECT (strategy), + signals[ACTIVATE], 0, ui_container); } void nautilus_adapter_embed_strategy_deactivate (NautilusAdapterEmbedStrategy *strategy) { - gtk_signal_emit (GTK_OBJECT (strategy), - signals[DEACTIVATE]); + g_signal_emit (G_OBJECT (strategy), + signals[DEACTIVATE], 0); } void nautilus_adapter_embed_strategy_emit_open_location (NautilusAdapterEmbedStrategy *strategy, const char *uri) { - gtk_signal_emit (GTK_OBJECT (strategy), - signals[OPEN_LOCATION], + g_signal_emit (G_OBJECT (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 07f5bad9c..a24a26d71 100644 --- a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c +++ b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c @@ -168,7 +168,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable, Bonobo_View corba_view; CORBA_Environment ev; - strategy = NAUTILUS_ADAPTER_EMBEDDABLE_EMBED_STRATEGY (gtk_object_new (NAUTILUS_TYPE_ADAPTER_EMBEDDABLE_EMBED_STRATEGY, NULL)); + strategy = NAUTILUS_ADAPTER_EMBEDDABLE_EMBED_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_EMBEDDABLE_EMBED_STRATEGY, NULL)); gtk_object_ref (GTK_OBJECT (strategy)); gtk_object_sink (GTK_OBJECT (strategy)); @@ -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); - gtk_signal_connect (GTK_OBJECT (strategy->details->view_frame), + g_signal_connect (G_OBJECT (strategy->details->view_frame), "activate_uri", GTK_SIGNAL_FUNC (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 3d323d7b1..b50220612 100644 --- a/components/adapter/nautilus-adapter-factory-server.c +++ b/components/adapter/nautilus-adapter-factory-server.c @@ -39,13 +39,6 @@ #include <eel/eel-gtk-macros.h> #include <libnautilus/nautilus-bonobo-ui.h> -typedef struct { - POA_Nautilus_ComponentAdapterFactory servant; - NautilusAdapterFactoryServer *bonobo_object; -} impl_POA_Nautilus_ComponentAdapterFactory; - - - static Nautilus_View impl_Nautilus_ComponentAdapterFactory_create_adapter (PortableServer_Servant servant, const Bonobo_Unknown component, @@ -60,34 +53,14 @@ impl_Nautilus_ComponentAdapterFactory__create (NautilusAdapterFactoryServ CORBA_Environment *ev); -POA_Nautilus_ComponentAdapterFactory__epv impl_Nautilus_ComponentAdapterFactory_epv = -{ - NULL, - &impl_Nautilus_ComponentAdapterFactory_create_adapter -}; - - -static PortableServer_ServantBase__epv base_epv; - -static POA_Nautilus_ComponentAdapterFactory__vepv impl_Nautilus_ComponentAdapterFactory_vepv = -{ - &base_epv, - NULL, - &impl_Nautilus_ComponentAdapterFactory_epv -}; - - - static void nautilus_adapter_factory_server_class_init (NautilusAdapterFactoryServerClass *klass); static void nautilus_adapter_factory_server_init (NautilusAdapterFactoryServer *server); static void nautilus_adapter_factory_server_destroy (GtkObject *object); EEL_CLASS_BOILERPLATE (NautilusAdapterFactoryServer, - nautilus_adapter_factory_server, - BONOBO_OBJECT_TYPE) - - + nautilus_adapter_factory_server, + BONOBO_OBJECT_TYPE) static void nautilus_adapter_factory_server_class_init (NautilusAdapterFactoryServerClass *klass) @@ -150,7 +123,7 @@ impl_Nautilus_ComponentAdapterFactory_create_adapter (PortableServer_Servant se adapter_view = nautilus_adapter_get_nautilus_view (adapter); - gtk_signal_connect (GTK_OBJECT (adapter_view), "destroy", + g_signal_connect (G_OBJECT (adapter_view), "destroy", adapter_object_destroyed, factory_servant->bonobo_object); return CORBA_Object_duplicate @@ -191,7 +164,7 @@ impl_Nautilus_ComponentAdapterFactory__create (NautilusAdapterFactoryServer *bon servant->servant.vepv = &impl_Nautilus_ComponentAdapterFactory_vepv; POA_Nautilus_ComponentAdapterFactory__init ((PortableServer_Servant) servant, ev); - gtk_signal_connect (GTK_OBJECT (bonobo_object), "destroy", + g_signal_connect (G_OBJECT (bonobo_object), "destroy", GTK_SIGNAL_FUNC (impl_Nautilus_ComponentAdapterFactory__destroy), servant); servant->bonobo_object = bonobo_object; diff --git a/components/adapter/nautilus-adapter-file-load-strategy.c b/components/adapter/nautilus-adapter-file-load-strategy.c index 041f057a2..5c436a90b 100644 --- a/components/adapter/nautilus-adapter-file-load-strategy.c +++ b/components/adapter/nautilus-adapter-file-load-strategy.c @@ -105,7 +105,7 @@ nautilus_adapter_file_load_strategy_new (Bonobo_PersistFile persist_file) { NautilusAdapterFileLoadStrategy *strategy; - strategy = NAUTILUS_ADAPTER_FILE_LOAD_STRATEGY (gtk_object_new (NAUTILUS_TYPE_ADAPTER_FILE_LOAD_STRATEGY, NULL)); + strategy = NAUTILUS_ADAPTER_FILE_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_FILE_LOAD_STRATEGY, NULL)); gtk_object_ref (GTK_OBJECT (strategy)); gtk_object_sink (GTK_OBJECT (strategy)); diff --git a/components/adapter/nautilus-adapter-load-strategy.c b/components/adapter/nautilus-adapter-load-strategy.c index cc0b22869..5bef45230 100644 --- a/components/adapter/nautilus-adapter-load-strategy.c +++ b/components/adapter/nautilus-adapter-load-strategy.c @@ -81,7 +81,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_underway), NULL, NULL, - gtk_marshal_NONE__NONE, + gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[REPORT_LOAD_PROGRESS] = g_signal_new ("report_load_progress", @@ -89,7 +89,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_progress), NULL, NULL, - eel_marshal_NONE__DOUBLE, + eel_marshal_VOID__DOUBLE, G_TYPE_NONE, 1, GTK_TYPE_DOUBLE); signals[REPORT_LOAD_COMPLETE] = g_signal_new ("report_load_complete", @@ -97,7 +97,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_complete), NULL, NULL, - gtk_marshal_NONE__NONE, + gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[REPORT_LOAD_FAILED] = g_signal_new ("report_load_failed", @@ -105,7 +105,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_failed), NULL, NULL, - gtk_marshal_NONE__NONE, + gtk_marshal_VOID__VOID, G_TYPE_NONE, 0); } @@ -200,29 +200,29 @@ nautilus_adapter_load_strategy_stop_loading (NautilusAdapterLoadStrategy *strat void nautilus_adapter_load_strategy_report_load_underway (NautilusAdapterLoadStrategy *strategy) { - gtk_signal_emit (GTK_OBJECT (strategy), - signals[REPORT_LOAD_UNDERWAY]); + g_signal_emit (G_OBJECT (strategy), + signals[REPORT_LOAD_UNDERWAY], 0); } void nautilus_adapter_load_strategy_report_load_progress (NautilusAdapterLoadStrategy *strategy, double fraction_done) { - gtk_signal_emit (GTK_OBJECT (strategy), - signals[REPORT_LOAD_PROGRESS], + g_signal_emit (G_OBJECT (strategy), + signals[REPORT_LOAD_PROGRESS], 0, fraction_done); } void nautilus_adapter_load_strategy_report_load_complete (NautilusAdapterLoadStrategy *strategy) { - gtk_signal_emit (GTK_OBJECT (strategy), - signals[REPORT_LOAD_COMPLETE]); + g_signal_emit (G_OBJECT (strategy), + signals[REPORT_LOAD_COMPLETE], 0); } void nautilus_adapter_load_strategy_report_load_failed (NautilusAdapterLoadStrategy *strategy) { - gtk_signal_emit (GTK_OBJECT (strategy), - signals[REPORT_LOAD_FAILED]); + g_signal_emit (G_OBJECT (strategy), + signals[REPORT_LOAD_FAILED], 0); } diff --git a/components/adapter/nautilus-adapter-progressive-load-strategy.c b/components/adapter/nautilus-adapter-progressive-load-strategy.c index d568501d6..6de09fa2b 100644 --- a/components/adapter/nautilus-adapter-progressive-load-strategy.c +++ b/components/adapter/nautilus-adapter-progressive-load-strategy.c @@ -118,7 +118,7 @@ nautilus_adapter_progressive_load_strategy_new (Bonobo_ProgressiveDataSink prog CORBA_exception_init (&ev); - strategy = NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY (gtk_object_new (NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY, NULL)); + strategy = NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY, NULL)); gtk_object_ref (GTK_OBJECT (strategy)); gtk_object_sink (GTK_OBJECT (strategy)); diff --git a/components/adapter/nautilus-adapter-stream-load-strategy.c b/components/adapter/nautilus-adapter-stream-load-strategy.c index 6edbeda86..9df2d5272 100644 --- a/components/adapter/nautilus-adapter-stream-load-strategy.c +++ b/components/adapter/nautilus-adapter-stream-load-strategy.c @@ -102,7 +102,7 @@ nautilus_adapter_stream_load_strategy_new (Bonobo_PersistStream persist_stream) { NautilusAdapterStreamLoadStrategy *strategy; - strategy = NAUTILUS_ADAPTER_STREAM_LOAD_STRATEGY (gtk_object_new (NAUTILUS_TYPE_ADAPTER_STREAM_LOAD_STRATEGY, NULL)); + strategy = NAUTILUS_ADAPTER_STREAM_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_STREAM_LOAD_STRATEGY, NULL)); gtk_object_ref (GTK_OBJECT (strategy)); gtk_object_sink (GTK_OBJECT (strategy)); diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c index 6753975f4..a647f1727 100644 --- a/components/adapter/nautilus-adapter.c +++ b/components/adapter/nautilus-adapter.c @@ -144,7 +144,7 @@ nautilus_adapter_new (Bonobo_Unknown component) * construct args */ - adapter = NAUTILUS_ADAPTER (gtk_object_new (NAUTILUS_TYPE_ADAPTER, NULL)); + adapter = NAUTILUS_ADAPTER (g_object_new (NAUTILUS_TYPE_ADAPTER, NULL)); /* Set up a few wrapper framework details */ bin = gtk_widget_new (EEL_TYPE_GENEROUS_BIN, NULL); @@ -169,11 +169,11 @@ nautilus_adapter_new (Bonobo_Unknown component) if (zoomable != NULL) bonobo_object_add_interface (BONOBO_OBJECT (control), zoomable); - gtk_signal_connect (GTK_OBJECT (control), "activate", + g_signal_connect (G_OBJECT (control), "activate", GTK_SIGNAL_FUNC (nautilus_adapter_activate_callback), adapter); - gtk_signal_connect (GTK_OBJECT (adapter->details->embed_strategy), "open_location", + g_signal_connect (G_OBJECT (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. */ - gtk_signal_connect (GTK_OBJECT (adapter->details->nautilus_view), + g_signal_connect (G_OBJECT (adapter->details->nautilus_view), "load_location", nautilus_adapter_load_location_callback, adapter); - gtk_signal_connect (GTK_OBJECT (adapter->details->nautilus_view), + g_signal_connect (G_OBJECT (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 b72fbabe8..7809e7529 100644 --- a/components/hardware/main.c +++ b/components/hardware/main.c @@ -54,11 +54,11 @@ hardware_view_make_object (BonoboGenericFactory *factory, return NULL; } - view = nautilus_hardware_view_get_nautilus_view (NAUTILUS_HARDWARE_VIEW (gtk_object_new (NAUTILUS_TYPE_HARDWARE_VIEW, NULL))); + view = nautilus_hardware_view_get_nautilus_view (NAUTILUS_HARDWARE_VIEW (g_object_new (NAUTILUS_TYPE_HARDWARE_VIEW, NULL))); object_count++; - gtk_signal_connect (GTK_OBJECT (view), "destroy", hardware_view_object_destroyed, NULL); + g_signal_connect (G_OBJECT (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 7b7185a0b..9e1d06af6 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)); - gtk_signal_connect (GTK_OBJECT (hardware_view->details->nautilus_view), + g_signal_connect (G_OBJECT (hardware_view->details->nautilus_view), "load_location", GTK_SIGNAL_FUNC (hardware_view_load_location_callback), hardware_view); diff --git a/components/help/Makefile.am b/components/help/Makefile.am index 769988fe7..6d3d16b77 100644 --- a/components/help/Makefile.am +++ b/components/help/Makefile.am @@ -53,7 +53,7 @@ modulesconf_DATA = help-methods.conf hyperboladir=$(datadir)/nautilus/components/hyperbola hyperbola_DATA=topleveldocs.xml -uidir=$(datadir)/gnome/ui +uidir=$(datadir)/gnome-2.0/ui ui_DATA = nautilus-hyperbola-ui.xml serverdir = $(datadir)/server diff --git a/components/help/hyperbola-main.c b/components/help/hyperbola-main.c index 798ae9277..84628d69c 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++; - gtk_signal_connect (GTK_OBJECT (retval), "destroy", + g_signal_connect (G_OBJECT (retval), "destroy", do_destroy, NULL); } diff --git a/components/help/hyperbola-nav-index.c b/components/help/hyperbola-nav-index.c index 49474b718..fa75caf2c 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 (); - gtk_signal_connect (GTK_OBJECT (hni->ent), "changed", + g_signal_connect (G_OBJECT (hni->ent), "changed", hyperbola_navigation_index_ent_changed, hni); - gtk_signal_connect (GTK_OBJECT (hni->ent), "activate", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (hni->clist), "select_row", + g_signal_connect (G_OBJECT (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)); - gtk_signal_connect (GTK_OBJECT (hni->contents_rbutton), "toggled", + g_signal_connect (G_OBJECT (hni->contents_rbutton), "toggled", GTK_SIGNAL_FUNC(show_indexes_for_contents_selection_button), hni); - gtk_signal_connect (GTK_OBJECT (hni->all_rbutton), "toggled", + g_signal_connect (G_OBJECT (hni->all_rbutton), "toggled", GTK_SIGNAL_FUNC(show_indexes_for_all_docs_button), hni); - gtk_signal_connect (GTK_OBJECT (hni->specific_rbutton), "toggled", GTK_SIGNAL_FUNC(show_indexes_for_specific_docs_button), hni); + g_signal_connect (G_OBJECT (hni->specific_rbutton), "toggled", GTK_SIGNAL_FUNC(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)); - gtk_signal_connect (GTK_OBJECT (hni->all_terms_rbutton), "toggled", + g_signal_connect (G_OBJECT (hni->all_terms_rbutton), "toggled", GTK_SIGNAL_FUNC(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)); - gtk_signal_connect (GTK_OBJECT (hni->specific_terms_rbutton), "toggled", + g_signal_connect (G_OBJECT (hni->specific_terms_rbutton), "toggled", GTK_SIGNAL_FUNC(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(); - gtk_signal_connect (GTK_OBJECT (hni->ent), "changed", + g_signal_connect (G_OBJECT (hni->ent), "changed", hyperbola_navigation_index_ent_changed, hni); - gtk_signal_connect (GTK_OBJECT (hni->ent), "activate", + g_signal_connect (G_OBJECT (hni->ent), "activate", hyperbola_navigation_index_ent_activate, hni); gtk_container_add (GTK_CONTAINER (mid_hbox), hni->ent); @@ -2716,13 +2716,13 @@ 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 = gtk_signal_connect (GTK_OBJECT ( + select_handler_id = g_signal_connect (G_OBJECT ( hni->index_contents->ctree), "tree_select_row", hyperbola_navigation_index_tree_select_row, hni); - gtk_signal_connect (GTK_OBJECT ( + g_signal_connect (G_OBJECT ( hni->index_contents->ctree), "tree_unselect_row", hyperbola_navigation_index_tree_unselect_row, hni); - gtk_signal_connect (GTK_OBJECT (hni->index_contents->ctree), "destroy", + g_signal_connect (G_OBJECT (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 0d3e45610..2e0f8ad47 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 (); - gtk_signal_connect (GTK_OBJECT (hns->ent), "changed", + g_signal_connect (G_OBJECT (hns->ent), "changed", hyperbola_navigation_search_ent_changed, hns); - gtk_signal_connect (GTK_OBJECT (hns->ent), "activate", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (hns->clist), "select_row", + g_signal_connect (G_OBJECT (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 91e2b9a9d..9d1857a84 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); - gtk_signal_connect (GTK_OBJECT (contents->top_ctree), "tree_select_row", + g_signal_connect (G_OBJECT (contents->top_ctree), "tree_select_row", hyperbola_navigation_tree_select_row, contents); - gtk_signal_connect (GTK_OBJECT (contents->top_ctree), "destroy", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (contents->ctree), "tree_select_row", + g_signal_connect (G_OBJECT (contents->ctree), "tree_select_row", hyperbola_navigation_tree_select_row, contents); - gtk_signal_connect (GTK_OBJECT (contents->ctree), "destroy", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (index->clist), "select_row", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (contents->view_frame), "load_location", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (view->ctree), "tree_select_row", + g_signal_connect (G_OBJECT (view->ctree), "tree_select_row", hyperbola_navigation_tree_select_row, view); - gtk_signal_connect (GTK_OBJECT (view->ctree), "destroy", + g_signal_connect (G_OBJECT (view->ctree), "destroy", hyperbola_navigation_tree_destroy, view); @@ -569,7 +569,7 @@ hyperbola_navigation_tree_new (void) view->view_frame = nautilus_view_new (wtmp); - gtk_signal_connect (GTK_OBJECT (view->view_frame), "load_location", + g_signal_connect (G_OBJECT (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 c637cfec0..24f67bdc2 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) gtk_object_ref (GTK_OBJECT (list)); view->list = list; - gtk_signal_connect (GTK_OBJECT (list), + g_signal_connect (G_OBJECT (list), "button-press-event", button_press_callback, view); - gtk_signal_connect (GTK_OBJECT (list), + g_signal_connect (G_OBJECT (list), "button-release-event", button_release_callback, view); - gtk_signal_connect (GTK_OBJECT (view), + g_signal_connect (G_OBJECT (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 765203a59..8c7eec60e 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); } - gtk_signal_emit_by_name (GTK_OBJECT (zoomable), "set_zoom_level", + g_signal_emit_by_name (GTK_OBJECT (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); - gtk_signal_emit_by_name (GTK_OBJECT (zoomable), "set_zoom_level", + g_signal_emit_by_name (GTK_OBJECT (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) { - gtk_signal_emit_by_name (GTK_OBJECT (zoomable), "set_zoom_level", + g_signal_emit_by_name (GTK_OBJECT (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) { - gtk_signal_emit_by_name (GTK_OBJECT (zoomable), "set_zoom_level", + g_signal_emit_by_name (GTK_OBJECT (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; - gtk_signal_connect (GTK_OBJECT (bod->drawing_area), + g_signal_connect (G_OBJECT (bod->drawing_area), "expose_event", GTK_SIGNAL_FUNC (drawing_area_exposed), bod); @@ -689,20 +689,20 @@ control_factory_common (GtkWidget *scrolled_window) */ gtk_widget_ref (bod->drawing_area); - gtk_signal_connect (GTK_OBJECT (bod->control), "destroy", + g_signal_connect (G_OBJECT (bod->control), "destroy", GTK_SIGNAL_FUNC (control_destroy_callback), bod); bod->zoomable = bonobo_zoomable_new (); - gtk_signal_connect (GTK_OBJECT (bod->zoomable), "set_zoom_level", + g_signal_connect (G_OBJECT (bod->zoomable), "set_zoom_level", GTK_SIGNAL_FUNC (zoomable_set_zoom_level_callback), bod); - gtk_signal_connect (GTK_OBJECT (bod->zoomable), "zoom_in", + g_signal_connect (G_OBJECT (bod->zoomable), "zoom_in", GTK_SIGNAL_FUNC (zoomable_zoom_in_callback), bod); - gtk_signal_connect (GTK_OBJECT (bod->zoomable), "zoom_out", + g_signal_connect (G_OBJECT (bod->zoomable), "zoom_out", GTK_SIGNAL_FUNC (zoomable_zoom_out_callback), bod); - gtk_signal_connect (GTK_OBJECT (bod->zoomable), "zoom_to_fit", + g_signal_connect (G_OBJECT (bod->zoomable), "zoom_to_fit", GTK_SIGNAL_FUNC (zoomable_zoom_to_fit_callback), bod); - gtk_signal_connect (GTK_OBJECT (bod->zoomable), "zoom_to_default", + g_signal_connect (G_OBJECT (bod->zoomable), "zoom_to_default", GTK_SIGNAL_FUNC (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)); - gtk_signal_connect (GTK_OBJECT (bod->control), "activate", + g_signal_connect (G_OBJECT (bod->control), "activate", GTK_SIGNAL_FUNC (control_activate_callback), bod); /* @@ -743,7 +743,7 @@ scaled_control_factory (void) bod = control_factory_common (NULL); - gtk_signal_connect (GTK_OBJECT (bod->drawing_area), "size_allocate", + g_signal_connect (G_OBJECT (bod->drawing_area), "size_allocate", GTK_SIGNAL_FUNC (control_size_allocate_callback), bod); return bod; @@ -763,11 +763,11 @@ scrollable_control_factory (void) bod = control_factory_common (scroll); - gtk_signal_connect (GTK_OBJECT (bod->drawing_area), "size_allocate", + g_signal_connect (G_OBJECT (bod->drawing_area), "size_allocate", GTK_SIGNAL_FUNC (scrolled_control_size_allocate_callback), bod); - gtk_signal_connect (GTK_OBJECT (bod->scrolled_window), "size_allocate", + g_signal_connect (G_OBJECT (bod->scrolled_window), "size_allocate", GTK_SIGNAL_FUNC (scrolled_window_size_allocate_callback), bod); diff --git a/components/loser/content/Makefile.am b/components/loser/content/Makefile.am index 1eea56d25..e37a29dfd 100644 --- a/components/loser/content/Makefile.am +++ b/components/loser/content/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ $(NAUTILUS_PRIVATE_CFLAGS) \ $(NULL) -uidir = $(datadir)/gnome/ui +uidir = $(datadir)/gnome-2.0/ui ui_DATA = nautilus-content-loser-ui.xml bin_PROGRAMS = \ diff --git a/components/loser/content/main.c b/components/loser/content/main.c index 392846dfa..b183f27d2 100644 --- a/components/loser/content/main.c +++ b/components/loser/content/main.c @@ -56,13 +56,13 @@ loser_make_object (BonoboGenericFactory *factory, return NULL; } - view = NAUTILUS_CONTENT_LOSER (gtk_object_new (NAUTILUS_TYPE_CONTENT_LOSER, NULL)); + view = NAUTILUS_CONTENT_LOSER (g_object_new (NAUTILUS_TYPE_CONTENT_LOSER, NULL)); object_count++; nautilus_view = nautilus_content_loser_get_nautilus_view (view); - gtk_signal_connect (GTK_OBJECT (nautilus_view), "destroy", loser_object_destroyed, NULL); + g_signal_connect (G_OBJECT (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 30972958b..84fb9492e 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)); - gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), + g_signal_connect (G_OBJECT (view->details->nautilus_view), "load_location", GTK_SIGNAL_FUNC (loser_load_location_callback), view); @@ -85,7 +85,7 @@ 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. */ - gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control + g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control (view->details->nautilus_view)), "activate", loser_merge_bonobo_items_callback, diff --git a/components/loser/sidebar/Makefile.am b/components/loser/sidebar/Makefile.am index 88f4b5bd7..cfe4edd90 100644 --- a/components/loser/sidebar/Makefile.am +++ b/components/loser/sidebar/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = \ $(NAUTILUS_PRIVATE_CFLAGS) \ $(NULL) -uidir = $(datadir)/gnome/ui +uidir = $(datadir)/gnome-2.0/ui ui_DATA = nautilus-sidebar-loser-ui.xml bin_PROGRAMS = \ diff --git a/components/loser/sidebar/main.c b/components/loser/sidebar/main.c index 99ab0effe..d32ee0805 100644 --- a/components/loser/sidebar/main.c +++ b/components/loser/sidebar/main.c @@ -56,13 +56,13 @@ loser_make_object (BonoboGenericFactory *factory, return NULL; } - view = NAUTILUS_SIDEBAR_LOSER (gtk_object_new (NAUTILUS_TYPE_SIDEBAR_LOSER, NULL)); + view = NAUTILUS_SIDEBAR_LOSER (g_object_new (NAUTILUS_TYPE_SIDEBAR_LOSER, NULL)); object_count++; nautilus_view = nautilus_sidebar_loser_get_nautilus_view (view); - gtk_signal_connect (GTK_OBJECT (nautilus_view), "destroy", loser_object_destroyed, NULL); + g_signal_connect (G_OBJECT (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 760d52f10..613d08090 100644 --- a/components/loser/sidebar/nautilus-sidebar-loser.c +++ b/components/loser/sidebar/nautilus-sidebar-loser.c @@ -79,7 +79,7 @@ nautilus_sidebar_loser_init (NautilusSidebarLoser *view) view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view)); - gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), + g_signal_connect (G_OBJECT (view->details->nautilus_view), "load_location", GTK_SIGNAL_FUNC (loser_load_location_callback), view); @@ -88,7 +88,7 @@ nautilus_sidebar_loser_init (NautilusSidebarLoser *view) * Get notified when our bonobo control is activated so we * can merge menu & toolbar items into Nautilus's UI. */ - gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control + g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control (view->details->nautilus_view)), "activate", loser_merge_bonobo_items_callback, diff --git a/components/mozilla/Makefile.am b/components/mozilla/Makefile.am index f2b444372..dea3a789b 100644 --- a/components/mozilla/Makefile.am +++ b/components/mozilla/Makefile.am @@ -57,7 +57,7 @@ server_DATA = $(server_in_files:.server.in=.server) @INTLTOOL_SERVER_RULE@ -uidir = $(datadir)/gnome/ui +uidir = $(datadir)/gnome-2.0/ui ui_DATA = \ nautilus-mozilla-ui.xml \ $(NULL) diff --git a/components/mozilla/main.c b/components/mozilla/main.c index 8a3b4e425..d344cb867 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 (); - gtk_signal_connect (GTK_OBJECT (bonobo_object), "destroy", mozilla_object_destroyed, NULL); + g_signal_connect (G_OBJECT (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 fa77af017..f062cf294 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 */ - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "realize", GTK_SIGNAL_FUNC (mozilla_realize_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "title", GTK_SIGNAL_FUNC (mozilla_title_changed_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "location", GTK_SIGNAL_FUNC (mozilla_location_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "net_state", GTK_SIGNAL_FUNC (mozilla_net_state_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "net_start", GTK_SIGNAL_FUNC (mozilla_net_start_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "net_stop", GTK_SIGNAL_FUNC (mozilla_net_stop_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "link_message", GTK_SIGNAL_FUNC (mozilla_link_message_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "progress", GTK_SIGNAL_FUNC (mozilla_progress_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "dom_key_press", GTK_SIGNAL_FUNC (mozilla_dom_key_press_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "dom_mouse_click", GTK_SIGNAL_FUNC (mozilla_dom_mouse_click_callback), view); - gtk_signal_connect (GTK_OBJECT (view->details->mozilla), + g_signal_connect (G_OBJECT (view->details->mozilla), "new_window", GTK_SIGNAL_FUNC (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)); - gtk_signal_connect (GTK_OBJECT (view->details->nautilus_view), + g_signal_connect (G_OBJECT (view->details->nautilus_view), "load_location", GTK_SIGNAL_FUNC (view_load_location_callback), view); /* Connect to the active signal of the view to merge our menus */ - gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control (view->details->nautilus_view)), + g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control (view->details->nautilus_view)), "activate", bonobo_control_activate_callback, view); @@ -469,7 +469,7 @@ BonoboObject * nautilus_mozilla_content_view_new (void) { NautilusMozillaContentView *view; - view = NAUTILUS_MOZILLA_CONTENT_VIEW (gtk_object_new (NAUTILUS_TYPE_MOZILLA_CONTENT_VIEW, NULL)); + view = NAUTILUS_MOZILLA_CONTENT_VIEW (g_object_new (NAUTILUS_TYPE_MOZILLA_CONTENT_VIEW, NULL)); return BONOBO_OBJECT (view->details->nautilus_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. */ - gtk_signal_connect (GTK_OBJECT (chrome->mozilla), "visibility", + g_signal_connect (G_OBJECT (chrome->mozilla), "visibility", GTK_SIGNAL_FUNC (mozilla_chrome_visibility_callback), chrome); - gtk_signal_connect (GTK_OBJECT (chrome->mozilla), "destroy_browser", + g_signal_connect (G_OBJECT (chrome->mozilla), "destroy_browser", GTK_SIGNAL_FUNC (mozilla_chrome_destroy_brsr_callback), chrome); - gtk_signal_connect (GTK_OBJECT (chrome->mozilla), "size_to", + g_signal_connect (G_OBJECT (chrome->mozilla), "size_to", GTK_SIGNAL_FUNC (mozilla_chrome_size_to_callback), chrome); - gtk_signal_connect (GTK_OBJECT (chrome->mozilla), "title", + g_signal_connect (G_OBJECT (chrome->mozilla), "title", GTK_SIGNAL_FUNC (mozilla_chrome_title_callback), chrome); diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c index 6bbff5b48..eed827cd0 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); - gtk_signal_connect (GTK_OBJECT (music_view->details->event_box), + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (music_view), + g_signal_connect (G_OBJECT (music_view), "load_location", music_view_load_location_callback, music_view); - gtk_signal_connect (GTK_OBJECT (eel_get_widget_background (GTK_WIDGET (music_view->details->event_box))), + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (music_view->details->song_list), + g_signal_connect (G_OBJECT (music_view->details->song_list), "get_cell_text", GTK_SIGNAL_FUNC (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); - gtk_signal_connect (GTK_OBJECT (music_view->details->song_list), + g_signal_connect (G_OBJECT (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 */ - gtk_signal_connect (GTK_OBJECT (eel_clist_get_vadjustment (EEL_CLIST (music_view->details->song_list))), + g_signal_connect (G_OBJECT (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 */ - gtk_signal_connect (GTK_OBJECT (music_view->details->song_list), "click_column", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (button), "clicked", image_button_callback, music_view); + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (music_view->details->dialog), + g_signal_connect (G_OBJECT (music_view->details->dialog), "destroy", (GtkSignalFunc) dialog_destroy, music_view); - gtk_signal_connect (GTK_OBJECT (file_dialog->ok_button), + g_signal_connect (G_OBJECT (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)); - gtk_signal_connect (GTK_OBJECT (music_view->details->playtime_bar), "button_press_event", + g_signal_connect (G_OBJECT (music_view->details->playtime_bar), "button_press_event", GTK_SIGNAL_FUNC (slider_press_callback), music_view); - gtk_signal_connect (GTK_OBJECT (music_view->details->playtime_bar), "button_release_event", + g_signal_connect (G_OBJECT (music_view->details->playtime_bar), "button_release_event", GTK_SIGNAL_FUNC (slider_release_callback), music_view); - gtk_signal_connect (GTK_OBJECT (music_view->details->playtime_bar), "motion_notify_event", + g_signal_connect (G_OBJECT (music_view->details->playtime_bar), "motion_notify_event", GTK_SIGNAL_FUNC (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); - gtk_signal_connect (GTK_OBJECT (music_view->details->previous_track_button), "clicked", GTK_SIGNAL_FUNC (prev_button_callback), music_view); + g_signal_connect (G_OBJECT (music_view->details->previous_track_button), "clicked", GTK_SIGNAL_FUNC (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); - gtk_signal_connect (GTK_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (play_button_callback), music_view); + g_signal_connect (G_OBJECT (button), "clicked", GTK_SIGNAL_FUNC (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); - gtk_signal_connect (GTK_OBJECT (music_view->details->pause_button), "clicked", + g_signal_connect (G_OBJECT (music_view->details->pause_button), "clicked", GTK_SIGNAL_FUNC(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); - gtk_signal_connect (GTK_OBJECT (music_view->details->stop_button), "clicked", + g_signal_connect (G_OBJECT (music_view->details->stop_button), "clicked", GTK_SIGNAL_FUNC (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); - gtk_signal_connect (GTK_OBJECT (music_view->details->next_track_button), "clicked", + g_signal_connect (G_OBJECT (music_view->details->next_track_button), "clicked", GTK_SIGNAL_FUNC (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 3677e7514..2731a9e30 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); - gtk_signal_connect (GTK_OBJECT (button), "clicked", + g_signal_connect (G_OBJECT (button), "clicked", (GtkSignalFunc) add_site_button_clicked, news_data); } button = gtk_button_new_with_label (label); gtk_container_add (GTK_CONTAINER (button_box), button); - gtk_signal_connect (GTK_OBJECT (button), "clicked", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (check_button), "toggled", + g_signal_connect (G_OBJECT (check_button), "toggled", GTK_SIGNAL_FUNC (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); - gtk_signal_connect (GTK_OBJECT (news->remove_site_list), "select_row", + g_signal_connect (G_OBJECT (news->remove_site_list), "select_row", GTK_SIGNAL_FUNC (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); - gtk_signal_connect (GTK_OBJECT (news->remove_button), "clicked", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (button), "clicked", + g_signal_connect (G_OBJECT (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 */ - gtk_signal_connect (GTK_OBJECT (news->news_display), "expose_event", + g_signal_connect (G_OBJECT (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); - gtk_signal_connect (GTK_OBJECT (news->news_display), "motion_notify_event", + g_signal_connect (G_OBJECT (news->news_display), "motion_notify_event", (GtkSignalFunc) nautilus_news_motion_notify_event, news); - gtk_signal_connect (GTK_OBJECT (news->news_display), "leave_notify_event", + g_signal_connect (G_OBJECT (news->news_display), "leave_notify_event", (GtkSignalFunc) nautilus_news_leave_notify_event, news); - gtk_signal_connect (GTK_OBJECT (news->news_display), "button_release_event", + g_signal_connect (G_OBJECT (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 */ - gtk_signal_connect (GTK_OBJECT (news->news_display), "size_allocate", news_display_size_allocate, news); - gtk_signal_connect (GTK_OBJECT (news->empty_message), "size_allocate", empty_message_size_allocate, news); + 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); /* Create the nautilus view CORBA object. */ news->view = nautilus_view_new (main_container); - gtk_signal_connect (GTK_OBJECT (news->view), "destroy", do_destroy, news); + g_signal_connect (G_OBJECT (news->view), "destroy", do_destroy, news); - gtk_signal_connect (GTK_OBJECT (news->view), "load_location", + g_signal_connect (G_OBJECT (news->view), "load_location", nautilus_news_load_location, news); /* allocate a property bag to reflect the TAB_IMAGE property */ diff --git a/nautilus.spec.in b/nautilus.spec.in index d64a7917c..a28b72414 100644 --- a/nautilus.spec.in +++ b/nautilus.spec.in @@ -153,12 +153,10 @@ scrollkeeper-update %defattr(0555, bin, bin) %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB TRADEMARK_NOTICE ChangeLog NEWS README -%{_bindir}/nautilus-clean.sh -%{_bindir}/nautilus-verify-rpm.sh -%{_bindir}/nautilus-restore-settings-to-default.sh %{_bindir}/hyperbola %{_bindir}/nautilus %{_bindir}/nautilus-adapter +%{_bindir}/nautilus-clean.sh %{_bindir}/nautilus-error-dialog %{_bindir}/nautilus-hardware-view %{_bindir}/nautilus-history-view @@ -167,36 +165,34 @@ scrollkeeper-update %{_bindir}/nautilus-music-view %{_bindir}/nautilus-news %{_bindir}/nautilus-notes +%{_bindir}/nautilus-restore-settings-to-default.sh %{_bindir}/nautilus-sample-content-view %{_bindir}/nautilus-text-view %{_bindir}/nautilus-throbber +%{_bindir}/nautilus-verify-rpm.sh +%{_libdir}/libnautilus-adapter.so %{_libdir}/libnautilus-adapter.so.0 %{_libdir}/libnautilus-adapter.so.0.0.0 +%{_libdir}/libnautilus-private.so %{_libdir}/libnautilus-private.so.0 %{_libdir}/libnautilus-private.so.0.0.0 +%{_libdir}/libnautilus-tree-view.so %{_libdir}/libnautilus-tree-view.so.0 %{_libdir}/libnautilus-tree-view.so.0.0.0 +%{_libdir}/libnautilus.so %{_libdir}/libnautilus.so.0 %{_libdir}/libnautilus.so.0.0.0 -%{_libdir}/libnautilus-adapter.so -%{_libdir}/libnautilus-private.so -%{_libdir}/libnautilus-tree-view.so -%{_libdir}/libnautilus.so - - - %{_libdir}/vfs/modules/*.so %defattr (0444, bin, bin) %config %{_sysconfdir}/vfs/modules/*.conf -%config %{_sysconfdir}/CORBA/servers/nautilus-launcher-applet.gnorba +%{_datadir}/gnome-2.0/ui/*.xml %{_datadir}/gnome/apps/Applications/*.desktop -%{_datadir}/gnome/ui/*.xml -%{_datadir}/nautilus/components/hyperbola/maps/*.map -%{_datadir}/nautilus/components/hyperbola/*.xml %{_datadir}/locale/*/LC_MESSAGES/*.mo %{_datadir}/nautilus/*.xml +%{_datadir}/nautilus/components/hyperbola/*.xml +%{_datadir}/nautilus/components/hyperbola/maps/*.map %{_datadir}/nautilus/emblems/*.png %{_datadir}/nautilus/linksets/*.xml %{_datadir}/nautilus/patterns/*.jpg @@ -208,28 +204,29 @@ scrollkeeper-update %{_datadir}/pixmaps/nautilus/*.png %{_datadir}/pixmaps/nautilus/*.svg %{_datadir}/pixmaps/nautilus/*.xml -%{_datadir}/pixmaps/nautilus/tahoe/*.png -%{_datadir}/pixmaps/nautilus/tahoe/*.xml -%{_datadir}/pixmaps/nautilus/crux_teal/*.png -%{_datadir}/pixmaps/nautilus/crux_teal/*.xml -%{_datadir}/pixmaps/nautilus/crux_teal/throbber/*.png -%{_datadir}/pixmaps/nautilus/crux_teal/backgrounds/*.png -%{_datadir}/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/*.png %{_datadir}/pixmaps/nautilus/crux_eggplant/*.png %{_datadir}/pixmaps/nautilus/crux_eggplant/*.xml -%{_datadir}/pixmaps/nautilus/crux_eggplant/throbber/*.png %{_datadir}/pixmaps/nautilus/crux_eggplant/backgrounds/*.png %{_datadir}/pixmaps/nautilus/crux_eggplant/sidebar_tab_pieces/*.png +%{_datadir}/pixmaps/nautilus/crux_eggplant/throbber/*.png +%{_datadir}/pixmaps/nautilus/crux_teal/*.png +%{_datadir}/pixmaps/nautilus/crux_teal/*.xml +%{_datadir}/pixmaps/nautilus/crux_teal/backgrounds/*.png +%{_datadir}/pixmaps/nautilus/crux_teal/sidebar_tab_pieces/*.png +%{_datadir}/pixmaps/nautilus/crux_teal/throbber/*.png %{_datadir}/pixmaps/nautilus/gnome/*.png %{_datadir}/pixmaps/nautilus/gnome/*.xml %{_datadir}/pixmaps/nautilus/gnome/throbber/*.png %{_datadir}/pixmaps/nautilus/sidebar_tab_pieces/*.png -%{_datadir}/pixmaps/nautilus/throbber/*.png -%{_datadir}/pixmaps/nautilus/sierra/*.xml %{_datadir}/pixmaps/nautilus/sierra/*.png -%{_libdir}/bonobo/servers/Nautilus_View_help.server +%{_datadir}/pixmaps/nautilus/sierra/*.xml +%{_datadir}/pixmaps/nautilus/tahoe/*.png +%{_datadir}/pixmaps/nautilus/tahoe/*.xml +%{_datadir}/pixmaps/nautilus/throbber/*.png %{_libdir}/bonobo/servers/Nautilus_ComponentAdapterFactory_std.server +%{_libdir}/bonobo/servers/Nautilus_Control_throbber.server %{_libdir}/bonobo/servers/Nautilus_View_hardware.server +%{_libdir}/bonobo/servers/Nautilus_View_help.server %{_libdir}/bonobo/servers/Nautilus_View_history.server %{_libdir}/bonobo/servers/Nautilus_View_image.server %{_libdir}/bonobo/servers/Nautilus_View_music.server @@ -239,7 +236,6 @@ scrollkeeper-update %{_libdir}/bonobo/servers/Nautilus_View_text.server %{_libdir}/bonobo/servers/Nautilus_View_tree.server %{_libdir}/bonobo/servers/Nautilus_shell.server -%{_libdir}/bonobo/servers/Nautilus_Control_throbber.server # We put the idl files in the main package, not the devel package # because the perl corba bindings can use the .idl files at run time. @@ -254,9 +250,8 @@ scrollkeeper-update %defattr(0555, bin, bin) %{_libdir}/*.la -%{_libdir}/vfs/modules/*.la %{_libdir}/*.sh -%{_bindir}/nautilus-config +%{_libdir}/vfs/modules/*.la %defattr(0444, bin, bin) %{_includedir}/libnautilus/*.h |