summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/notes/nautilus-notes.c10
-rw-r--r--components/sample/Makefile.am2
-rw-r--r--components/sample/nautilus-sample-content-view.c4
-rw-r--r--components/text/Makefile.am2
-rw-r--r--components/text/nautilus-text-view.c14
-rw-r--r--components/throbber/main.c4
-rw-r--r--components/tree/libmain.c4
-rw-r--r--components/tree/nautilus-tree-change-queue.c2
-rw-r--r--components/tree/nautilus-tree-expansion-state.c2
-rw-r--r--components/tree/nautilus-tree-model.c30
-rw-r--r--components/tree/nautilus-tree-node.c2
-rw-r--r--components/tree/nautilus-tree-view-dnd.c22
-rw-r--r--components/tree/nautilus-tree-view.c20
13 files changed, 59 insertions, 59 deletions
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 8b6684484..d1a2e4943 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -223,7 +223,7 @@ notes_load_metainfo (Notes *notes)
g_list_free (attributes);
- gtk_signal_connect (GTK_OBJECT (notes->file),
+ g_signal_connect (G_OBJECT (notes->file),
"changed",
GTK_SIGNAL_FUNC (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);
- gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_out_event",
+ g_signal_connect (G_OBJECT (notes->note_text_field), "focus_out_event",
GTK_SIGNAL_FUNC (on_text_field_focus_out_event),
notes);
- gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "changed",
+ g_signal_connect (G_OBJECT (notes->note_text_field), "changed",
GTK_SIGNAL_FUNC (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);
- gtk_signal_connect (GTK_OBJECT (notes->view), "destroy", do_destroy, notes);
+ g_signal_connect (G_OBJECT (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 */
- gtk_signal_connect (GTK_OBJECT (notes->view), "load_location",
+ g_signal_connect (G_OBJECT (notes->view), "load_location",
notes_load_location, notes);
/* handle selections */
diff --git a/components/sample/Makefile.am b/components/sample/Makefile.am
index f65a5c3ea..79ab5fb90 100644
--- a/components/sample/Makefile.am
+++ b/components/sample/Makefile.am
@@ -24,7 +24,7 @@ nautilus_sample_content_view_LDADD = \
$(top_builddir)/libnautilus/libnautilus.la \
$(MODULE_LIBS)
-uidir = $(datadir)/gnome/ui
+uidir = $(datadir)/gnome-2.0/ui
ui_DATA = nautilus-sample-content-view-ui.xml
serverdir = $(datadir)/server
diff --git a/components/sample/nautilus-sample-content-view.c b/components/sample/nautilus-sample-content-view.c
index 4b5c133e3..73ca35471 100644
--- a/components/sample/nautilus-sample-content-view.c
+++ b/components/sample/nautilus-sample-content-view.c
@@ -139,7 +139,7 @@ nautilus_sample_content_view_init (NautilusSampleContentView *view)
nautilus_view_construct (NAUTILUS_VIEW (view),
view->details->label);
- gtk_signal_connect (GTK_OBJECT (view),
+ g_signal_connect (G_OBJECT (view),
"load_location",
sample_load_location_callback,
NULL);
@@ -147,7 +147,7 @@ nautilus_sample_content_view_init (NautilusSampleContentView *view)
/* Get notified when our bonobo control is activated so we can
* merge menu & toolbar items into the shell's UI.
*/
- gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (view))),
+ g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control (NAUTILUS_VIEW (view))),
"activate",
sample_merge_bonobo_items_callback,
view);
diff --git a/components/text/Makefile.am b/components/text/Makefile.am
index ffa7f6043..bc167d8e7 100644
--- a/components/text/Makefile.am
+++ b/components/text/Makefile.am
@@ -24,7 +24,7 @@ nautilus_text_view_LDADD = \
$(NAUTILUS_PRIVATE_LIBS) \
$(NULL)
-uidir = $(datadir)/gnome/ui
+uidir = $(datadir)/gnome-2.0/ui
ui_DATA = nautilus-text-view-ui.xml
serverdir = $(datadir)/server
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index f9122f84c..d9cc37564 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -159,13 +159,13 @@ nautilus_text_view_init (NautilusTextView *text_view)
text_view->details->zoomable = bonobo_zoomable_new ();
text_view->details->zoom_index = 3;
- gtk_signal_connect (GTK_OBJECT (text_view->details->zoomable), "set_zoom_level",
+ g_signal_connect (G_OBJECT (text_view->details->zoomable), "set_zoom_level",
GTK_SIGNAL_FUNC (zoomable_set_zoom_level_callback), text_view);
- gtk_signal_connect (GTK_OBJECT (text_view->details->zoomable), "zoom_in",
+ g_signal_connect (G_OBJECT (text_view->details->zoomable), "zoom_in",
GTK_SIGNAL_FUNC (zoomable_zoom_in_callback), text_view);
- gtk_signal_connect (GTK_OBJECT (text_view->details->zoomable), "zoom_out",
+ g_signal_connect (G_OBJECT (text_view->details->zoomable), "zoom_out",
GTK_SIGNAL_FUNC (zoomable_zoom_out_callback), text_view);
- gtk_signal_connect (GTK_OBJECT (text_view->details->zoomable), "zoom_to_fit",
+ g_signal_connect (G_OBJECT (text_view->details->zoomable), "zoom_to_fit",
GTK_SIGNAL_FUNC (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));
- gtk_signal_connect (GTK_OBJECT (text_view),
+ g_signal_connect (G_OBJECT (text_view),
"load_location",
text_view_load_location_callback,
text_view);
@@ -223,7 +223,7 @@ 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 */
- gtk_signal_connect (GTK_OBJECT (nautilus_view_get_bonobo_control
+ g_signal_connect (G_OBJECT (nautilus_view_get_bonobo_control
(NAUTILUS_VIEW (text_view))),
"activate",
merge_bonobo_menu_items,
@@ -779,7 +779,7 @@ merge_bonobo_menu_items (BonoboControl *control, gboolean state, gpointer user_d
nautilus_text_view_build_service_menu (text_view, control);
- gtk_signal_connect (GTK_OBJECT (bonobo_control_get_ui_component (control)),
+ g_signal_connect (G_OBJECT (bonobo_control_get_ui_component (control)),
"ui_event", handle_ui_event, text_view);
nautilus_clipboard_set_up_editable_in_control (GTK_EDITABLE (text_view->details->text_display),
diff --git a/components/throbber/main.c b/components/throbber/main.c
index 454a39d12..ecaf94156 100644
--- a/components/throbber/main.c
+++ b/components/throbber/main.c
@@ -52,13 +52,13 @@ throbber_make_object (BonoboGenericFactory *factory,
return NULL;
}
- throbber = NAUTILUS_THROBBER (gtk_object_new (NAUTILUS_TYPE_THROBBER, NULL));
+ throbber = NAUTILUS_THROBBER (g_object_new (NAUTILUS_TYPE_THROBBER, NULL));
object_count++;
bonobo_control = nautilus_throbber_get_control (throbber);
- gtk_signal_connect (GTK_OBJECT (bonobo_control), "destroy", throbber_object_destroyed, NULL);
+ g_signal_connect (G_OBJECT (bonobo_control), "destroy", throbber_object_destroyed, NULL);
return bonobo_control;
}
diff --git a/components/tree/libmain.c b/components/tree/libmain.c
index 33add833d..4f750d87f 100644
--- a/components/tree/libmain.c
+++ b/components/tree/libmain.c
@@ -52,10 +52,10 @@ tree_shlib_make_object (PortableServer_POA poa,
return CORBA_OBJECT_NIL;
}
- view = NAUTILUS_TREE_VIEW (gtk_object_new (NAUTILUS_TYPE_TREE_VIEW, NULL));
+ view = NAUTILUS_TREE_VIEW (g_object_new (NAUTILUS_TYPE_TREE_VIEW, NULL));
#if 0
- gtk_signal_connect (GTK_OBJECT (view), "destroy", tree_shlib_object_destroyed, NULL);
+ g_signal_connect (G_OBJECT (view), "destroy", tree_shlib_object_destroyed, NULL);
#endif
bonobo_activation_plugin_use (poa, impl_ptr);
diff --git a/components/tree/nautilus-tree-change-queue.c b/components/tree/nautilus-tree-change-queue.c
index d31ff05dd..3ca206fe9 100644
--- a/components/tree/nautilus-tree-change-queue.c
+++ b/components/tree/nautilus-tree-change-queue.c
@@ -92,7 +92,7 @@ nautilus_tree_change_queue_new (void)
{
NautilusTreeChangeQueue *change_queue;
- change_queue = NAUTILUS_TREE_CHANGE_QUEUE (gtk_object_new (NAUTILUS_TYPE_TREE_CHANGE_QUEUE, NULL));
+ change_queue = NAUTILUS_TREE_CHANGE_QUEUE (g_object_new (NAUTILUS_TYPE_TREE_CHANGE_QUEUE, NULL));
gtk_object_ref (GTK_OBJECT (change_queue));
gtk_object_sink (GTK_OBJECT (change_queue));
return change_queue;
diff --git a/components/tree/nautilus-tree-expansion-state.c b/components/tree/nautilus-tree-expansion-state.c
index 64220208c..3707032df 100644
--- a/components/tree/nautilus-tree-expansion-state.c
+++ b/components/tree/nautilus-tree-expansion-state.c
@@ -173,7 +173,7 @@ nautilus_tree_expansion_state_new (void)
{
NautilusTreeExpansionState *state;
- state = NAUTILUS_TREE_EXPANSION_STATE (gtk_object_new (NAUTILUS_TYPE_TREE_EXPANSION_STATE, NULL));
+ state = NAUTILUS_TREE_EXPANSION_STATE (g_object_new (NAUTILUS_TYPE_TREE_EXPANSION_STATE, NULL));
gtk_object_ref (GTK_OBJECT (state));
gtk_object_sink (GTK_OBJECT (state));
return state;
diff --git a/components/tree/nautilus-tree-model.c b/components/tree/nautilus-tree-model.c
index 2065ca38d..22b44f01f 100644
--- a/components/tree/nautilus-tree-model.c
+++ b/components/tree/nautilus-tree-model.c
@@ -112,7 +112,7 @@ nautilus_tree_model_class_init (gpointer klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeModelClass, node_changed),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
+ gtk_marshal_VOID__POINTER,
G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[NODE_REMOVED] =
@@ -121,7 +121,7 @@ nautilus_tree_model_class_init (gpointer klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeModelClass, node_removed),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
+ gtk_marshal_VOID__POINTER,
G_TYPE_NONE, 1, GTK_TYPE_POINTER);
signals[NODE_BEING_RENAMED] =
@@ -130,7 +130,7 @@ nautilus_tree_model_class_init (gpointer klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeModelClass, node_removed),
NULL, NULL,
- gtk_marshal_NONE__POINTER_POINTER,
+ gtk_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
signals[DONE_LOADING_CHILDREN] =
@@ -139,7 +139,7 @@ nautilus_tree_model_class_init (gpointer klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (NautilusTreeModelClass, done_loading_children),
NULL, NULL,
- gtk_marshal_NONE__POINTER,
+ gtk_marshal_VOID__POINTER,
G_TYPE_NONE, 1, GTK_TYPE_POINTER);
}
@@ -202,7 +202,7 @@ nautilus_tree_model_new (const char *root_uri)
{
NautilusTreeModel *model;
- model = NAUTILUS_TREE_MODEL (gtk_object_new (NAUTILUS_TYPE_TREE_MODEL, NULL));
+ model = NAUTILUS_TREE_MODEL (g_object_new (NAUTILUS_TYPE_TREE_MODEL, NULL));
gtk_object_ref (GTK_OBJECT (model));
gtk_object_sink (GTK_OBJECT (model));
@@ -773,8 +773,8 @@ report_node_changed (NautilusTreeModel *model,
nautilus_tree_node_get_file (node),
node);
- gtk_signal_emit (GTK_OBJECT (model),
- signals[NODE_CHANGED],
+ g_signal_emit (G_OBJECT (model),
+ signals[NODE_CHANGED], 0,
node);
connect_unparented_nodes (model, node);
@@ -786,8 +786,8 @@ report_node_changed (NautilusTreeModel *model,
if (strcmp (file_uri, node_uri) == 0) {
/* A normal change */
- gtk_signal_emit (GTK_OBJECT (model),
- signals[NODE_CHANGED],
+ g_signal_emit (G_OBJECT (model),
+ signals[NODE_CHANGED], 0,
node);
} else {
/* A move or rename - model it as a remove followed by an add */
@@ -799,8 +799,8 @@ report_node_changed (NautilusTreeModel *model,
* it to propagate the expansion state from the old name to the
* new name
*/
- gtk_signal_emit (GTK_OBJECT (model),
- signals[NODE_BEING_RENAMED],
+ g_signal_emit (G_OBJECT (model),
+ signals[NODE_BEING_RENAMED], 0,
node->details->uri, file_uri);
report_node_removed (model, node);
@@ -861,8 +861,8 @@ report_node_removed_internal (NautilusTreeModel *model,
forget_unparented_node (model, node);
if (signal) {
- gtk_signal_emit (GTK_OBJECT (model),
- signals[NODE_REMOVED],
+ g_signal_emit (G_OBJECT (model),
+ signals[NODE_REMOVED], 0,
node);
}
@@ -883,8 +883,8 @@ static void
report_done_loading (NautilusTreeModel *model,
NautilusTreeNode *node)
{
- gtk_signal_emit (GTK_OBJECT (model),
- signals[DONE_LOADING_CHILDREN],
+ g_signal_emit (G_OBJECT (model),
+ signals[DONE_LOADING_CHILDREN], 0,
node);
}
diff --git a/components/tree/nautilus-tree-node.c b/components/tree/nautilus-tree-node.c
index a0d03e9c5..5d2457e0e 100644
--- a/components/tree/nautilus-tree-node.c
+++ b/components/tree/nautilus-tree-node.c
@@ -88,7 +88,7 @@ nautilus_tree_node_new (NautilusFile *file)
{
NautilusTreeNode *node;
- node = NAUTILUS_TREE_NODE (gtk_object_new (NAUTILUS_TYPE_TREE_NODE, NULL));
+ node = NAUTILUS_TREE_NODE (g_object_new (NAUTILUS_TYPE_TREE_NODE, NULL));
gtk_object_ref (GTK_OBJECT (node));
gtk_object_sink (GTK_OBJECT (node));
diff --git a/components/tree/nautilus-tree-view-dnd.c b/components/tree/nautilus-tree-view-dnd.c
index 5e415da02..7e7405b79 100644
--- a/components/tree/nautilus-tree-view-dnd.c
+++ b/components/tree/nautilus-tree-view-dnd.c
@@ -210,55 +210,55 @@ nautilus_tree_view_init_dnd (NautilusTreeView *view)
| GDK_ACTION_ASK);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"drag_begin",
GTK_SIGNAL_FUNC(nautilus_tree_view_drag_begin),
view);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"drag_end",
GTK_SIGNAL_FUNC(nautilus_tree_view_drag_end),
view);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"drag_leave",
GTK_SIGNAL_FUNC(nautilus_tree_view_drag_leave),
view);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"drag_motion",
GTK_SIGNAL_FUNC(nautilus_tree_view_drag_motion),
view);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"drag_drop",
GTK_SIGNAL_FUNC(nautilus_tree_view_drag_drop),
view);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"drag_data_received",
GTK_SIGNAL_FUNC(nautilus_tree_view_drag_data_received),
view);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"drag_data_get",
GTK_SIGNAL_FUNC(nautilus_tree_view_drag_data_get),
view);
/* override the default handlers */
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"button-press-event",
GTK_SIGNAL_FUNC (nautilus_tree_view_button_press),
NULL);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"button-release-event",
GTK_SIGNAL_FUNC (nautilus_tree_view_button_release),
NULL);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"motion-notify-event",
GTK_SIGNAL_FUNC (nautilus_tree_view_motion_notify),
NULL);
- gtk_signal_connect (GTK_OBJECT (view->details->tree), "realize",
+ g_signal_connect (G_OBJECT (view->details->tree), "realize",
tree_view_realize_callback, view);
}
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
index 3860fffbf..7db741302 100644
--- a/components/tree/nautilus-tree-view.c
+++ b/components/tree/nautilus-tree-view.c
@@ -783,19 +783,19 @@ nautilus_tree_view_load_from_filesystem (NautilusTreeView *view)
nautilus_tree_view_model_node_changed_callback,
view);
- gtk_signal_connect (GTK_OBJECT (view->details->model),
+ g_signal_connect (G_OBJECT (view->details->model),
"node_changed",
nautilus_tree_view_model_node_changed_callback,
view);
- gtk_signal_connect (GTK_OBJECT (view->details->model),
+ g_signal_connect (G_OBJECT (view->details->model),
"node_removed",
nautilus_tree_view_model_node_removed_callback,
view);
- gtk_signal_connect (GTK_OBJECT (view->details->model),
+ g_signal_connect (G_OBJECT (view->details->model),
"node_being_renamed",
nautilus_tree_view_model_node_renamed_callback,
view);
- gtk_signal_connect (GTK_OBJECT (view->details->model),
+ g_signal_connect (G_OBJECT (view->details->model),
"done_loading_children",
nautilus_tree_view_model_done_loading_callback,
view);
@@ -946,17 +946,17 @@ create_tree (NautilusTreeView *view)
+ view->details->tree->style->font->descent));
eel_ctree_set_indent (EEL_CTREE (view->details->tree), 12);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"tree_expand",
GTK_SIGNAL_FUNC (tree_expand_callback),
view);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"tree_collapse",
GTK_SIGNAL_FUNC (tree_collapse_callback),
view);
- gtk_signal_connect (GTK_OBJECT (view->details->tree),
+ g_signal_connect (G_OBJECT (view->details->tree),
"tree_select_row",
GTK_SIGNAL_FUNC (tree_select_row_callback),
view);
@@ -1045,7 +1045,7 @@ nautilus_tree_view_init (NautilusTreeView *view)
view->details->show_non_directories =
! eel_preferences_get_boolean (NAUTILUS_PREFERENCES_TREE_SHOW_ONLY_DIRECTORIES);
- gtk_signal_connect (GTK_OBJECT (view),
+ g_signal_connect (G_OBJECT (view),
"load_location",
GTK_SIGNAL_FUNC (tree_load_location_callback),
view);
@@ -1061,11 +1061,11 @@ nautilus_tree_view_init (NautilusTreeView *view)
nautilus_view_construct (NAUTILUS_VIEW (view),
view->details->scrolled_window);
- gtk_signal_connect (GTK_OBJECT (view->details->scrolled_window),
+ g_signal_connect (G_OBJECT (view->details->scrolled_window),
"map",
tree_map_callback,
view);
- gtk_signal_connect (GTK_OBJECT (view->details->scrolled_window),
+ g_signal_connect (G_OBJECT (view->details->scrolled_window),
"unmap",
tree_unmap_callback,
view);
View Lorry Controller Status