Commit 137cfdb8 authored by Darin Adler's avatar Darin Adler
Browse files

Tons of files. More GtkObject -> GObject stuff.

	* Tons of files.
	More GtkObject -> GObject stuff.
parent 612ee980
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>
......
......@@ -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;
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
}
......@@ -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);
......
......@@ -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;
......
......@@ -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));
......
......@@ -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);
}
......@@ -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));
......
......@@ -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));
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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);
......
......@@ -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
......
......@@ -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);
}
......
......@@ -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 */
......
......@@ -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 =
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment