Commit 79a454c7 authored by John Sullivan's avatar John Sullivan

Add initial_title parameter to notify_location_change signal and all its

handlers. This completes the change that I did part of last night.
parent 71bed264
2000-03-28 John Sullivan <sullivan@eazel.com>
Followup to last night's checkin; I forgot to add the
initial_title parameter to a notify_location_change
signal and all its signal handlers.
* libnautilus/ntl-view-frame.c:
(impl_Nautilus_View_notify_location_change): Add
initial_title parameter, pass it along when emitting
signal.
* 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,
* src/file-manager/fm-directory-view.c:
Added initial_title parameter to notify_location_change
signal handlers.
* src/ntl-view-nautilus.c: Removed a stray g_message.
2000-03-27 Andy Hertzfeld <andy@eazel.com>
* icons/eazel/i-directory-24.png:
......
......@@ -19,6 +19,7 @@ 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 {
......@@ -102,6 +103,7 @@ 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,6 +99,7 @@ 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,6 +99,7 @@ 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];
......
......@@ -555,7 +555,10 @@ browser_submit(GtkWidget *htmlw, const char *method, const char *url, const char
}
static void
browser_notify_location_change(NautilusViewFrame *view_frame, Nautilus_NavigationInfo *ni, BrowserInfo *bi)
browser_notify_location_change(NautilusViewFrame *view_frame,
Nautilus_NavigationInfo *ni,
const char *initial_title,
BrowserInfo *bi)
{
if(ni->self_originated)
return;
......
......@@ -100,6 +100,7 @@ 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);
......@@ -605,6 +606,7 @@ 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,6 +101,7 @@ 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,6 +101,7 @@ 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,6 +51,7 @@ 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,
......@@ -145,6 +146,7 @@ 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,6 +55,7 @@ static int object_count = 0;
static void
web_search_notify_location_change (NautilusViewFrame *view,
Nautilus_NavigationInfo *loci,
const char *initial_title,
WebSearchView *hview)
{
}
......
......@@ -77,6 +77,7 @@ 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
......@@ -137,9 +138,10 @@ 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);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo, initial_title);
}
static void
......@@ -268,13 +270,15 @@ 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,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
gtk_marshal_NONE__BOXED_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_BOXED, GTK_TYPE_POINTER);
nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] =
gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
......
......@@ -77,6 +77,7 @@ 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
......@@ -137,9 +138,10 @@ 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);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo, initial_title);
}
static void
......@@ -268,13 +270,15 @@ 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,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
gtk_marshal_NONE__BOXED_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_BOXED, GTK_TYPE_POINTER);
nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] =
gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
......
......@@ -77,6 +77,7 @@ 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
......@@ -137,9 +138,10 @@ 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);
gtk_signal_emit(GTK_OBJECT(servant->view), nautilus_view_frame_signals[NOTIFY_LOCATION_CHANGE], navinfo, initial_title);
}
static void
......@@ -268,13 +270,15 @@ 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,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
gtk_marshal_NONE__BOXED_POINTER,
GTK_TYPE_NONE, 2, GTK_TYPE_BOXED, GTK_TYPE_POINTER);
nautilus_view_frame_signals[NOTIFY_SELECTION_CHANGE] =
gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
......
......@@ -131,6 +131,7 @@ 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);
......@@ -641,6 +642,7 @@ 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);
......
......@@ -133,7 +133,6 @@ nv_notify_title_change(NautilusView *view, const char *new_title, CORBA_Environm
{
NautilusViewInfo *nvi = view->component_data;
g_message ("called nv_notify_title_change");
Nautilus_View_notify_title_change(nvi->view_client, new_title, ev);
if(ev->_major != CORBA_NO_EXCEPTION)
gtk_object_destroy(GTK_OBJECT(view));
......
......@@ -133,7 +133,6 @@ nv_notify_title_change(NautilusView *view, const char *new_title, CORBA_Environm
{
NautilusViewInfo *nvi = view->component_data;
g_message ("called nv_notify_title_change");
Nautilus_View_notify_title_change(nvi->view_client, new_title, ev);
if(ev->_major != CORBA_NO_EXCEPTION)
gtk_object_destroy(GTK_OBJECT(view));
......
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