summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2011-02-25 09:55:30 -0500
committerCosimo Cecchi <cosimoc@gnome.org>2011-02-25 09:56:18 -0500
commita2093ba1340334fa2733aa3ba2c00e7d1cfb683e (patch)
tree77d4098faa7b8bd229c9a6563c8ecec0f9b84b1a /src
parent2632e266fbc794de5e912ac1f37dfaa8f4ed0904 (diff)
downloadnautilus-a2093ba1340334fa2733aa3ba2c00e7d1cfb683e.tar.gz
view: remove nautilus_view_get_widget()
Having a function just to call a cast seems a bit weird...
Diffstat (limited to 'src')
-rw-r--r--src/nautilus-view.c6
-rw-r--r--src/nautilus-view.h1
-rw-r--r--src/nautilus-window-manage-views.c2
-rw-r--r--src/nautilus-window-slot.c8
4 files changed, 5 insertions, 12 deletions
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index ebff57318..3df845ae1 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -2439,12 +2439,6 @@ nautilus_view_grab_focus (NautilusView *view)
}
}
-GtkWidget *
-nautilus_view_get_widget (NautilusView *view)
-{
- return GTK_WIDGET (view);
-}
-
int
nautilus_view_get_selection_count (NautilusView *view)
{
diff --git a/src/nautilus-view.h b/src/nautilus-view.h
index f83bfda98..d5afaf1c0 100644
--- a/src/nautilus-view.h
+++ b/src/nautilus-view.h
@@ -351,7 +351,6 @@ gboolean nautilus_view_is_editable (NautilusView
/* NautilusView methods */
const char * nautilus_view_get_view_id (NautilusView *view);
-GtkWidget * nautilus_view_get_widget (NautilusView *view);
/* file operations */
char * nautilus_view_get_backing_uri (NautilusView *view);
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 775e14c66..3b2c2f0a5 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -1193,7 +1193,7 @@ location_has_really_changed (NautilusWindowSlot *slot)
window = slot->pane->window;
if (slot->new_content_view != NULL) {
- widget = nautilus_view_get_widget (slot->new_content_view);
+ widget = GTK_WIDGET (slot->new_content_view);
/* Switch to the new content view. */
if (gtk_widget_get_parent (widget) == NULL) {
nautilus_window_slot_set_content_view_widget (slot, slot->new_content_view);
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index f914422c4..d430722a4 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -224,14 +224,14 @@ nautilus_window_slot_dispose (GObject *object)
nautilus_window_slot_clear_back_list (slot);
if (slot->content_view) {
- widget = nautilus_view_get_widget (slot->content_view);
+ widget = GTK_WIDGET (slot->content_view);
gtk_widget_destroy (widget);
g_object_unref (slot->content_view);
slot->content_view = NULL;
}
if (slot->new_content_view) {
- widget = nautilus_view_get_widget (slot->new_content_view);
+ widget = GTK_WIDGET (slot->new_content_view);
gtk_widget_destroy (widget);
g_object_unref (slot->new_content_view);
slot->new_content_view = NULL;
@@ -454,14 +454,14 @@ nautilus_window_slot_set_content_view_widget (NautilusWindowSlot *slot,
/* disconnect old view */
nautilus_window_disconnect_content_view (window, slot->content_view);
- widget = nautilus_view_get_widget (slot->content_view);
+ widget = GTK_WIDGET (slot->content_view);
gtk_widget_destroy (widget);
g_object_unref (slot->content_view);
slot->content_view = NULL;
}
if (new_view != NULL) {
- widget = nautilus_view_get_widget (new_view);
+ widget = GTK_WIDGET (new_view);
gtk_container_add (GTK_CONTAINER (slot->view_box),
GTK_WIDGET (new_view));