Commit a2d26f63 authored by John Sullivan's avatar John Sullivan

Gave content views the ability to specify the user-displayed title for a

location; this is used initially (and most importantly) by web pages so that
bookmarks, the window title, and the index panel will display the html page title
rather than the url.
parent 6179a764
2000-03-27 John Sullivan <sullivan@eazel.com>
Made web page titles be used for the window title,
the index panel location name, and the menu item in
the Go menu (which is then used for the Bookmarks menu
too). This required lots of underpinnings work. Now any
content view (not just the web browser) can express its
opinion on what title for the current location should be
displayed to the user.
* idl/nautilus.idl: added View:notify_title_change; added
initial_title parameter to View:notify_location_change;
reordered functions in View to better group related items;
added ContentViewFrame:request_title_change.
* libnautilus/nautilus-view-frame-private.h: New file,
holds a struct and a function shared by NautilusViewFrame
and (now) NautilusContentViewFrame.
* libnautilus/ntl-view-frame.h: Reordered functions to
match idl (just for clarity); also added (notify_title_change).
* libnautilus/ntl-view-frame.c: Moved _NautilusViewFramePrivate
struct to new private .h file, added (notify_title_change);
reordered function pointers in epv to match idl.
(nautilus_view_frame_class_init): Set up signal for
notify_title_change.
(nautilus_view_frame_ensure_view_frame): No longer static since
it's in new private .h file.
* libnautilus/ntl-content-view-frame.h,
* libnautilus/ntl-content-view-frame.c:
(nautilus_content_view_frame_request_title_change):
New function that a content view calls on its frame
when it has an opinion about what the user-displayable
title for the current location should be.
* libnautilus/nautilus-bookmark.c,
* libnautilus/nautilus-bookmark.h:
(nautilus_bookmark_set_name): New function to change the name of
an existing bookmark.
* src/ntl-view-private.h: Moved definition of impl_POA_Nautilus_ViewFrame
here so it can be shared by NautilusContentView; reordered functions in
_NautilusViewComponentType to match idl and included notify_title_change.
* src/ntl-view-frame-svr.c: Moved definition of impl_POA_Nautilus_ViewFrame
out of here.
* src/ntl-view.h,
* src/ntl-view.c:
(nautilus_view_notify_location_change): Added initial_title parameter.
(nautilus_view_notify_title_change): New function.
* src/ntl-view-nautilus.c:
(nv_notify_location_change): Added initial_title parameter.
(nv_notify_title_change): New function.
nautilus_view_component_type: reordered function pointers to
match idl, and added new one for notify_title_change.
* src/ntl-view-bonobo-control.c:
(bonobo_control_notify_location_change): Added initial_title parameter.
bonobo_control_component_type: reordered function pointers to match idl
and added notify_title_change.
* src/ntl-view-bonobo-subdoc.c
(bonobo_subdoc_notify_location_change): Added initial_title parameter.
bonobo_subdoc_component_type: reordered function pointers to match idl
and added notify_title_change.
* src/nautilus-bookmark-list.c:
(destroy_bookmark): Removed this function.
(nautilus_bookmark_list_delete_item_at): unref where it was destroying.
(nautilus_list_load_file): use gtk_object_unref as foreach function
instead of destroy_bookmark.
* src/nautilus-index-title.h,
* src/nautilus-index-title.c:
new field _NautilusIndexTitleDetails->requested_text.
(nautilus_index_title_set_uri): Added initial_text parameter;
store initial_text in requested_text field after freeing old value.
(nautilus_index_panel_set_text): New function, passes new text to
nautilus_index_title_set_up_label.
(nautilus_index_title_finalize): free requested_text.
(nautilus_index_title_set_up_label):
Use requested_text instead of extracting short name of URI here.
* src/ntl-index-panel.h,
* src/ntl-index-panel.c:
(nautilus_index_panel_set_uri): Added initial_title parameter.
(nautilus_index_panel_set_title): New function, called if the title
changes later on; pass new_title on to nautilus_index_title_set_text.
(nautilus_index_panel_set_up_info): Added initial_title parameter;
pass initial_title on to nautilus_index_title_set_uri.
* src/ntl-content-view.h: Redid object & class struct definitions
to match others; added request_title_change signal definition.
* src/ntl-content-view.c:
added function pointer for request_title_change to epv;
added signal-definining enum & array;
(impl_Nautilus_ContentViewFrame_request_title_change): New function.
(nautilus_content_view_class_init): Define "request_title_change" signal.
(nautilus_content_view_request_title_change): New function, emits signal.
* src/ntl-window.h: New fields for requested_title, default_title,
current_location_bookmark, last_location_bookmark.
* src/ntl-window.c:
(nautilus_send_history_list_changed): New convenience routine to
emit "history_list_changed" signal since it's emitted in more than
one place now.
(nautilus_add_to_history_list): Change parameter from a const char *
to a NautilusBookmark; call nautilus_send_history_list_changed.
(nautilus_window_request_title_change_callback): New function, calls
nautilus_window_request_title_change.
(nautilus_window_connect_view): Just variable renaming & reformatting.
(nautilus_window_connect_content_view): New function, calls
nautilus_window_connect_view then connects to "request_title_change: signal
also.
* src/ntl-window-private.h:
(nautilus_window_connect_content_view): New prototype.
(nautilus_send_history_list): New prototype.
(nautilus_add_to_history_list): Change parameter from const char *
to NautilusBookmark *
* src/ntl-window-msgs.h:
(nautilus_window_request_title_change): prototype for new function.
* src/ntl-window-msgs.c:
(nautilus_window_refresh_title): Removed.
(compute_default_title), (nautilus_window_get_current_location_title),
(nautilus_window_update_title_internal),
(nautilus_window_reset_title_internal),
(nautilus_window_request_title_change): New functions having to do with
passing around the title-change request. Note that there's an unresolved
problem where calling nautilus_view_notify_title_change here doesn't work
properly for metaviews. There's a comment in the code and I'll write up
a bug report also. There are currently no metaviews that care.
(nautilus_window_update_internals): Use window->last_location_bookmark
instead of creating a new bookmark for back/forward lists (this means the
back/forward menus will respect any title change requests); remove one
of the two identical calls to nautilus_index_panel_set_uri; modify the
other one to pass current location title.
(nautilus_window_update_view): Pass current title to
nautilus_view_notify_location_change.
(nautilus_window_load_content_view):
Call nautilus_window_connect_content_view instead of
nautilus_window_connect_view.
(nautilus_window_update_state): Call nautilus_window_reset_title_internal
at two spots where the location is changing.
* src/nautilus-window-menus.c:
(nautilus_window_add_bookmark_for_current_location): Use
window->current_location_bookmark instead of creating a new one
to take advantage of any requested title changes.
* components/html/ntl-web-browser.c:
(browser_title_changed): New function, calls
nautilus_content_view_frame_request_title_change.
(make_obj): Connect browser_title_changed to "title_changed" signal
of gtkhtml widget.
Fixed bug 353 (Removing all bookmark items from window can lead to crash)
* src/nautilus-bookmarks-window.c: (on_remove_button_clicked):
If we removed the last item, explicitly call repopulate since
no callback handles that case.
2000-03-27 Andy Hertzfeld <andy@eazel.com>
* libnautilus/nautilus-icon-canvas-item.c:
......
......@@ -518,6 +518,12 @@ browser_select_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi)
bi->prevsel = url?1:0;
}
static void
browser_title_changed(GtkWidget *htmlw, const char *new_title, BrowserInfo *bi)
{
nautilus_content_view_frame_request_title_change (NAUTILUS_CONTENT_VIEW_FRAME (bi->view_frame), new_title);
}
static void
browser_submit(GtkWidget *htmlw, const char *method, const char *url, const char *encoding, BrowserInfo *bi)
{
......@@ -587,6 +593,7 @@ make_obj(BonoboGenericFactory *Factory, const char *goad_id, void *closure)
gtk_signal_connect(GTK_OBJECT(bi->htmlw), "url_requested", browser_url_requested, bi);
gtk_signal_connect(GTK_OBJECT(bi->htmlw), "on_url", browser_select_url, bi);
gtk_signal_connect(GTK_OBJECT(bi->htmlw), "submit", browser_submit, bi);
gtk_signal_connect(GTK_OBJECT(bi->htmlw), "title_changed", browser_title_changed, bi);
wtmp = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(wtmp), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
......
......@@ -42,13 +42,13 @@ 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);
oneway void show_properties (); // Requests that the client show its properties
oneway void notify_location_change (in NavigationInfo navinfo,
in string initial_title);
oneway void stop_location_change ();
oneway void notify_selection_change (in SelectionInfo selinfo);
oneway void notify_title_change (in string new_title);
oneway void stop_location_change ();
oneway void show_properties (); // Requests that the client show its properties
};
interface MetaView : View {
......@@ -71,6 +71,7 @@ module Nautilus {
};
interface ContentViewFrame : ViewFrame {
oneway void request_title_change (in string new_title);
};
// typedef sequence<double> ZoomLevelList;
......
......@@ -178,6 +178,24 @@ nautilus_bookmark_get_uri (const NautilusBookmark *bookmark)
return bookmark->details->uri;
}
/**
* nautilus_bookmark_set_name:
*
* Change the user-displayed name of a bookmark.
* @new_name: The new user-displayed name for this bookmark, mustn't be NULL.
*
**/
void
nautilus_bookmark_set_name (NautilusBookmark *bookmark, const char *new_name)
{
g_return_if_fail(NAUTILUS_IS_BOOKMARK (bookmark));
g_return_if_fail (new_name != NULL);
g_free (bookmark->details->name);
bookmark->details->name = g_strdup (new_name);
}
/**
* nautilus_bookmark_new_with_name:
*
......
......@@ -63,6 +63,8 @@ NautilusBookmark *nautilus_bookmark_new (const char
NautilusBookmark *nautilus_bookmark_copy (const NautilusBookmark *bookmark);
const char * nautilus_bookmark_get_name (const NautilusBookmark *bookmark);
const char * nautilus_bookmark_get_uri (const NautilusBookmark *bookmark);
void nautilus_bookmark_set_name (NautilusBookmark *bookmark,
const char *new_name);
int nautilus_bookmark_compare_with (gconstpointer a,
gconstpointer b);
......
......@@ -178,6 +178,24 @@ nautilus_bookmark_get_uri (const NautilusBookmark *bookmark)
return bookmark->details->uri;
}
/**
* nautilus_bookmark_set_name:
*
* Change the user-displayed name of a bookmark.
* @new_name: The new user-displayed name for this bookmark, mustn't be NULL.
*
**/
void
nautilus_bookmark_set_name (NautilusBookmark *bookmark, const char *new_name)
{
g_return_if_fail(NAUTILUS_IS_BOOKMARK (bookmark));
g_return_if_fail (new_name != NULL);
g_free (bookmark->details->name);
bookmark->details->name = g_strdup (new_name);
}
/**
* nautilus_bookmark_new_with_name:
*
......
......@@ -63,6 +63,8 @@ NautilusBookmark *nautilus_bookmark_new (const char
NautilusBookmark *nautilus_bookmark_copy (const NautilusBookmark *bookmark);
const char * nautilus_bookmark_get_name (const NautilusBookmark *bookmark);
const char * nautilus_bookmark_get_uri (const NautilusBookmark *bookmark);
void nautilus_bookmark_set_name (NautilusBookmark *bookmark,
const char *new_name);
int nautilus_bookmark_compare_with (gconstpointer a,
gconstpointer b);
......
......@@ -178,6 +178,24 @@ nautilus_bookmark_get_uri (const NautilusBookmark *bookmark)
return bookmark->details->uri;
}
/**
* nautilus_bookmark_set_name:
*
* Change the user-displayed name of a bookmark.
* @new_name: The new user-displayed name for this bookmark, mustn't be NULL.
*
**/
void
nautilus_bookmark_set_name (NautilusBookmark *bookmark, const char *new_name)
{
g_return_if_fail(NAUTILUS_IS_BOOKMARK (bookmark));
g_return_if_fail (new_name != NULL);
g_free (bookmark->details->name);
bookmark->details->name = g_strdup (new_name);
}
/**
* nautilus_bookmark_new_with_name:
*
......
......@@ -63,6 +63,8 @@ NautilusBookmark *nautilus_bookmark_new (const char
NautilusBookmark *nautilus_bookmark_copy (const NautilusBookmark *bookmark);
const char * nautilus_bookmark_get_name (const NautilusBookmark *bookmark);
const char * nautilus_bookmark_get_uri (const NautilusBookmark *bookmark);
void nautilus_bookmark_set_name (NautilusBookmark *bookmark,
const char *new_name);
int nautilus_bookmark_compare_with (gconstpointer a,
gconstpointer b);
......
......@@ -29,6 +29,7 @@
#include <config.h>
#include "ntl-content-view-frame.h"
#include "nautilus-view-frame-private.h"
#include <bonobo/bonobo-control.h>
typedef struct {
......@@ -130,3 +131,26 @@ nautilus_content_view_frame_class_init (NautilusContentViewFrameClass *klass)
view_class->servant_destroy_func = POA_Nautilus_ContentView__fini;
view_class->vepv = &impl_Nautilus_ContentView_vepv;
}
void
nautilus_content_view_frame_request_title_change (NautilusContentViewFrame *view,
const char *new_title)
{
CORBA_Environment ev;
g_return_if_fail (NAUTILUS_IS_CONTENT_VIEW_FRAME (view));
g_return_if_fail (new_title != NULL);
CORBA_exception_init(&ev);
if (nautilus_view_frame_ensure_view_frame (NAUTILUS_VIEW_FRAME (view))) {
Nautilus_ContentViewFrame_request_title_change (NAUTILUS_VIEW_FRAME (view)->private->view_frame, new_title, &ev);
if (ev._major != CORBA_NO_EXCEPTION)
{
CORBA_Object_release(NAUTILUS_VIEW_FRAME (view)->private->view_frame, &ev);
NAUTILUS_VIEW_FRAME (view)->private->view_frame = CORBA_OBJECT_NIL;
}
}
CORBA_exception_free(&ev);
}
......@@ -53,4 +53,7 @@ GtkType nautilus_content_view_frame_get_type (
NautilusContentViewFrame *nautilus_content_view_frame_new (GtkWidget *widget);
NautilusContentViewFrame *nautilus_content_view_frame_new_from_bonobo_control (BonoboObject *bonobo_control);
void nautilus_content_view_frame_request_title_change (NautilusContentViewFrame *view,
const char *new_title);
#endif
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
/*
* libnautilus: A library for nautilus view implementations.
*
* Copyright (C) 2000 Eazel, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the Free
* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* Author: John Sullivan <sullivan@eazel.com>
*
*/
#ifndef NTL_VIEW_FRAME_PRIVATE_H
#define NTL_VIEW_FRAME_PRIVATE_H
struct _NautilusViewFramePrivate {
BonoboObject *control;
Nautilus_ViewFrame view_frame;
};
gboolean nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view);
#endif
......@@ -29,18 +29,15 @@
#include <config.h>
#include "ntl-view-frame.h"
#include "nautilus-view-frame-private.h"
#include <gtk/gtksignal.h>
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-control.h>
struct _NautilusViewFramePrivate {
BonoboObject *control;
Nautilus_ViewFrame view_frame;
};
enum {
NOTIFY_LOCATION_CHANGE,
NOTIFY_TITLE_CHANGE,
NOTIFY_SELECTION_CHANGE,
LOAD_STATE,
SAVE_STATE,
......@@ -83,8 +80,8 @@ impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
static void
impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
static void
impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
......@@ -92,8 +89,13 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
static void
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
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);
POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
{
......@@ -101,9 +103,10 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
(gpointer) & impl_Nautilus_View_save_state,
(gpointer) & impl_Nautilus_View_load_state,
(gpointer) & impl_Nautilus_View_notify_location_change,
(gpointer) & impl_Nautilus_View_show_properties,
(gpointer) & impl_Nautilus_View_stop_location_change,
(gpointer) & impl_Nautilus_View_notify_selection_change,
(gpointer) & impl_Nautilus_View_stop_location_change
(gpointer) & impl_Nautilus_View_notify_title_change,
(gpointer) & impl_Nautilus_View_show_properties
};
static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
......@@ -154,6 +157,14 @@ 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)
......@@ -271,6 +282,13 @@ 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,
......@@ -382,7 +400,7 @@ nautilus_view_frame_destroy (NautilusViewFrame *view)
((GtkObjectClass *)klass->parent_class)->destroy((GtkObject *)view);
}
static gboolean
gboolean
nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view)
{
CORBA_Environment ev;
......
......@@ -51,14 +51,17 @@ struct _NautilusViewFrameClass
{
BonoboObjectClass parent_spot;
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);
Nautilus_NavigationInfo *nav_context,
const char *initial_title);
void (*stop_location_change) (NautilusViewFrame *view);
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*notify_title_change) (NautilusViewFrame *view,
const char *new_title);
void (*show_properties) (NautilusViewFrame *view);
void (*stop_location_change) (NautilusViewFrame *view);
BonoboObjectClass *parent_class;
......
......@@ -29,18 +29,15 @@
#include <config.h>
#include "ntl-view-frame.h"
#include "nautilus-view-frame-private.h"
#include <gtk/gtksignal.h>
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-control.h>
struct _NautilusViewFramePrivate {
BonoboObject *control;
Nautilus_ViewFrame view_frame;
};
enum {
NOTIFY_LOCATION_CHANGE,
NOTIFY_TITLE_CHANGE,
NOTIFY_SELECTION_CHANGE,
LOAD_STATE,
SAVE_STATE,
......@@ -83,8 +80,8 @@ impl_Nautilus_View_notify_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
static void
impl_Nautilus_View_show_properties(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
static void
impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
......@@ -92,8 +89,13 @@ impl_Nautilus_View_notify_selection_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
static void
impl_Nautilus_View_stop_location_change(impl_POA_Nautilus_View * servant,
CORBA_Environment * ev);
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);
POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
{
......@@ -101,9 +103,10 @@ POA_Nautilus_View__epv libnautilus_Nautilus_View_epv =
(gpointer) & impl_Nautilus_View_save_state,
(gpointer) & impl_Nautilus_View_load_state,
(gpointer) & impl_Nautilus_View_notify_location_change,
(gpointer) & impl_Nautilus_View_show_properties,
(gpointer) & impl_Nautilus_View_stop_location_change,
(gpointer) & impl_Nautilus_View_notify_selection_change,
(gpointer) & impl_Nautilus_View_stop_location_change
(gpointer) & impl_Nautilus_View_notify_title_change,
(gpointer) & impl_Nautilus_View_show_properties
};
static PortableServer_ServantBase__epv base_epv = { NULL, NULL, NULL };
......@@ -154,6 +157,14 @@ 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)
......@@ -271,6 +282,13 @@ 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,
......@@ -382,7 +400,7 @@ nautilus_view_frame_destroy (NautilusViewFrame *view)
((GtkObjectClass *)klass->parent_class)->destroy((GtkObject *)view);
}
static gboolean
gboolean
nautilus_view_frame_ensure_view_frame (NautilusViewFrame *view)
{
CORBA_Environment ev;
......
......@@ -51,14 +51,17 @@ struct _NautilusViewFrameClass
{
BonoboObjectClass parent_spot;
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);
Nautilus_NavigationInfo *nav_context,
const char *initial_title);
void (*stop_location_change) (NautilusViewFrame *view);
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*notify_title_change) (NautilusViewFrame *view,