Commit 52b329b1 authored by Darin Adler's avatar Darin Adler

Lots of files. Another GtkObject -> GObject pass.

	* Lots of files.
	Another GtkObject -> GObject pass.
parent 5fb5bf37
2001-11-06 Darin Adler <darin@bentspoon.com>
* Lots of files.
Another GtkObject -> GObject pass.
2001-11-06 Darin Adler <darin@bentspoon.com>
Did some fixes based on a patch Michael sent me.
......
......@@ -459,7 +459,7 @@ bonobo_stream_vfs_new_internal (GnomeVFSHandle *handle)
CORBA_exception_init (&ev);
if (CORBA_Object_is_nil (corba_stream, &ev)){
gtk_object_unref (GTK_OBJECT (stream_vfs));
g_object_unref (G_OBJECT (stream_vfs));
CORBA_exception_free (&ev);
return NULL;
}
......
......@@ -157,7 +157,7 @@ nautilus_adapter_control_embed_strategy_new (Bonobo_Control control,
CORBA_Environment ev;
strategy = NAUTILUS_ADAPTER_CONTROL_EMBED_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_CONTROL_EMBED_STRATEGY, NULL));
gtk_object_ref (GTK_OBJECT (strategy));
g_object_ref (G_OBJECT (strategy));
gtk_object_sink (GTK_OBJECT (strategy));
strategy->details->control_frame = bonobo_control_frame_new (ui_container);
......@@ -167,7 +167,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),
"activate_uri", GTK_SIGNAL_FUNC (activate_uri_callback), strategy);
"activate_uri", G_CALLBACK (activate_uri_callback), strategy);
CORBA_exception_init (&ev);
corba_zoomable = Bonobo_Unknown_queryInterface (control,
......
......@@ -169,7 +169,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable,
CORBA_Environment ev;
strategy = NAUTILUS_ADAPTER_EMBEDDABLE_EMBED_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_EMBEDDABLE_EMBED_STRATEGY, NULL));
gtk_object_ref (GTK_OBJECT (strategy));
g_object_ref (G_OBJECT (strategy));
gtk_object_sink (GTK_OBJECT (strategy));
embeddable_wrapper = bonobo_object_client_from_corba
......@@ -204,7 +204,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable,
bonobo_view_frame_set_covered (strategy->details->view_frame, FALSE);
g_signal_connect (G_OBJECT (strategy->details->view_frame),
"activate_uri", GTK_SIGNAL_FUNC (activate_uri_callback), strategy);
"activate_uri", G_CALLBACK (activate_uri_callback), strategy);
gtk_widget_show (strategy->details->client_widget);
......
......@@ -72,7 +72,7 @@ nautilus_adapter_embed_strategy_class_init (NautilusAdapterEmbedStrategyClass *k
G_STRUCT_OFFSET (NautilusAdapterEmbedStrategyClass, activate),
NULL, NULL,
gtk_marshal_VOID__POINTER,
GTK_TYPE_POINTER, 0);
G_TYPE_POINTER, 0);
signals[DEACTIVATE] =
g_signal_new ("deactivate",
G_TYPE_FROM_CLASS (object_class),
......
......@@ -169,7 +169,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable,
CORBA_Environment ev;
strategy = NAUTILUS_ADAPTER_EMBEDDABLE_EMBED_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_EMBEDDABLE_EMBED_STRATEGY, NULL));
gtk_object_ref (GTK_OBJECT (strategy));
g_object_ref (G_OBJECT (strategy));
gtk_object_sink (GTK_OBJECT (strategy));
embeddable_wrapper = bonobo_object_client_from_corba
......@@ -204,7 +204,7 @@ nautilus_adapter_embeddable_embed_strategy_new (Bonobo_Embeddable embeddable,
bonobo_view_frame_set_covered (strategy->details->view_frame, FALSE);
g_signal_connect (G_OBJECT (strategy->details->view_frame),
"activate_uri", GTK_SIGNAL_FUNC (activate_uri_callback), strategy);
"activate_uri", G_CALLBACK (activate_uri_callback), strategy);
gtk_widget_show (strategy->details->client_widget);
......
......@@ -165,7 +165,7 @@ impl_Nautilus_ComponentAdapterFactory__create (NautilusAdapterFactoryServer *bon
POA_Nautilus_ComponentAdapterFactory__init ((PortableServer_Servant) servant, ev);
g_signal_connect (G_OBJECT (bonobo_object), "destroy",
GTK_SIGNAL_FUNC (impl_Nautilus_ComponentAdapterFactory__destroy), servant);
G_CALLBACK (impl_Nautilus_ComponentAdapterFactory__destroy), servant);
servant->bonobo_object = bonobo_object;
return bonobo_object_activate_servant (BONOBO_OBJECT (bonobo_object), servant);
......
......@@ -106,7 +106,7 @@ nautilus_adapter_file_load_strategy_new (Bonobo_PersistFile persist_file)
NautilusAdapterFileLoadStrategy *strategy;
strategy = NAUTILUS_ADAPTER_FILE_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_FILE_LOAD_STRATEGY, NULL));
gtk_object_ref (GTK_OBJECT (strategy));
g_object_ref (G_OBJECT (strategy));
gtk_object_sink (GTK_OBJECT (strategy));
strategy->details->persist_file = persist_file;
......@@ -126,7 +126,7 @@ nautilus_adapter_file_load_strategy_load_location (NautilusAdapterLoadStrategy *
strategy = NAUTILUS_ADAPTER_FILE_LOAD_STRATEGY (abstract_strategy);
gtk_object_ref (GTK_OBJECT (strategy));
g_object_ref (G_OBJECT (strategy));
CORBA_exception_init (&ev);
......@@ -148,7 +148,7 @@ nautilus_adapter_file_load_strategy_load_location (NautilusAdapterLoadStrategy *
nautilus_adapter_load_strategy_report_load_failed (abstract_strategy);
}
gtk_object_unref (GTK_OBJECT (strategy));
g_object_unref (G_OBJECT (strategy));
CORBA_exception_free (&ev);
......
......@@ -90,7 +90,7 @@ nautilus_adapter_load_strategy_class_init (NautilusAdapterLoadStrategyClass *kla
G_STRUCT_OFFSET (NautilusAdapterLoadStrategyClass, report_load_progress),
NULL, NULL,
eel_marshal_VOID__DOUBLE,
G_TYPE_NONE, 1, GTK_TYPE_DOUBLE);
G_TYPE_NONE, 1, G_TYPE_DOUBLE);
signals[REPORT_LOAD_COMPLETE] =
g_signal_new ("report_load_complete",
G_TYPE_FROM_CLASS (object_class),
......
......@@ -119,7 +119,7 @@ nautilus_adapter_progressive_load_strategy_new (Bonobo_ProgressiveDataSink prog
CORBA_exception_init (&ev);
strategy = NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY, NULL));
gtk_object_ref (GTK_OBJECT (strategy));
g_object_ref (G_OBJECT (strategy));
gtk_object_sink (GTK_OBJECT (strategy));
strategy->details->progressive_data_sink = progressive_data_sink;
......@@ -188,7 +188,7 @@ stop_loading (NautilusAdapterProgressiveLoadStrategy *strategy,
nautilus_adapter_load_strategy_report_load_complete (NAUTILUS_ADAPTER_LOAD_STRATEGY (strategy));
}
}
gtk_object_unref (GTK_OBJECT (strategy));
g_object_unref (G_OBJECT (strategy));
gnome_vfs_close (handle);
CORBA_free (iobuf);
CORBA_exception_free (ev);
......@@ -241,7 +241,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
strategy->details->no_report_stop = FALSE;
gtk_object_ref (GTK_OBJECT (strategy));
g_object_ref (G_OBJECT (strategy));
strategy->details->loading = TRUE;
strategy->details->stop = FALSE;
......@@ -256,7 +256,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
if (gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ) != GNOME_VFS_OK) {
nautilus_adapter_load_strategy_report_load_failed (abstract_strategy);
gtk_object_unref (GTK_OBJECT (strategy));
g_object_unref (G_OBJECT (strategy));
CORBA_exception_free (&ev);
declare_done_loading (strategy);
return;
......@@ -271,7 +271,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
if (strategy->details->stop) {
nautilus_adapter_load_strategy_report_load_complete (abstract_strategy);
gtk_object_unref (GTK_OBJECT (strategy));
g_object_unref (G_OBJECT (strategy));
CORBA_exception_free (&ev);
declare_done_loading (strategy);
return;
......@@ -312,7 +312,7 @@ nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStr
if (ev._major == CORBA_NO_EXCEPTION) {
Bonobo_ProgressiveDataSink_end (strategy->details->progressive_data_sink, &ev);
nautilus_adapter_load_strategy_report_load_complete (abstract_strategy);
gtk_object_unref (GTK_OBJECT (strategy));
g_object_unref (G_OBJECT (strategy));
gnome_vfs_close (handle);
CORBA_free (iobuf);
CORBA_exception_free (&ev);
......
......@@ -103,7 +103,7 @@ nautilus_adapter_stream_load_strategy_new (Bonobo_PersistStream persist_stream)
NautilusAdapterStreamLoadStrategy *strategy;
strategy = NAUTILUS_ADAPTER_STREAM_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_STREAM_LOAD_STRATEGY, NULL));
gtk_object_ref (GTK_OBJECT (strategy));
g_object_ref (G_OBJECT (strategy));
gtk_object_sink (GTK_OBJECT (strategy));
strategy->details->persist_stream = persist_stream;
......@@ -121,7 +121,7 @@ nautilus_adapter_stream_load_strategy_load_location (NautilusAdapterLoadStrategy
CORBA_Environment ev;
strategy = NAUTILUS_ADAPTER_STREAM_LOAD_STRATEGY (abstract_strategy);
gtk_object_ref (GTK_OBJECT (strategy));
g_object_ref (G_OBJECT (strategy));
CORBA_exception_init (&ev);
......@@ -157,7 +157,7 @@ nautilus_adapter_stream_load_strategy_load_location (NautilusAdapterLoadStrategy
}
gtk_object_unref (GTK_OBJECT (strategy));
g_object_unref (G_OBJECT (strategy));
CORBA_exception_free (&ev);
}
......
......@@ -94,7 +94,7 @@ static void
nautilus_adapter_init (NautilusAdapter *adapter)
{
adapter->details = g_new0 (NautilusAdapterDetails, 1);
gtk_object_ref (GTK_OBJECT (adapter));
g_object_ref (G_OBJECT (adapter));
gtk_object_sink (GTK_OBJECT (adapter));
}
......@@ -120,11 +120,11 @@ nautilus_adapter_destroy (GtkObject *object)
if (adapter->details->load_strategy != NULL) {
nautilus_adapter_load_strategy_stop_loading (adapter->details->load_strategy);
gtk_object_unref (GTK_OBJECT (adapter->details->load_strategy));
g_object_unref (G_OBJECT (adapter->details->load_strategy));
}
if (adapter->details->embed_strategy != NULL) {
gtk_object_unref (GTK_OBJECT (adapter->details->embed_strategy));
g_object_unref (G_OBJECT (adapter->details->embed_strategy));
}
g_free (adapter->details);
......@@ -160,7 +160,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
/* Get the class to handle embedding this kind of component. */
adapter->details->embed_strategy = nautilus_adapter_embed_strategy_get (component);
if (adapter->details->embed_strategy == NULL) {
gtk_object_unref (GTK_OBJECT (adapter));
g_object_unref (G_OBJECT (adapter));
return NULL;
}
......@@ -170,7 +170,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
bonobo_object_add_interface (BONOBO_OBJECT (control), zoomable);
g_signal_connect (G_OBJECT (control), "activate",
GTK_SIGNAL_FUNC (nautilus_adapter_activate_callback),
G_CALLBACK (nautilus_adapter_activate_callback),
adapter);
g_signal_connect (G_OBJECT (adapter->details->embed_strategy), "open_location",
......@@ -180,7 +180,7 @@ nautilus_adapter_new (Bonobo_Unknown component)
/* Get the class to handle loading this kind of component. */
adapter->details->load_strategy = nautilus_adapter_load_strategy_get (component);
if (adapter->details->load_strategy == NULL) {
gtk_object_unref (GTK_OBJECT (adapter));
g_object_unref (G_OBJECT (adapter));
return NULL;
}
......
......@@ -160,7 +160,7 @@ nautilus_hardware_view_init (NautilusHardwareView *hardware_view)
g_signal_connect (G_OBJECT (hardware_view->details->nautilus_view),
"load_location",
GTK_SIGNAL_FUNC (hardware_view_load_location_callback),
G_CALLBACK (hardware_view_load_location_callback),
hardware_view);
hardware_view->details->form = NULL;
......
......@@ -2235,11 +2235,11 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
gtk_container_add(GTK_CONTAINER(hni->specific_rbutton),GTK_WIDGET(underlined_label));
g_signal_connect (G_OBJECT (hni->contents_rbutton), "toggled",
GTK_SIGNAL_FUNC(show_indexes_for_contents_selection_button),
G_CALLBACK(show_indexes_for_contents_selection_button),
hni);
g_signal_connect (G_OBJECT (hni->all_rbutton), "toggled",
GTK_SIGNAL_FUNC(show_indexes_for_all_docs_button), hni);
g_signal_connect (G_OBJECT (hni->specific_rbutton), "toggled", GTK_SIGNAL_FUNC(show_indexes_for_specific_docs_button), hni);
G_CALLBACK(show_indexes_for_all_docs_button), hni);
g_signal_connect (G_OBJECT (hni->specific_rbutton), "toggled", G_CALLBACK(show_indexes_for_specific_docs_button), hni);
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);
......@@ -2264,7 +2264,7 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
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",
GTK_SIGNAL_FUNC(show_index_for_all_terms), hni);
G_CALLBACK(show_index_for_all_terms), hni);
gtk_box_pack_start(GTK_BOX(mid_vbox), hni->all_terms_rbutton,FALSE,FALSE,0);
radio_group = gtk_radio_button_group(GTK_RADIO_BUTTON(hni->all_terms_rbutton));
underlined_label = gtk_label_new("");
......@@ -2274,7 +2274,7 @@ make_index_display_page(HyperbolaNavigationIndex *hni)
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",
GTK_SIGNAL_FUNC(show_index_for_selected_terms), hni);
G_CALLBACK(show_index_for_selected_terms), hni);
gtk_box_pack_start(GTK_BOX(mid_vbox), hni->specific_terms_rbutton, FALSE, FALSE, 0);
hni->ent = gtk_entry_new();
......
......@@ -178,7 +178,7 @@ update_history (NautilusHistoryView *view,
pixbuf = bonobo_ui_util_xml_to_pixbuf (item->icon);
install_icon (list, new_row, pixbuf);
if (pixbuf != NULL) {
gdk_pixbuf_unref (pixbuf);
g_object_unref (G_OBJECT (pixbuf));
}
gtk_clist_columns_autosize (list);
......@@ -297,7 +297,7 @@ nautilus_history_view_init (NautilusHistoryView *view)
nautilus_view_construct (NAUTILUS_VIEW (view), window);
gtk_object_ref (GTK_OBJECT (list));
g_object_ref (G_OBJECT (list));
view->list = list;
g_signal_connect (G_OBJECT (list),
......@@ -326,7 +326,7 @@ nautilus_history_view_destroy (GtkObject *object)
*view->external_destroyed_flag = TRUE;
}
gtk_object_unref (GTK_OBJECT (view->list));
g_object_unref (G_OBJECT (view->list));
EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
}
......
......@@ -81,17 +81,17 @@ release_pixbuf (bonobo_object_data_t *bod)
g_return_if_fail (bod != NULL);
if (bod->pixbuf != NULL) {
gdk_pixbuf_unref (bod->pixbuf);
g_object_unref (G_OBJECT (bod->pixbuf));
}
bod->pixbuf = NULL;
if (bod->zoomed != NULL) {
gdk_pixbuf_unref (bod->zoomed);
g_object_unref (G_OBJECT (bod->zoomed));
}
bod->zoomed = NULL;
if (bod->scaled != NULL) {
gdk_pixbuf_unref (bod->scaled);
g_object_unref (G_OBJECT (bod->scaled));
}
bod->scaled = NULL;
}
......@@ -409,7 +409,7 @@ rezoom_control (bonobo_object_data_t *bod, float new_zoom_level)
new_height = old_height * new_zoom_level;
if (bod->zoomed)
gdk_pixbuf_unref (bod->zoomed);
g_object_unref (G_OBJECT (bod->zoomed));
if (new_width >= 1 && new_height >= 1) {
bod->zoomed = gdk_pixbuf_scale_simple (pixbuf, new_width,
......@@ -484,7 +484,7 @@ load_image_from_stream (BonoboPersistStream *ps, Bonobo_Stream stream,
Bonobo_Stream_read (stream, LOAD_BUFFER_SIZE, &buffer, ev);
if (ev->_major != CORBA_NO_EXCEPTION) {
gdk_pixbuf_loader_close (loader);
gtk_object_unref (GTK_OBJECT (loader));
g_object_unref (G_OBJECT (loader));
return;
}
......@@ -496,7 +496,7 @@ load_image_from_stream (BonoboPersistStream *ps, Bonobo_Stream stream,
ex_Bonobo_Persist_WrongDataType, NULL);
}
gdk_pixbuf_loader_close (loader);
gtk_object_unref (GTK_OBJECT (loader));
g_object_unref (G_OBJECT (loader));
return;
}
......@@ -509,9 +509,9 @@ load_image_from_stream (BonoboPersistStream *ps, Bonobo_Stream stream,
if (bod->pixbuf == NULL) {
CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_Bonobo_Persist_WrongDataType, NULL);
gtk_object_unref (GTK_OBJECT (loader));
g_object_unref (G_OBJECT (loader));
} else {
gdk_pixbuf_ref (bod->pixbuf);
g_object_ref (G_OBJECT (bod->pixbuf));
/* Restore current zoomed pixbuf cache. */
if (bod->zoom_level != 1.0) {
......@@ -559,7 +559,7 @@ control_size_allocate_callback (GtkWidget *drawing_area, GtkAllocation *allocati
if (allocation->width == gdk_pixbuf_get_width (buf) &&
allocation->height == gdk_pixbuf_get_height (buf)) {
if (bod->scaled != NULL) {
gdk_pixbuf_unref (bod->scaled);
g_object_unref (G_OBJECT (bod->scaled));
bod->scaled = NULL;
}
return;
......@@ -572,7 +572,7 @@ control_size_allocate_callback (GtkWidget *drawing_area, GtkAllocation *allocati
return;
} else {
bod->scaled = NULL;
gdk_pixbuf_unref (control_buf);
g_object_unref (G_OBJECT (control_buf));
control_buf = NULL;
}
}
......@@ -667,7 +667,7 @@ control_factory_common (GtkWidget *scrolled_window)
g_signal_connect (G_OBJECT (bod->drawing_area),
"expose_event",
GTK_SIGNAL_FUNC (drawing_area_exposed), bod);
G_CALLBACK (drawing_area_exposed), bod);
if (scrolled_window) {
bod->root = scrolled_window;
......@@ -690,20 +690,20 @@ control_factory_common (GtkWidget *scrolled_window)
gtk_widget_ref (bod->drawing_area);
g_signal_connect (G_OBJECT (bod->control), "destroy",
GTK_SIGNAL_FUNC (control_destroy_callback), bod);
G_CALLBACK (control_destroy_callback), bod);
bod->zoomable = bonobo_zoomable_new ();
g_signal_connect (G_OBJECT (bod->zoomable), "set_zoom_level",
GTK_SIGNAL_FUNC (zoomable_set_zoom_level_callback), bod);
G_CALLBACK (zoomable_set_zoom_level_callback), bod);
g_signal_connect (G_OBJECT (bod->zoomable), "zoom_in",
GTK_SIGNAL_FUNC (zoomable_zoom_in_callback), bod);
G_CALLBACK (zoomable_zoom_in_callback), bod);
g_signal_connect (G_OBJECT (bod->zoomable), "zoom_out",
GTK_SIGNAL_FUNC (zoomable_zoom_out_callback), bod);
G_CALLBACK (zoomable_zoom_out_callback), bod);
g_signal_connect (G_OBJECT (bod->zoomable), "zoom_to_fit",
GTK_SIGNAL_FUNC (zoomable_zoom_to_fit_callback), bod);
G_CALLBACK (zoomable_zoom_to_fit_callback), bod);
g_signal_connect (G_OBJECT (bod->zoomable), "zoom_to_default",
GTK_SIGNAL_FUNC (zoomable_zoom_to_default_callback), bod);
G_CALLBACK (zoomable_zoom_to_default_callback), bod);
bod->zoom_level = 1.0;
bonobo_zoomable_set_parameters_full (bod->zoomable,
......@@ -720,7 +720,7 @@ control_factory_common (GtkWidget *scrolled_window)
BONOBO_OBJECT (bod->zoomable));
g_signal_connect (G_OBJECT (bod->control), "activate",
GTK_SIGNAL_FUNC (control_activate_callback), bod);
G_CALLBACK (control_activate_callback), bod);
/*
* Interface Bonobo::PersistStream
......@@ -744,7 +744,7 @@ scaled_control_factory (void)
bod = control_factory_common (NULL);
g_signal_connect (G_OBJECT (bod->drawing_area), "size_allocate",
GTK_SIGNAL_FUNC (control_size_allocate_callback), bod);
G_CALLBACK (control_size_allocate_callback), bod);
return bod;
}
......@@ -764,11 +764,11 @@ scrollable_control_factory (void)
bod = control_factory_common (scroll);
g_signal_connect (G_OBJECT (bod->drawing_area), "size_allocate",
GTK_SIGNAL_FUNC (scrolled_control_size_allocate_callback),
G_CALLBACK (scrolled_control_size_allocate_callback),
bod);
g_signal_connect (G_OBJECT (bod->scrolled_window), "size_allocate",
GTK_SIGNAL_FUNC (scrolled_window_size_allocate_callback),
G_CALLBACK (scrolled_window_size_allocate_callback),
bod);
return bod;
......
......@@ -79,7 +79,7 @@ nautilus_content_loser_init (NautilusContentLoser *view)
g_signal_connect (G_OBJECT (view->details->nautilus_view),
"load_location",
GTK_SIGNAL_FUNC (loser_load_location_callback),
G_CALLBACK (loser_load_location_callback),
view);
/* Get notified when our bonobo control is activated so we
......
......@@ -81,7 +81,7 @@ nautilus_sidebar_loser_init (NautilusSidebarLoser *view)
g_signal_connect (G_OBJECT (view->details->nautilus_view),
"load_location",
GTK_SIGNAL_FUNC (loser_load_location_callback),
G_CALLBACK (loser_load_location_callback),
view);
/*
......
......@@ -324,57 +324,57 @@ nautilus_mozilla_content_view_init (NautilusMozillaContentView *view)
/* Add callbacks to the beast */
g_signal_connect (G_OBJECT (view->details->mozilla),
"realize",
GTK_SIGNAL_FUNC (mozilla_realize_callback),
G_CALLBACK (mozilla_realize_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"title",
GTK_SIGNAL_FUNC (mozilla_title_changed_callback),
G_CALLBACK (mozilla_title_changed_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"location",
GTK_SIGNAL_FUNC (mozilla_location_callback),
G_CALLBACK (mozilla_location_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"net_state",
GTK_SIGNAL_FUNC (mozilla_net_state_callback),
G_CALLBACK (mozilla_net_state_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"net_start",
GTK_SIGNAL_FUNC (mozilla_net_start_callback),
G_CALLBACK (mozilla_net_start_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"net_stop",
GTK_SIGNAL_FUNC (mozilla_net_stop_callback),
G_CALLBACK (mozilla_net_stop_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"link_message",
GTK_SIGNAL_FUNC (mozilla_link_message_callback),
G_CALLBACK (mozilla_link_message_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"progress",
GTK_SIGNAL_FUNC (mozilla_progress_callback),
G_CALLBACK (mozilla_progress_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"dom_key_press",
GTK_SIGNAL_FUNC (mozilla_dom_key_press_callback),
G_CALLBACK (mozilla_dom_key_press_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"dom_mouse_click",
GTK_SIGNAL_FUNC (mozilla_dom_mouse_click_callback),
G_CALLBACK (mozilla_dom_mouse_click_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
"new_window",
GTK_SIGNAL_FUNC (mozilla_new_window_callback),
G_CALLBACK (mozilla_new_window_callback),
view);
......@@ -386,7 +386,7 @@ nautilus_mozilla_content_view_init (NautilusMozillaContentView *view)
g_signal_connect (G_OBJECT (view->details->nautilus_view),
"load_location",
GTK_SIGNAL_FUNC (view_load_location_callback),
G_CALLBACK (view_load_location_callback),
view);
/* Connect to the active signal of the view to merge our menus */
......@@ -874,16 +874,16 @@ mozilla_new_window_callback (GtkMozEmbed *mozilla, GtkMozEmbed **new_mozilla, gu
/* set up all the signals that we care about for chrome windows. */
g_signal_connect (G_OBJECT (chrome->mozilla), "visibility",
GTK_SIGNAL_FUNC (mozilla_chrome_visibility_callback),
G_CALLBACK (mozilla_chrome_visibility_callback),
chrome);
g_signal_connect (G_OBJECT (chrome->mozilla), "destroy_browser",
GTK_SIGNAL_FUNC (mozilla_chrome_destroy_brsr_callback),
G_CALLBACK (mozilla_chrome_destroy_brsr_callback),
chrome);
g_signal_connect (G_OBJECT (chrome->mozilla), "size_to",
GTK_SIGNAL_FUNC (mozilla_chrome_size_to_callback),
G_CALLBACK (mozilla_chrome_size_to_callback),
chrome);
g_signal_connect (G_OBJECT (chrome->mozilla), "title",
GTK_SIGNAL_FUNC (mozilla_chrome_title_callback),
G_CALLBACK (mozilla_chrome_title_callback),
chrome);
/* and realize the widgets */
......
......@@ -220,7 +220,7 @@ static void streaming_save_browse_cb(GtkWidget * w, gpointer data)
{
streaming_save_dirbrowser = xmms_create_dir_browser(_("Select the directory where you want to store the MPEG streams:"),
mpg123_cfg.save_http_path, GTK_SELECTION_SINGLE, streaming_save_dirbrowser_cb);
gtk_signal_connect(GTK_OBJECT(streaming_save_dirbrowser), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &streaming_save_dirbrowser);
gtk_signal_connect(GTK_OBJECT(streaming_save_dirbrowser), "destroy", G_CALLBACK(gtk_widget_destroyed), &streaming_save_dirbrowser);
gtk_window_set_transient_for(GTK_WINDOW(streaming_save_dirbrowser), GTK_WINDOW(mpg123_configurewin));
gtk_widget_show(streaming_save_dirbrowser);
}
......@@ -275,8 +275,8 @@ void mpg123_configure(void)
return;
}
mpg123_configurewin = gtk_window_new(GTK_WINDOW_DIALOG);
gtk_signal_connect(GTK_OBJECT(mpg123_configurewin), "destroy", GTK_SIGNAL_FUNC(gtk_widget_destroyed), &mpg123_configurewin);
gtk_signal_connect(GTK_OBJECT(mpg123_configurewin), "destroy", GTK_SIGNAL_FUNC(configure_destroy), &mpg123_configurewin);
gtk_signal_connect(GTK_OBJECT(mpg123_configurewin), "destroy", G_CALLBACK(gtk_widget_destroyed), &mpg123_configurewin);
gtk_signal_connect(GTK_OBJECT(mpg123_configurewin), "destroy", G_CALLBACK(configure_destroy), &mpg123_configurewin);
gtk_window_set_title(GTK_WINDOW(mpg123_configurewin), _("MPG123 Configuration"));
gtk_window_set_wmclass(GTK_WINDOW(mpg123_configurewin), "mpg123_configuration", "Nautilus");
gtk_window_set_policy(GTK_WINDOW(mpg123_configurewin), FALSE, FALSE, FALSE);
......@@ -430,14 +430,14 @@ void mpg123_configure(void)
if (mpg123_cfg.use_3dnow == 0)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(auto_select), TRUE);
gtk_box_pack_start(GTK_BOX(decoder_vbox), auto_select, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(auto_select), "clicked", GTK_SIGNAL_FUNC(auto_select_cb), NULL);
gtk_signal_connect(GTK_OBJECT(auto_select), "clicked", G_CALLBACK(auto_select_cb), NULL);
gtk_widget_show(auto_select);
decoder_3dnow = gtk_radio_button_new_with_label(NULL, _("use 3DNow! optimized decoder"));
if (((support_3dnow() == TRUE) && mpg123_cfg.use_3dnow != 2) || (mpg123_cfg.use_3dnow == 1))
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decoder_3dnow), TRUE);
gtk_box_pack_start(GTK_BOX(decoder_vbox), decoder_3dnow, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(decoder_3dnow), "clicked", GTK_SIGNAL_FUNC(use_3dnow_cb), NULL);
gtk_signal_connect(GTK_OBJECT(decoder_3dnow), "clicked", G_CALLBACK(use_3dnow_cb), NULL);
gtk_widget_show(decoder_3dnow);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_select)) == TRUE)
gtk_widget_set_sensitive(decoder_3dnow, FALSE);
......@@ -446,7 +446,7 @@ void mpg123_configure(void)
if (((support_3dnow() == FALSE) && mpg123_cfg.use_3dnow != 1) || (mpg123_cfg.use_3dnow == 2))
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(decoder_fpu), TRUE);
gtk_box_pack_start(GTK_BOX(decoder_vbox), decoder_fpu, FALSE, FALSE, 0);
gtk_signal_connect(GTK_OBJECT(decoder_fpu), "clicked", GTK_SIGNAL_FUNC(use_fpu_cb), NULL);
gtk_signal_connect(GTK_OBJECT(decoder_fpu), "clicked", G_CALLBACK(use_fpu_cb), NULL);
gtk_widget_show(decoder_fpu);
if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(auto_select)) == TRUE)
gtk_widget_set_sensitive(decoder_fpu, FALSE);
......@@ -527,7 +527,7 @@ void mpg123_configure(void)
streaming_proxy_use = gtk_check_button_new_with_label(_("Use proxy"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_proxy_use), mpg123_cfg.use_proxy);
gtk_signal_connect(GTK_OBJECT(streaming_proxy_use), "clicked", GTK_SIGNAL_FUNC(proxy_use_cb), NULL);
gtk_signal_connect(GTK_OBJECT(streaming_proxy_use), "clicked", G_CALLBACK(proxy_use_cb), NULL);
gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_use, FALSE, FALSE, 0);
gtk_widget_show(streaming_proxy_use);
......@@ -561,7 +561,7 @@ void mpg123_configure(void)
streaming_proxy_auth_use = gtk_check_button_new_with_label(_("Use authentication"));
gtk_widget_set_sensitive(streaming_proxy_auth_use, mpg123_cfg.use_proxy);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_proxy_auth_use), mpg123_cfg.proxy_use_auth);
gtk_signal_connect(GTK_OBJECT(streaming_proxy_auth_use), "clicked", GTK_SIGNAL_FUNC(proxy_auth_use_cb), NULL);
gtk_signal_connect(GTK_OBJECT(streaming_proxy_auth_use), "clicked", G_CALLBACK(proxy_auth_use_cb), NULL);
gtk_box_pack_start(GTK_BOX(streaming_proxy_vbox), streaming_proxy_auth_use, FALSE, FALSE, 0);
gtk_widget_show(streaming_proxy_auth_use);
......@@ -608,7 +608,7 @@ void mpg123_configure(void)
streaming_save_use = gtk_check_button_new_with_label(_("Save stream to disk"));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(streaming_save_use), mpg123_cfg.save_http_stream);
gtk_signal_connect(GTK_OBJECT(streaming_save_use), "clicked", GTK_SIGNAL_FUNC(streaming_save_use_cb), NULL);
gtk_signal_connect(GTK_OBJECT(streaming_save_use), "clicked", G_CALLBACK(streaming_save_use_cb), NULL);
gtk_box_pack_start(GTK_BOX(streaming_save_vbox), streaming_save_use, FALSE, FALSE, 0);
gtk_widget_show(streaming_save_use);
......@@ -626,7 +626,7 @@ void mpg123_configure(void)
gtk_widget_show(streaming_save_entry);