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

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

	* Lots of files.
	Get rid a lot of unneeded casts.
parent ee16c763
......@@ -79,20 +79,19 @@ nautilus_sidebar_loser_init (NautilusSidebarLoser *view)
view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view));
g_signal_connect (G_OBJECT (view->details->nautilus_view),
"load_location",
G_CALLBACK (loser_load_location_callback),
view);
g_signal_connect (view->details->nautilus_view,
"load_location",
G_CALLBACK (loser_load_location_callback),
view);
/*
* Get notified when our bonobo control is activated so we
* can merge menu & toolbar items into Nautilus's UI.
*/
g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control
(view->details->nautilus_view)),
"activate",
loser_merge_bonobo_items_callback,
view);
g_signal_connect (nautilus_view_get_bonobo_control (view->details->nautilus_view)),
"activate",
loser_merge_bonobo_items_callback,
view);
gtk_widget_show (GTK_WIDGET (view));
}
......
......@@ -114,7 +114,7 @@ mozilla_make_object (BonoboGenericFactory *factory,
bonobo_object = nautilus_mozilla_content_view_new ();
g_signal_connect (G_OBJECT (bonobo_object), "destroy", mozilla_object_destroyed, NULL);
g_signal_connect (bonobo_object, "destroy", mozilla_object_destroyed, NULL);
/* Remove any pending quit-timeout callback */
if (quit_timeout_id != 0) {
......
......@@ -322,57 +322,57 @@ nautilus_mozilla_content_view_init (NautilusMozillaContentView *view)
post_widget_init ();
/* Add callbacks to the beast */
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"realize",
G_CALLBACK (mozilla_realize_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"title",
G_CALLBACK (mozilla_title_changed_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"location",
G_CALLBACK (mozilla_location_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"net_state",
G_CALLBACK (mozilla_net_state_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"net_start",
G_CALLBACK (mozilla_net_start_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"net_stop",
G_CALLBACK (mozilla_net_stop_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"link_message",
G_CALLBACK (mozilla_link_message_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"progress",
G_CALLBACK (mozilla_progress_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"dom_key_press",
G_CALLBACK (mozilla_dom_key_press_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"dom_mouse_click",
G_CALLBACK (mozilla_dom_mouse_click_callback),
view);
g_signal_connect (G_OBJECT (view->details->mozilla),
g_signal_connect (view->details->mozilla,
"new_window",
G_CALLBACK (mozilla_new_window_callback),
view);
......@@ -384,13 +384,13 @@ nautilus_mozilla_content_view_init (NautilusMozillaContentView *view)
view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view));
g_signal_connect (G_OBJECT (view->details->nautilus_view),
g_signal_connect (view->details->nautilus_view,
"load_location",
G_CALLBACK (view_load_location_callback),
view);
/* Connect to the active signal of the view to merge our menus */
g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control (view->details->nautilus_view)),
g_signal_connect (nautilus_view_get_bonobo_control (view->details->nautilus_view),
"activate",
bonobo_control_activate_callback,
view);
......@@ -873,16 +873,16 @@ mozilla_new_window_callback (GtkMozEmbed *mozilla, GtkMozEmbed **new_mozilla, gu
gtk_container_add (GTK_CONTAINER (chrome->toplevel_window), GTK_WIDGET (chrome->mozilla));
/* set up all the signals that we care about for chrome windows. */
g_signal_connect (G_OBJECT (chrome->mozilla), "visibility",
g_signal_connect (chrome->mozilla, "visibility",
G_CALLBACK (mozilla_chrome_visibility_callback),
chrome);
g_signal_connect (G_OBJECT (chrome->mozilla), "destroy_browser",
g_signal_connect (chrome->mozilla, "destroy_browser",
G_CALLBACK (mozilla_chrome_destroy_brsr_callback),
chrome);
g_signal_connect (G_OBJECT (chrome->mozilla), "size_to",
g_signal_connect (chrome->mozilla, "size_to",
G_CALLBACK (mozilla_chrome_size_to_callback),
chrome);
g_signal_connect (G_OBJECT (chrome->mozilla), "title",
g_signal_connect (chrome->mozilla, "title",
G_CALLBACK (mozilla_chrome_title_callback),
chrome);
......
......@@ -292,7 +292,7 @@ nautilus_music_view_init (NautilusMusicView *music_view)
music_view->details->event_box = gtk_event_box_new ();
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);
......
......@@ -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 */
......
......@@ -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 */
......
......@@ -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);
......
......@@ -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),
......
......@@ -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;
}
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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 */