Commit 66d503d1 authored by John Sullivan's avatar John Sullivan

Removed notify_title_change call and removed initial_title parameter of

notify_location_change call.
parent 5da770ab
2000-03-28 John Sullivan <sullivan@eazel.com>
Maciej, Darin and I discussed the notify_title_change
design and decided that we didn't need it now and that
we should keep the API simpler by removing it, along
with the initial_title parameter I added to
notify_location_change. So out they come.
* components/help/hyperbola-nav-tree.c,
* components/history/ntl-history-view.c,
* components/html/ntl-web-browser.c,
* components/music/nautilus-music-view.c,
* components/notes/ntl-notes.c,
* components/sample/nautilus-sample-content-view.c,
* components/websearch/ntl-web-search.c,
* idl/nautilus.idl,
* libnautilus/ntl-view-frame.c,
* libnautilus/ntl-view-frame.h,
* src/ntl-view-bonobo-control.c,
* src/ntl-view-bonobo-subdoc.c,
* src/ntl-view-nautilus.c,
* src/ntl-view-private.h,
* src/ntl-view.c,
* src/ntl-view.h,
* src/ntl-window-msgs.c,
* src/file-manager/fm-directory-view.c: Removed notify_title_change
and the initial_title parameter to notify_location_change wherever
they reared their ugly heads.
2000-03-28 John Sullivan <sullivan@eazel.com>
* libnautilus/nautilus-icon-container.c:
......
......@@ -19,7 +19,6 @@ static void hyperbola_navigation_tree_select_row(GtkCTree *ctree,
HyperbolaNavigationTree *view);
static void hyperbola_navigation_tree_notify_location_change (NautilusViewFrame *view_frame,
Nautilus_NavigationInfo *navi,
const char *initial_title,
HyperbolaNavigationTree *hview);
typedef struct {
......@@ -103,7 +102,6 @@ hyperbola_navigation_tree_new(void)
static void
hyperbola_navigation_tree_notify_location_change (NautilusViewFrame *view_frame,
Nautilus_NavigationInfo *navi,
const char *initial_title,
HyperbolaNavigationTree *hview)
{
HyperbolaTreeNode *tnode;
......
......@@ -99,7 +99,6 @@ history_view_update_icons (GtkCList *clist)
static void
hyperbola_navigation_history_notify_location_change (NautilusViewFrame *view,
Nautilus_NavigationInfo *loci,
const char *initial_title,
HistoryView *hview)
{
char *cols[HISTORY_VIEW_COLUMN_COUNT];
......
......@@ -99,7 +99,6 @@ history_view_update_icons (GtkCList *clist)
static void
hyperbola_navigation_history_notify_location_change (NautilusViewFrame *view,
Nautilus_NavigationInfo *loci,
const char *initial_title,
HistoryView *hview)
{
char *cols[HISTORY_VIEW_COLUMN_COUNT];
......
......@@ -557,7 +557,6 @@ browser_submit(GtkWidget *htmlw, const char *method, const char *url, const char
static void
browser_notify_location_change(NautilusViewFrame *view_frame,
Nautilus_NavigationInfo *ni,
const char *initial_title,
BrowserInfo *bi)
{
if(ni->self_originated)
......
......@@ -100,7 +100,6 @@ NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMusicView, nautilus_music_view, GTK_T
static void
music_view_notify_location_change_cb(NautilusContentViewFrame *view,
Nautilus_NavigationInfo *navinfo,
const char *initial_title,
NautilusMusicView *music_view);
static void selection_callback(GtkCList * clist, int row, int column, GdkEventButton * event);
......@@ -606,7 +605,6 @@ nautilus_music_view_load_uri (NautilusMusicView *music_view, const char *uri)
static void
music_view_notify_location_change_cb (NautilusContentViewFrame *view,
Nautilus_NavigationInfo *navinfo,
const char *initial_title,
NautilusMusicView *music_view)
{
Nautilus_ProgressRequestInfo pri;
......
......@@ -101,7 +101,6 @@ static void notes_save_metainfo(NotesView *hview)
static void
notes_notify_location_change (NautilusViewFrame *view,
Nautilus_NavigationInfo *loci,
const char *initial_title,
NotesView *hview)
{
if (strcmp(hview->current_uri, loci->requested_uri))
......
......@@ -101,7 +101,6 @@ static void notes_save_metainfo(NotesView *hview)
static void
notes_notify_location_change (NautilusViewFrame *view,
Nautilus_NavigationInfo *loci,
const char *initial_title,
NotesView *hview)
{
if (strcmp(hview->current_uri, loci->requested_uri))
......
......@@ -51,7 +51,6 @@ NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSampleContentView, nautilus_sample_co
static void sample_notify_location_change_callback (NautilusContentViewFrame *view_frame,
Nautilus_NavigationInfo *navinfo,
const char *initial_title,
NautilusSampleContentView *view);
static void sample_merge_bonobo_items_callback (BonoboObject *control,
gboolean state,
......@@ -146,7 +145,6 @@ nautilus_sample_content_view_load_uri (NautilusSampleContentView *view,
static void
sample_notify_location_change_callback (NautilusContentViewFrame *view_frame,
Nautilus_NavigationInfo *navinfo,
const char *initial_title,
NautilusSampleContentView *view)
{
Nautilus_ProgressRequestInfo pri;
......
......@@ -55,7 +55,6 @@ static int object_count = 0;
static void
web_search_notify_location_change (NautilusViewFrame *view,
Nautilus_NavigationInfo *loci,
const char *initial_title,
WebSearchView *hview)
{
}
......
......@@ -42,11 +42,9 @@ module Nautilus {
interface View : ::Bonobo::Unknown {
void save_state (in string config_path);
void load_state (in string config_path);
oneway void notify_location_change (in NavigationInfo navinfo,
in string initial_title);
oneway void notify_location_change (in NavigationInfo navinfo);
oneway void stop_location_change ();
oneway void notify_selection_change (in SelectionInfo selinfo);
oneway void notify_title_change (in string new_title);
oneway void show_properties (); // Requests that the client show its properties
};
......
......@@ -37,7 +37,6 @@
enum {
NOTIFY_LOCATION_CHANGE,
NOTIFY_TITLE_CHANGE,
NOTIFY_SELECTION_CHANGE,
LOAD_STATE,
SAVE_STATE,
......@@ -77,7 +76,6 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
static void
impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
Nautilus_NavigationInfo * navinfo,
const char *initial_title,
CORBA_Environment * ev);
static void
......@@ -89,11 +87,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
Nautilus_SelectionInfo * selinfo,
CORBA_Environment * ev);
static void
impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
const char * new_title,
CORBA_Environment * ev);
static void
impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
......@@ -106,7 +99,6 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
(gpointer) & impl_Nautilus_View_notify_location_change,
(gpointer) & impl_Nautilus_View_stop_location_change,
(gpointer) & impl_Nautilus_View_notify_selection_change,
(gpointer) & impl_Nautilus_View_notify_title_change,
(gpointer) & impl_Nautilus_View_show_properties
};
......@@ -138,10 +130,9 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
static void
impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
Nautilus_NavigationInfo * navinfo,
const char *initial_title,
CORBA_Environment * ev)
{
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo, initial_title);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
}
static void
......@@ -159,14 +150,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo);
}
static void
impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
const char * new_title,
CORBA_Environment * ev)
{
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE], new_title);
}
static void
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev)
......@@ -270,15 +253,13 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
klass->servant_destroy_func = POA_Nautilus_View__fini;
klass->vepv = &impl_Nautilus_View_vepv;
#define gtk_marshal_NONE__BOXED_POINTER gtk_marshal_NONE__POINTER_POINTER
nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] =
gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_BOXED, GTK_TYPE_POINTER);
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] =
gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
......@@ -286,13 +267,6 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE] =
gtk_signal_new("notify_title_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_title_change),
gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
nautilus_view_frame_signals[LOAD_STATE] =
gtk_signal_new("load_state",
GTK_RUN_LAST,
......
......@@ -54,13 +54,10 @@ struct _NautilusViewFrameClass
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*notify_location_change) (NautilusViewFrame *view,
Nautilus_NavigationInfo *nav_context,
const char *initial_title);
Nautilus_NavigationInfo *nav_context);
void (*stop_location_change) (NautilusViewFrame *view);
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*notify_title_change) (NautilusViewFrame *view,
const char *new_title);
void (*show_properties) (NautilusViewFrame *view);
BonoboObjectClass *parent_class;
......
......@@ -37,7 +37,6 @@
enum {
NOTIFY_LOCATION_CHANGE,
NOTIFY_TITLE_CHANGE,
NOTIFY_SELECTION_CHANGE,
LOAD_STATE,
SAVE_STATE,
......@@ -77,7 +76,6 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
static void
impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
Nautilus_NavigationInfo * navinfo,
const char *initial_title,
CORBA_Environment * ev);
static void
......@@ -89,11 +87,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
Nautilus_SelectionInfo * selinfo,
CORBA_Environment * ev);
static void
impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
const char * new_title,
CORBA_Environment * ev);
static void
impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
......@@ -106,7 +99,6 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
(gpointer) & impl_Nautilus_View_notify_location_change,
(gpointer) & impl_Nautilus_View_stop_location_change,
(gpointer) & impl_Nautilus_View_notify_selection_change,
(gpointer) & impl_Nautilus_View_notify_title_change,
(gpointer) & impl_Nautilus_View_show_properties
};
......@@ -138,10 +130,9 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
static void
impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
Nautilus_NavigationInfo * navinfo,
const char *initial_title,
CORBA_Environment * ev)
{
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo, initial_title);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
}
static void
......@@ -159,14 +150,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo);
}
static void
impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
const char * new_title,
CORBA_Environment * ev)
{
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE], new_title);
}
static void
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev)
......@@ -270,15 +253,13 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
klass->servant_destroy_func = POA_Nautilus_View__fini;
klass->vepv = &impl_Nautilus_View_vepv;
#define gtk_marshal_NONE__BOXED_POINTER gtk_marshal_NONE__POINTER_POINTER
nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] =
gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_BOXED, GTK_TYPE_POINTER);
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] =
gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
......@@ -286,13 +267,6 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE] =
gtk_signal_new("notify_title_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_title_change),
gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
nautilus_view_frame_signals[LOAD_STATE] =
gtk_signal_new("load_state",
GTK_RUN_LAST,
......
......@@ -54,13 +54,10 @@ struct _NautilusViewFrameClass
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*notify_location_change) (NautilusViewFrame *view,
Nautilus_NavigationInfo *nav_context,
const char *initial_title);
Nautilus_NavigationInfo *nav_context);
void (*stop_location_change) (NautilusViewFrame *view);
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*notify_title_change) (NautilusViewFrame *view,
const char *new_title);
void (*show_properties) (NautilusViewFrame *view);
BonoboObjectClass *parent_class;
......
......@@ -37,7 +37,6 @@
enum {
NOTIFY_LOCATION_CHANGE,
NOTIFY_TITLE_CHANGE,
NOTIFY_SELECTION_CHANGE,
LOAD_STATE,
SAVE_STATE,
......@@ -77,7 +76,6 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
static void
impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
Nautilus_NavigationInfo * navinfo,
const char *initial_title,
CORBA_Environment * ev);
static void
......@@ -89,11 +87,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
Nautilus_SelectionInfo * selinfo,
CORBA_Environment * ev);
static void
impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
const char * new_title,
CORBA_Environment * ev);
static void
impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
......@@ -106,7 +99,6 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
(gpointer) & impl_Nautilus_View_notify_location_change,
(gpointer) & impl_Nautilus_View_stop_location_change,
(gpointer) & impl_Nautilus_View_notify_selection_change,
(gpointer) & impl_Nautilus_View_notify_title_change,
(gpointer) & impl_Nautilus_View_show_properties
};
......@@ -138,10 +130,9 @@ impl_Nautilus_View_load_state(impl_POA_Nautilus_View * servant,
static void
impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
Nautilus_NavigationInfo * navinfo,
const char *initial_title,
CORBA_Environment * ev)
{
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo, initial_title);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo);
}
static void
......@@ -159,14 +150,6 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE], selinfo);
}
static void
impl_Nautilus_View_notify_title_change(impl_POA_Nautilus_View * servant,
const char * new_title,
CORBA_Environment * ev)
{
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE], new_title);
}
static void
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev)
......@@ -270,15 +253,13 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
klass->servant_destroy_func = POA_Nautilus_View__fini;
klass->vepv = &impl_Nautilus_View_vepv;
#define gtk_marshal_NONE__BOXED_POINTER gtk_marshal_NONE__POINTER_POINTER
nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE] =
gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_BOXED, GTK_TYPE_POINTER);
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] =
gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
......@@ -286,13 +267,6 @@ nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
nautilus_view_frame_signals[NOTIFY_TITLE_CHANGE] =
gtk_signal_new("notify_title_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_title_change),
gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
nautilus_view_frame_signals[LOAD_STATE] =
gtk_signal_new("load_state",
GTK_RUN_LAST,
......
......@@ -54,13 +54,10 @@ struct _NautilusViewFrameClass
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*notify_location_change) (NautilusViewFrame *view,
Nautilus_NavigationInfo *nav_context,
const char *initial_title);
Nautilus_NavigationInfo *nav_context);
void (*stop_location_change) (NautilusViewFrame *view);
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*notify_title_change) (NautilusViewFrame *view,
const char *new_title);
void (*show_properties) (NautilusViewFrame *view);
BonoboObjectClass *parent_class;
......
......@@ -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);
......
......@@ -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 */
};
......@@ -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 */
};
......
......@@ -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));
}
......@@ -128,16 +128,6 @@ nv_notify_selection_change(NautilusView *view, Nautilus_SelectionInfo *nav_ctx,
gtk_object_destroy(GTK_OBJECT(view));
}
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)
{
......@@ -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 */
};
......@@ -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);
......
......@@ -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);
}
......@@ -476,23 +475,6 @@ nautilus_view_notify_selection_change(NautilusView *view,
CORBA_exception_free(&ev);
}
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)
{
......
......@@ -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,
......
......@@ -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);