summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/file-manager/fm-directory-view.c2
-rw-r--r--src/nautilus-view-frame-bonobo-control.c3
-rw-r--r--src/nautilus-view-frame-bonobo-embeddable.c3
-rw-r--r--src/nautilus-view-frame-nautilus-view.c15
-rw-r--r--src/nautilus-view-frame-private.h3
-rw-r--r--src/nautilus-view-frame.c22
-rw-r--r--src/nautilus-view-frame.h5
-rw-r--r--src/nautilus-window-manage-views.c31
-rw-r--r--src/ntl-view-bonobo-control.c3
-rw-r--r--src/ntl-view-bonobo-subdoc.c3
-rw-r--r--src/ntl-view-nautilus.c15
-rw-r--r--src/ntl-view-private.h3
-rw-r--r--src/ntl-view.c22
-rw-r--r--src/ntl-view.h5
-rw-r--r--src/ntl-window-msgs.c31
15 files changed, 18 insertions, 148 deletions
diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c
index 86a552e68..63e0f321c 100644
--- a/src/file-manager/fm-directory-view.c
+++ b/src/file-manager/fm-directory-view.c
@@ -131,7 +131,6 @@ static void stop_location_change_cb
FMDirectoryView *directory_view);
static void notify_location_change_cb (NautilusViewFrame *view_frame,
Nautilus_NavigationInfo *nav_context,
- const char *initial_title,
FMDirectoryView *directory_view);
static void open_cb (GtkMenuItem *item,
GList *files);
@@ -642,7 +641,6 @@ fm_directory_view_send_selection_change (FMDirectoryView *view)
static void
notify_location_change_cb (NautilusViewFrame *view_frame,
Nautilus_NavigationInfo *navigation_context,
- const char *initial_title,
FMDirectoryView *directory_view)
{
fm_directory_view_load_uri (directory_view, navigation_context->requested_uri);
diff --git a/src/nautilus-view-frame-bonobo-control.c b/src/nautilus-view-frame-bonobo-control.c
index b9f805a02..f382446e2 100644
--- a/src/nautilus-view-frame-bonobo-control.c
+++ b/src/nautilus-view-frame-bonobo-control.c
@@ -79,7 +79,7 @@ bonobo_control_get_label(NautilusView *view, CORBA_Environment *ev)
}
static void
-bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, const char *initial_title, CORBA_Environment *ev)
+bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev)
{
Nautilus_ProgressRequestInfo pri;
pri.amount = 0;
@@ -98,7 +98,6 @@ NautilusViewComponentType bonobo_control_component_type = {
&bonobo_control_notify_location_change, /* notify_location_change */
NULL, /* stop_location_change */
NULL, /* notify_selection_change */
- NULL, /* notify_title_change */
NULL, /* show_properties */
&bonobo_control_get_label /* get_label */
};
diff --git a/src/nautilus-view-frame-bonobo-embeddable.c b/src/nautilus-view-frame-bonobo-embeddable.c
index b5b4a44d5..57ab4c02a 100644
--- a/src/nautilus-view-frame-bonobo-embeddable.c
+++ b/src/nautilus-view-frame-bonobo-embeddable.c
@@ -43,7 +43,7 @@ destroy_bonobo_subdoc_view(NautilusView *view, CORBA_Environment *ev)
}
static void
-bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, const char *new_title, CORBA_Environment *ev)
+bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev)
{
Bonobo_PersistStream persist;
@@ -114,7 +114,6 @@ NautilusViewComponentType bonobo_subdoc_component_type = {
&bonobo_subdoc_notify_location_change, /* notify_location_change */
NULL, /* stop_location_change */
NULL, /* notify_selection_change */
- NULL, /* notify_title_change */
NULL, /* show_properties */
NULL, /* get_label */
};
diff --git a/src/nautilus-view-frame-nautilus-view.c b/src/nautilus-view-frame-nautilus-view.c
index 4a48d06d1..3da81b61e 100644
--- a/src/nautilus-view-frame-nautilus-view.c
+++ b/src/nautilus-view-frame-nautilus-view.c
@@ -109,11 +109,11 @@ nv_load_state(NautilusView *view, const char *config_path, CORBA_Environment *ev
}
static void
-nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, const char *initial_title, CORBA_Environment *ev)
+nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev)
{
NautilusViewInfo *nvi = view->component_data;
- Nautilus_View_notify_location_change(nvi->view_client, nav_ctx, initial_title, ev);
+ Nautilus_View_notify_location_change(nvi->view_client, nav_ctx, ev);
if(ev->_major != CORBA_NO_EXCEPTION)
gtk_object_destroy(GTK_OBJECT(view));
}
@@ -129,16 +129,6 @@ nv_notify_selection_change(NautilusView *view, Nautilus_SelectionInfo *nav_ctx,
}
static void
-nv_notify_title_change(NautilusView *view, const char *new_title, CORBA_Environment *ev)
-{
- NautilusViewInfo *nvi = view->component_data;
-
- Nautilus_View_notify_title_change(nvi->view_client, new_title, ev);
- if(ev->_major != CORBA_NO_EXCEPTION)
- gtk_object_destroy(GTK_OBJECT(view));
-}
-
-static void
nv_stop_location_change(NautilusView *view, CORBA_Environment *ev)
{
NautilusViewInfo *nvi = view->component_data;
@@ -187,7 +177,6 @@ NautilusViewComponentType nautilus_view_component_type = {
&nv_notify_location_change, /* notify_location_change */
&nv_stop_location_change, /*stop_location_change */
&nv_notify_selection_change, /* notify_selection_change */
- &nv_notify_title_change, /* notify_title_change */
&nv_show_properties, /* show_properties */
&nv_get_label /* get_label */
};
diff --git a/src/nautilus-view-frame-private.h b/src/nautilus-view-frame-private.h
index 79a4b01a8..648ec9369 100644
--- a/src/nautilus-view-frame-private.h
+++ b/src/nautilus-view-frame-private.h
@@ -64,10 +64,9 @@ struct _NautilusViewComponentType {
void (* destroy) (NautilusView *view, CORBA_Environment *ev);
void (* save_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev);
void (* load_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev);
- void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, const char *initial_title, CORBA_Environment *ev);
+ void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev);
void (* stop_location_change)(NautilusView *view, CORBA_Environment *ev);
void (* notify_selection_change)(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev);
- void (* notify_title_change)(NautilusView *view, const char *new_title, CORBA_Environment *ev);
void (* show_properties)(NautilusView *view, CORBA_Environment *ev);
char * (* get_label)(NautilusView *view, CORBA_Environment *ev);
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index 3cd392388..1781fedcb 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -432,8 +432,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid)
void
nautilus_view_notify_location_change(NautilusView *view,
- Nautilus_NavigationInfo *nav_context,
- const char *initial_title)
+ Nautilus_NavigationInfo *nav_context)
{
Nautilus_NavigationInfo real_nav_ctx;
CORBA_Environment ev;
@@ -454,7 +453,7 @@ nautilus_view_notify_location_change(NautilusView *view,
CORBA_exception_init(&ev);
if(view->component_class->notify_location_change)
- view->component_class->notify_location_change(view, &real_nav_ctx, initial_title, &ev);
+ view->component_class->notify_location_change(view, &real_nav_ctx, &ev);
CORBA_exception_free(&ev);
}
@@ -477,23 +476,6 @@ nautilus_view_notify_selection_change(NautilusView *view,
}
void
-nautilus_view_notify_title_change(NautilusView *view,
- const char *new_title)
-{
- CORBA_Environment ev;
-
- g_return_if_fail(NAUTILUS_IS_VIEW(view));
- g_return_if_fail(view->component_class);
-
- CORBA_exception_init(&ev);
-
- if(view->component_class->notify_title_change)
- view->component_class->notify_title_change(view, new_title, &ev);
-
- CORBA_exception_free(&ev);
-}
-
-void
nautilus_view_load_state(NautilusView *view, const char *config_path)
{
CORBA_Environment ev;
diff --git a/src/nautilus-view-frame.h b/src/nautilus-view-frame.h
index 090955a01..e6c6d0d47 100644
--- a/src/nautilus-view-frame.h
+++ b/src/nautilus-view-frame.h
@@ -113,12 +113,9 @@ CORBA_Object nautilus_view_get_objref (NautilusView *view);
/* These functions correspond to methods of the Nautilus:View CORBAinterface */
void nautilus_view_notify_location_change (NautilusView *view,
- Nautilus_NavigationInfo *nav_context,
- const char *initial_title);
+ Nautilus_NavigationInfo *nav_context);
void nautilus_view_notify_selection_change (NautilusView *view,
Nautilus_SelectionInfo *sel_context);
-void nautilus_view_notify_title_change (NautilusView *view,
- const char *new_title);
void nautilus_view_load_state (NautilusView *view,
const char *config_path);
void nautilus_view_save_state (NautilusView *view,
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 776d25255..85c50e1d5 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -276,36 +276,11 @@ nautilus_window_request_title_change(NautilusWindow *window,
const char *new_title,
NautilusContentView *requesting_view)
{
- GSList *cur;
-
g_return_if_fail (new_title != NULL);
g_free (window->requested_title);
window->requested_title = g_strdup (new_title);
- /*
- * Tell the requesting content view also, to keep the code parallel.
- * Don't tell the view in window->content_view because it might be
- * the old one that's about to be removed.
- */
- nautilus_view_notify_title_change (NAUTILUS_VIEW (requesting_view), new_title);
-
- for(cur = window->meta_views; cur; cur = cur->next)
- {
-#if 0
- /*
- * This should tell metaviews of the new title, but
- * something about it isn't right. If the metaview connects
- * to the notify_title_change signal, its callback doesn't
- * get called. And ORBit warns for each metaview about some
- * unhandled message of type 1 (REPLY). Right now no metaviews
- * use this anyway, but we need to fix it.
- */
- nautilus_view_notify_title_change (NAUTILUS_VIEW (cur->data), new_title);
-#endif
- }
-
- /* Now change the stuff that doesn't use the NautilusView API */
nautilus_window_update_title_internal (window, new_title);
}
@@ -470,16 +445,12 @@ nautilus_window_update_view(NautilusWindow *window,
NautilusView *content_view)
{
CORBA_Environment environment;
- char *current_title;
g_return_if_fail(view);
loci->self_originated = (view == requesting_view);
- current_title = nautilus_window_get_current_location_title (window);
- g_assert (current_title != NULL);
- nautilus_view_notify_location_change (view, loci, current_title);
- g_free (current_title);
+ nautilus_view_notify_location_change (view, loci);
if(seli)
{
diff --git a/src/ntl-view-bonobo-control.c b/src/ntl-view-bonobo-control.c
index b9f805a02..f382446e2 100644
--- a/src/ntl-view-bonobo-control.c
+++ b/src/ntl-view-bonobo-control.c
@@ -79,7 +79,7 @@ bonobo_control_get_label(NautilusView *view, CORBA_Environment *ev)
}
static void
-bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, const char *initial_title, CORBA_Environment *ev)
+bonobo_control_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev)
{
Nautilus_ProgressRequestInfo pri;
pri.amount = 0;
@@ -98,7 +98,6 @@ NautilusViewComponentType bonobo_control_component_type = {
&bonobo_control_notify_location_change, /* notify_location_change */
NULL, /* stop_location_change */
NULL, /* notify_selection_change */
- NULL, /* notify_title_change */
NULL, /* show_properties */
&bonobo_control_get_label /* get_label */
};
diff --git a/src/ntl-view-bonobo-subdoc.c b/src/ntl-view-bonobo-subdoc.c
index b5b4a44d5..57ab4c02a 100644
--- a/src/ntl-view-bonobo-subdoc.c
+++ b/src/ntl-view-bonobo-subdoc.c
@@ -43,7 +43,7 @@ destroy_bonobo_subdoc_view(NautilusView *view, CORBA_Environment *ev)
}
static void
-bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, const char *new_title, CORBA_Environment *ev)
+bonobo_subdoc_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *real_nav_ctx, CORBA_Environment *ev)
{
Bonobo_PersistStream persist;
@@ -114,7 +114,6 @@ NautilusViewComponentType bonobo_subdoc_component_type = {
&bonobo_subdoc_notify_location_change, /* notify_location_change */
NULL, /* stop_location_change */
NULL, /* notify_selection_change */
- NULL, /* notify_title_change */
NULL, /* show_properties */
NULL, /* get_label */
};
diff --git a/src/ntl-view-nautilus.c b/src/ntl-view-nautilus.c
index 4a48d06d1..3da81b61e 100644
--- a/src/ntl-view-nautilus.c
+++ b/src/ntl-view-nautilus.c
@@ -109,11 +109,11 @@ nv_load_state(NautilusView *view, const char *config_path, CORBA_Environment *ev
}
static void
-nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, const char *initial_title, CORBA_Environment *ev)
+nv_notify_location_change(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev)
{
NautilusViewInfo *nvi = view->component_data;
- Nautilus_View_notify_location_change(nvi->view_client, nav_ctx, initial_title, ev);
+ Nautilus_View_notify_location_change(nvi->view_client, nav_ctx, ev);
if(ev->_major != CORBA_NO_EXCEPTION)
gtk_object_destroy(GTK_OBJECT(view));
}
@@ -129,16 +129,6 @@ nv_notify_selection_change(NautilusView *view, Nautilus_SelectionInfo *nav_ctx,
}
static void
-nv_notify_title_change(NautilusView *view, const char *new_title, CORBA_Environment *ev)
-{
- NautilusViewInfo *nvi = view->component_data;
-
- Nautilus_View_notify_title_change(nvi->view_client, new_title, ev);
- if(ev->_major != CORBA_NO_EXCEPTION)
- gtk_object_destroy(GTK_OBJECT(view));
-}
-
-static void
nv_stop_location_change(NautilusView *view, CORBA_Environment *ev)
{
NautilusViewInfo *nvi = view->component_data;
@@ -187,7 +177,6 @@ NautilusViewComponentType nautilus_view_component_type = {
&nv_notify_location_change, /* notify_location_change */
&nv_stop_location_change, /*stop_location_change */
&nv_notify_selection_change, /* notify_selection_change */
- &nv_notify_title_change, /* notify_title_change */
&nv_show_properties, /* show_properties */
&nv_get_label /* get_label */
};
diff --git a/src/ntl-view-private.h b/src/ntl-view-private.h
index 79a4b01a8..648ec9369 100644
--- a/src/ntl-view-private.h
+++ b/src/ntl-view-private.h
@@ -64,10 +64,9 @@ struct _NautilusViewComponentType {
void (* destroy) (NautilusView *view, CORBA_Environment *ev);
void (* save_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev);
void (* load_state)(NautilusView *view, const char *config_path, CORBA_Environment *ev);
- void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, const char *initial_title, CORBA_Environment *ev);
+ void (* notify_location_change)(NautilusView *view, Nautilus_NavigationInfo *nav_ctx, CORBA_Environment *ev);
void (* stop_location_change)(NautilusView *view, CORBA_Environment *ev);
void (* notify_selection_change)(NautilusView *view, Nautilus_SelectionInfo *nav_ctx, CORBA_Environment *ev);
- void (* notify_title_change)(NautilusView *view, const char *new_title, CORBA_Environment *ev);
void (* show_properties)(NautilusView *view, CORBA_Environment *ev);
char * (* get_label)(NautilusView *view, CORBA_Environment *ev);
diff --git a/src/ntl-view.c b/src/ntl-view.c
index 3cd392388..1781fedcb 100644
--- a/src/ntl-view.c
+++ b/src/ntl-view.c
@@ -432,8 +432,7 @@ nautilus_view_load_client(NautilusView *view, const char *iid)
void
nautilus_view_notify_location_change(NautilusView *view,
- Nautilus_NavigationInfo *nav_context,
- const char *initial_title)
+ Nautilus_NavigationInfo *nav_context)
{
Nautilus_NavigationInfo real_nav_ctx;
CORBA_Environment ev;
@@ -454,7 +453,7 @@ nautilus_view_notify_location_change(NautilusView *view,
CORBA_exception_init(&ev);
if(view->component_class->notify_location_change)
- view->component_class->notify_location_change(view, &real_nav_ctx, initial_title, &ev);
+ view->component_class->notify_location_change(view, &real_nav_ctx, &ev);
CORBA_exception_free(&ev);
}
@@ -477,23 +476,6 @@ nautilus_view_notify_selection_change(NautilusView *view,
}
void
-nautilus_view_notify_title_change(NautilusView *view,
- const char *new_title)
-{
- CORBA_Environment ev;
-
- g_return_if_fail(NAUTILUS_IS_VIEW(view));
- g_return_if_fail(view->component_class);
-
- CORBA_exception_init(&ev);
-
- if(view->component_class->notify_title_change)
- view->component_class->notify_title_change(view, new_title, &ev);
-
- CORBA_exception_free(&ev);
-}
-
-void
nautilus_view_load_state(NautilusView *view, const char *config_path)
{
CORBA_Environment ev;
diff --git a/src/ntl-view.h b/src/ntl-view.h
index 090955a01..e6c6d0d47 100644
--- a/src/ntl-view.h
+++ b/src/ntl-view.h
@@ -113,12 +113,9 @@ CORBA_Object nautilus_view_get_objref (NautilusView *view);
/* These functions correspond to methods of the Nautilus:View CORBAinterface */
void nautilus_view_notify_location_change (NautilusView *view,
- Nautilus_NavigationInfo *nav_context,
- const char *initial_title);
+ Nautilus_NavigationInfo *nav_context);
void nautilus_view_notify_selection_change (NautilusView *view,
Nautilus_SelectionInfo *sel_context);
-void nautilus_view_notify_title_change (NautilusView *view,
- const char *new_title);
void nautilus_view_load_state (NautilusView *view,
const char *config_path);
void nautilus_view_save_state (NautilusView *view,
diff --git a/src/ntl-window-msgs.c b/src/ntl-window-msgs.c
index 776d25255..85c50e1d5 100644
--- a/src/ntl-window-msgs.c
+++ b/src/ntl-window-msgs.c
@@ -276,36 +276,11 @@ nautilus_window_request_title_change(NautilusWindow *window,
const char *new_title,
NautilusContentView *requesting_view)
{
- GSList *cur;
-
g_return_if_fail (new_title != NULL);
g_free (window->requested_title);
window->requested_title = g_strdup (new_title);
- /*
- * Tell the requesting content view also, to keep the code parallel.
- * Don't tell the view in window->content_view because it might be
- * the old one that's about to be removed.
- */
- nautilus_view_notify_title_change (NAUTILUS_VIEW (requesting_view), new_title);
-
- for(cur = window->meta_views; cur; cur = cur->next)
- {
-#if 0
- /*
- * This should tell metaviews of the new title, but
- * something about it isn't right. If the metaview connects
- * to the notify_title_change signal, its callback doesn't
- * get called. And ORBit warns for each metaview about some
- * unhandled message of type 1 (REPLY). Right now no metaviews
- * use this anyway, but we need to fix it.
- */
- nautilus_view_notify_title_change (NAUTILUS_VIEW (cur->data), new_title);
-#endif
- }
-
- /* Now change the stuff that doesn't use the NautilusView API */
nautilus_window_update_title_internal (window, new_title);
}
@@ -470,16 +445,12 @@ nautilus_window_update_view(NautilusWindow *window,
NautilusView *content_view)
{
CORBA_Environment environment;
- char *current_title;
g_return_if_fail(view);
loci->self_originated = (view == requesting_view);
- current_title = nautilus_window_get_current_location_title (window);
- g_assert (current_title != NULL);
- nautilus_view_notify_location_change (view, loci, current_title);
- g_free (current_title);
+ nautilus_view_notify_location_change (view, loci);
if(seli)
{
View Lorry Controller Status