Commit 78106a73 authored by Maciej Stachowiak's avatar Maciej Stachowiak
Browse files

Rename NautilusViewClient to NautilusViewFrame, NautilusContentViewClient

	* libnautilus/ntl-view-client.c, libnautilus/ntl-view-client.h,
	libnautilus/ntl-content-view-client.c,
	libnautilus/ntl-content-view-client.h,
	libnautilus/ntl-meta-view-client.c,
	libnautilus/ntl-meta-view-client.h,: Rename NautilusViewClient to
	NautilusViewFrame, NautilusContentViewClient to
	NautilusContentViewFrame, and NautilusMetaViewClient to
	NautilusMetaViewFrame.
	* components/help/hyperbola-nav-tree.c,
	components/history/ntl-history-view.c,
	components/html/ntl-web-browser.c,
	components/websearch/ntl-web-search.c, src/ntl-app.c,
	src/file-manager/fm-directory-view.c,
	src/file-manager/fm-directory-view.h: Reflect the above renaming.
parent 1cfc709b
2000-01-09 Maciej Stachowiak <mjs@eazel.com>
* libnautilus/ntl-view-client.c, libnautilus/ntl-view-client.h,
libnautilus/ntl-content-view-client.c,
libnautilus/ntl-content-view-client.h,
libnautilus/ntl-meta-view-client.c,
libnautilus/ntl-meta-view-client.h,: Rename NautilusViewClient to
NautilusViewFrame, NautilusContentViewClient to
NautilusContentViewFrame, and NautilusMetaViewClient to
NautilusMetaViewFrame.
* components/help/hyperbola-nav-tree.c,
components/history/ntl-history-view.c,
components/html/ntl-web-browser.c,
components/websearch/ntl-web-search.c, src/ntl-app.c,
src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view.h: Reflect the above renaming.
2000-01-09 Andy Hertzfeld <andy@eazel.com>
* src/ntl-index-panel.c"
made dropping a color from the color picker set the background accordingly. It doesn't
save the meta-data yet, thought
* src/ntl-index-panel.c: made dropping a color from the color
picker set the background accordingly. It doesn't save the
meta-data yet, thought
2000-01-09 Maciej Stachowiak <mjs@eazel.com>
......
......@@ -3,7 +3,7 @@
#include <gtk/gtk.h>
typedef struct {
NautilusViewClient *vc;
NautilusViewFrame *view_frame;
GtkWidget *ctree;
HyperbolaDocTree *doc_tree;
......@@ -19,7 +19,7 @@ static void hyperbola_navigation_tree_select_row(GtkCTree *ctree,
GtkCTreeNode *node,
gint column,
HyperbolaNavigationTree *view);
static void hyperbola_navigation_tree_notify_location_change (NautilusViewClient *vc,
static void hyperbola_navigation_tree_notify_location_change (NautilusViewFrame *view_frame,
Nautilus_NavigationInfo *navi,
HyperbolaNavigationTree *hview);
......@@ -72,11 +72,11 @@ hyperbola_navigation_tree_new(void)
view = g_new0(HyperbolaNavigationTree, 1);
view->vc = NAUTILUS_VIEW_CLIENT(gtk_widget_new(nautilus_meta_view_client_get_type(), NULL));
gtk_signal_connect(GTK_OBJECT(view->vc), "notify_location_change", hyperbola_navigation_tree_notify_location_change,
view->view_frame = NAUTILUS_VIEW_FRAME(gtk_widget_new(nautilus_meta_view_frame_get_type(), NULL));
gtk_signal_connect(GTK_OBJECT(view->view_frame), "notify_location_change", hyperbola_navigation_tree_notify_location_change,
view);
nautilus_meta_view_client_set_label(NAUTILUS_META_VIEW_CLIENT(view->vc), _("Help Contents"));
nautilus_meta_view_frame_set_label(NAUTILUS_META_VIEW_FRAME(view->view_frame), _("Help Contents"));
view->ctree = gtk_ctree_new_with_titles(1, 0, (gchar **)titles);
gtk_clist_freeze(GTK_CLIST(view->ctree));
......@@ -90,7 +90,7 @@ hyperbola_navigation_tree_new(void)
wtmp = gtk_scrolled_window_new(gtk_clist_get_hadjustment(GTK_CLIST(view->ctree)),
gtk_clist_get_vadjustment(GTK_CLIST(view->ctree)));
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(wtmp), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(view->vc), wtmp);
gtk_container_add(GTK_CONTAINER(view->view_frame), wtmp);
gtk_container_add(GTK_CONTAINER(wtmp), view->ctree);
gtk_clist_columns_autosize(GTK_CLIST(view->ctree));
......@@ -98,11 +98,11 @@ hyperbola_navigation_tree_new(void)
gtk_widget_show(view->ctree);
gtk_widget_show(wtmp);
return nautilus_view_client_get_gnome_object(view->vc);
return nautilus_view_frame_get_gnome_object(view->view_frame);
}
static void
hyperbola_navigation_tree_notify_location_change (NautilusViewClient *vc,
hyperbola_navigation_tree_notify_location_change (NautilusViewFrame *view_frame,
Nautilus_NavigationInfo *navi,
HyperbolaNavigationTree *hview)
{
......@@ -140,7 +140,7 @@ static void hyperbola_navigation_tree_select_row(GtkCTree *ctree, GtkCTreeNode *
memset(&nri, 0, sizeof(nri));
nri.requested_uri = tnode->uri;
nri.new_window_default = nri.new_window_suggested = nri.new_window_enforced = Nautilus_V_UNKNOWN;
nautilus_view_client_request_location_change(view->vc, &nri);
nautilus_view_frame_request_location_change(view->view_frame, &nri);
view->notify_count--;
}
......
......@@ -30,7 +30,7 @@
#include <libnautilus/libnautilus.h>
typedef struct {
NautilusViewClient *view;
NautilusViewFrame *view;
GtkCList *clist;
......@@ -40,7 +40,7 @@ typedef struct {
} HistoryView;
static void
hyperbola_navigation_history_notify_location_change (NautilusViewClient *view,
hyperbola_navigation_history_notify_location_change (NautilusViewFrame *view,
Nautilus_NavigationInfo *loci,
HistoryView *hview)
{
......@@ -119,7 +119,7 @@ hyperbola_navigation_history_select_row(GtkCList *clist, gint row, gint column,
reqi.new_window_default = reqi.new_window_suggested = Nautilus_V_FALSE;
reqi.new_window_enforced = Nautilus_V_FALSE;
nautilus_view_client_request_location_change(hview->view, &reqi);
nautilus_view_frame_request_location_change(hview->view, &reqi);
gtk_clist_thaw(clist);
}
......@@ -136,7 +136,7 @@ do_destroy(GtkObject *obj)
static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, gpointer closure)
{
GtkWidget *client, *clist, *wtmp;
GtkWidget *frame, *clist, *wtmp;
GnomeObject *ctl;
char *col_titles[1];
HistoryView *hview;
......@@ -145,11 +145,11 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id,
hview = g_new0(HistoryView, 1);
hview->last_row = -1;
client = gtk_widget_new(nautilus_meta_view_client_get_type(), NULL);
gtk_signal_connect(GTK_OBJECT(client), "destroy", do_destroy, NULL);
frame = gtk_widget_new(nautilus_meta_view_frame_get_type(), NULL);
gtk_signal_connect(GTK_OBJECT(frame), "destroy", do_destroy, NULL);
object_count++;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(client));
ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(frame));
/* create interface */
col_titles[0] = _("Path");
......@@ -161,20 +161,20 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id,
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(wtmp),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(client), wtmp);
gtk_container_add(GTK_CONTAINER(frame), wtmp);
gtk_container_add(GTK_CONTAINER(wtmp), clist);
gtk_widget_show_all(client);
gtk_widget_show_all(frame);
/* handle events */
gtk_signal_connect(GTK_OBJECT(client), "notify_location_change", hyperbola_navigation_history_notify_location_change, hview);
gtk_signal_connect(GTK_OBJECT(frame), "notify_location_change", hyperbola_navigation_history_notify_location_change, hview);
gtk_signal_connect(GTK_OBJECT(clist), "select_row", hyperbola_navigation_history_select_row, hview);
/* set description */
nautilus_meta_view_client_set_label(NAUTILUS_META_VIEW_CLIENT(client),
_("History"));
nautilus_meta_view_frame_set_label(NAUTILUS_META_VIEW_FRAME(frame),
_("History"));
hview->view = (NautilusViewClient *)client;
hview->view = (NautilusViewFrame *)frame;
hview->clist = (GtkCList *)clist;
#if 0
......
......@@ -30,7 +30,7 @@
#include <libnautilus/libnautilus.h>
typedef struct {
NautilusViewClient *view;
NautilusViewFrame *view;
GtkCList *clist;
......@@ -40,7 +40,7 @@ typedef struct {
} HistoryView;
static void
hyperbola_navigation_history_notify_location_change (NautilusViewClient *view,
hyperbola_navigation_history_notify_location_change (NautilusViewFrame *view,
Nautilus_NavigationInfo *loci,
HistoryView *hview)
{
......@@ -119,7 +119,7 @@ hyperbola_navigation_history_select_row(GtkCList *clist, gint row, gint column,
reqi.new_window_default = reqi.new_window_suggested = Nautilus_V_FALSE;
reqi.new_window_enforced = Nautilus_V_FALSE;
nautilus_view_client_request_location_change(hview->view, &reqi);
nautilus_view_frame_request_location_change(hview->view, &reqi);
gtk_clist_thaw(clist);
}
......@@ -136,7 +136,7 @@ do_destroy(GtkObject *obj)
static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id, gpointer closure)
{
GtkWidget *client, *clist, *wtmp;
GtkWidget *frame, *clist, *wtmp;
GnomeObject *ctl;
char *col_titles[1];
HistoryView *hview;
......@@ -145,11 +145,11 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id,
hview = g_new0(HistoryView, 1);
hview->last_row = -1;
client = gtk_widget_new(nautilus_meta_view_client_get_type(), NULL);
gtk_signal_connect(GTK_OBJECT(client), "destroy", do_destroy, NULL);
frame = gtk_widget_new(nautilus_meta_view_frame_get_type(), NULL);
gtk_signal_connect(GTK_OBJECT(frame), "destroy", do_destroy, NULL);
object_count++;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(client));
ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(frame));
/* create interface */
col_titles[0] = _("Path");
......@@ -161,20 +161,20 @@ static GnomeObject * make_obj(GnomeGenericFactory *Factory, const char *goad_id,
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(wtmp),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(client), wtmp);
gtk_container_add(GTK_CONTAINER(frame), wtmp);
gtk_container_add(GTK_CONTAINER(wtmp), clist);
gtk_widget_show_all(client);
gtk_widget_show_all(frame);
/* handle events */
gtk_signal_connect(GTK_OBJECT(client), "notify_location_change", hyperbola_navigation_history_notify_location_change, hview);
gtk_signal_connect(GTK_OBJECT(frame), "notify_location_change", hyperbola_navigation_history_notify_location_change, hview);
gtk_signal_connect(GTK_OBJECT(clist), "select_row", hyperbola_navigation_history_select_row, hview);
/* set description */
nautilus_meta_view_client_set_label(NAUTILUS_META_VIEW_CLIENT(client),
_("History"));
nautilus_meta_view_frame_set_label(NAUTILUS_META_VIEW_FRAME(frame),
_("History"));
hview->view = (NautilusViewClient *)client;
hview->view = (NautilusViewFrame *)frame;
hview->clist = (GtkCList *)clist;
#if 0
......
......@@ -29,7 +29,7 @@ extern GtkHTMLStreamHandle gtk_html_stream_ref(GtkHTMLStreamHandle handle);
extern void gtk_html_stream_unref(GtkHTMLStreamHandle handle);
typedef struct {
NautilusViewClient *vc;
NautilusViewFrame *view_frame;
GtkWidget *htmlw;
char *base_url, *base_target_url;
......@@ -160,7 +160,7 @@ browser_url_load_done(GtkWidget *htmlw, BrowserInfo *bi)
pri.type = Nautilus_PROGRESS_DONE_OK;
pri.amount = 100.0;
nautilus_view_client_request_progress_change(bi->vc, &pri);
nautilus_view_frame_request_progress_change(bi->view_frame, &pri);
}
struct _HTStream {
......@@ -357,7 +357,7 @@ browser_goto_url_real(GtkWidget *htmlw, const char *url, BrowserInfo *bi)
gtk_html_begin(GTK_HTML(bi->htmlw), url);
gtk_html_parse(GTK_HTML(bi->htmlw));
nautilus_view_client_request_progress_change(bi->vc, &pri);
nautilus_view_frame_request_progress_change(bi->view_frame, &pri);
}
static void
......@@ -372,7 +372,7 @@ browser_goto_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi)
memset(&nri, 0, sizeof(nri));
nri.requested_uri = real_url;
nautilus_view_client_request_location_change(bi->vc, &nri);
nautilus_view_frame_request_location_change(bi->view_frame, &nri);
browser_goto_url_real(htmlw, real_url, bi);
g_free(real_url);
}
......@@ -395,7 +395,7 @@ browser_select_url(GtkWidget *htmlw, const char *url, BrowserInfo *bi)
si.selected_uris._length = 0;
}
nautilus_view_client_request_selection_change(bi->vc, &si);
nautilus_view_frame_request_selection_change(bi->view_frame, &si);
g_free(real_url);
bi->prevsel = url?1:0;
}
......@@ -431,7 +431,7 @@ browser_submit(GtkWidget *htmlw, const char *method, const char *url, const char
}
static void
browser_notify_location_change(NautilusViewClient *vc, Nautilus_NavigationInfo *ni, BrowserInfo *bi)
browser_notify_location_change(NautilusViewFrame *view_frame, Nautilus_NavigationInfo *ni, BrowserInfo *bi)
{
if(ni->self_originated)
return;
......@@ -459,10 +459,10 @@ make_obj(GnomeGenericFactory *Factory, const char *goad_id, void *closure)
return NULL;
bi = g_new0(BrowserInfo, 1);
bi->vc = NAUTILUS_VIEW_CLIENT(gtk_widget_new(nautilus_content_view_client_get_type(), NULL));
gtk_signal_connect(GTK_OBJECT(bi->vc), "notify_location_change", browser_notify_location_change,
bi->view_frame = NAUTILUS_VIEW_FRAME(gtk_widget_new(nautilus_content_view_frame_get_type(), NULL));
gtk_signal_connect(GTK_OBJECT(bi->view_frame), "notify_location_change", browser_notify_location_change,
bi);
gtk_signal_connect(GTK_OBJECT(bi->vc), "destroy", browser_do_destroy, NULL);
gtk_signal_connect(GTK_OBJECT(bi->view_frame), "destroy", browser_do_destroy, NULL);
object_count++;
bi->htmlw = gtk_html_new();
......@@ -477,14 +477,14 @@ make_obj(GnomeGenericFactory *Factory, const char *goad_id, void *closure)
wtmp = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(wtmp), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add(GTK_CONTAINER(bi->vc), wtmp);
gtk_container_add(GTK_CONTAINER(bi->view_frame), wtmp);
gtk_container_add(GTK_CONTAINER(wtmp), bi->htmlw);
gtk_widget_show(bi->htmlw);
gtk_widget_show(wtmp);
gtk_widget_show(GTK_WIDGET(bi->vc));
gtk_widget_show(GTK_WIDGET(bi->view_frame));
return nautilus_view_client_get_gnome_object(bi->vc);
return nautilus_view_frame_get_gnome_object(bi->view_frame);
}
int main(int argc, char *argv[])
......
......@@ -34,7 +34,7 @@ typedef struct {
} EngineInfo;
typedef struct {
NautilusViewClient *view;
NautilusViewFrame *view;
GtkCList *clist;
......@@ -51,7 +51,7 @@ typedef struct {
static int object_count = 0;
static void
web_search_notify_location_change (NautilusViewClient *view,
web_search_notify_location_change (NautilusViewFrame *view,
Nautilus_NavigationInfo *loci,
WebSearchView *hview)
{
......@@ -91,7 +91,7 @@ do_search(GtkWidget *widget, WebSearchView *hview)
nri.new_window_suggested = Nautilus_V_FALSE;
nri.new_window_enforced = Nautilus_V_UNKNOWN;
nautilus_view_client_request_location_change(hview->view, &nri);
nautilus_view_frame_request_location_change(hview->view, &nri);
}
static void
......@@ -163,23 +163,23 @@ web_search_populate_engines(WebSearchView *hview)
static GnomeObject *
make_obj(GnomeGenericFactory *Factory, const char *goad_id, gpointer closure)
{
GtkWidget *client, *vbox;
GtkWidget *frame, *vbox;
GnomeObject *ctl;
WebSearchView *hview;
g_return_val_if_fail(!strcmp(goad_id, "ntl_websearch_view"), NULL);
hview = g_new0(WebSearchView, 1);
client = gtk_widget_new(nautilus_meta_view_client_get_type(), NULL);
gtk_signal_connect(GTK_OBJECT(client), "destroy", do_destroy, NULL);
frame = gtk_widget_new(nautilus_meta_view_frame_get_type(), NULL);
gtk_signal_connect(GTK_OBJECT(frame), "destroy", do_destroy, NULL);
object_count++;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(client));
ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(frame));
vbox = gtk_vbox_new(FALSE, GNOME_PAD);
gtk_container_add(GTK_CONTAINER(client), vbox);
gtk_container_add(GTK_CONTAINER(frame), vbox);
hview->btn_search = gnome_pixmap_button(gnome_stock_pixmap_widget(client, GNOME_STOCK_PIXMAP_SEARCH), _("Search"));
hview->btn_search = gnome_pixmap_button(gnome_stock_pixmap_widget(frame, GNOME_STOCK_PIXMAP_SEARCH), _("Search"));
gnome_button_can_default(GTK_BUTTON(hview->btn_search), TRUE);
gtk_signal_connect(GTK_OBJECT(hview->btn_search), "clicked", do_search, hview);
gtk_box_pack_start(GTK_BOX(vbox), hview->btn_search, FALSE, FALSE, GNOME_PAD);
......@@ -212,16 +212,16 @@ make_obj(GnomeGenericFactory *Factory, const char *goad_id, gpointer closure)
gtk_signal_connect(GTK_OBJECT(clist), "select_row", web_search_select_row, hview);
#endif
gtk_widget_show_all(client);
gtk_widget_show_all(frame);
/* handle events */
gtk_signal_connect(GTK_OBJECT(client), "notify_location_change", web_search_notify_location_change, hview);
gtk_signal_connect(GTK_OBJECT(frame), "notify_location_change", web_search_notify_location_change, hview);
/* set description */
nautilus_meta_view_client_set_label(NAUTILUS_META_VIEW_CLIENT(client),
_("WebSearch"));
nautilus_meta_view_frame_set_label(NAUTILUS_META_VIEW_FRAME(frame),
_("WebSearch"));
hview->view = (NautilusViewClient *)client;
hview->view = (NautilusViewFrame *)frame;
hview->clist = NULL;
return ctl;
......
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
/*
* libnautilus: A library for nautilus clients.
* libnautilus: A library for nautilus view implementations.
*
* Copyright (C) 1999, 2000 Red Hat, Inc.
*
......@@ -22,14 +22,17 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-content-view-client.c: Implementation for object that represents a nautilus content view implementation. */
/* ntl-content-view-client.c: Implementation for object that
represents the frame a nautilus content view plugs into. */
#include "libnautilus.h"
typedef struct {
POA_Nautilus_View servant;
gpointer gnome_object;
NautilusContentViewClient *view;
NautilusContentViewFrame *view;
} impl_POA_Nautilus_ContentView;
extern POA_Nautilus_View__epv libnautilus_Nautilus_View_epv;
......@@ -48,55 +51,55 @@ static POA_Nautilus_ContentView__vepv impl_Nautilus_ContentView_vepv =
&impl_Nautilus_ContentView_epv
};
static void nautilus_content_view_client_init (NautilusContentViewClient *view);
static void nautilus_content_view_client_destroy (NautilusContentViewClient *view);
static void nautilus_content_view_client_class_init (NautilusContentViewClientClass *klass);
static void nautilus_content_view_frame_init (NautilusContentViewFrame *view);
static void nautilus_content_view_frame_destroy (NautilusContentViewFrame *view);
static void nautilus_content_view_frame_class_init (NautilusContentViewFrameClass *klass);
GtkType
nautilus_content_view_client_get_type (void)
nautilus_content_view_frame_get_type (void)
{
static GtkType view_client_type = 0;
static GtkType view_frame_type = 0;
if (!view_client_type)
if (!view_frame_type)
{
const GtkTypeInfo view_client_info =
const GtkTypeInfo view_frame_info =
{
"NautilusContentViewClient",
sizeof (NautilusContentViewClient),
sizeof (NautilusContentViewClientClass),
(GtkClassInitFunc) nautilus_content_view_client_class_init,
(GtkObjectInitFunc) nautilus_content_view_client_init,
"NautilusContentViewFrame",
sizeof (NautilusContentViewFrame),
sizeof (NautilusContentViewFrameClass),
(GtkClassInitFunc) nautilus_content_view_frame_class_init,
(GtkObjectInitFunc) nautilus_content_view_frame_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
view_client_type = gtk_type_unique (nautilus_view_client_get_type(), &view_client_info);
view_frame_type = gtk_type_unique (nautilus_view_frame_get_type(), &view_frame_info);
}
return view_client_type;
return view_frame_type;
}
static void
nautilus_content_view_client_init (NautilusContentViewClient *view)
nautilus_content_view_frame_init (NautilusContentViewFrame *view)
{
}
static void
nautilus_content_view_client_destroy (NautilusContentViewClient *view)
nautilus_content_view_frame_destroy (NautilusContentViewFrame *view)
{
NautilusViewClientClass *klass = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
if(((GtkObjectClass *)klass->parent_class)->destroy)
((GtkObjectClass *)klass->parent_class)->destroy((GtkObject *)view);
}
static void
nautilus_content_view_client_class_init (NautilusContentViewClientClass *klass)
nautilus_content_view_frame_class_init (NautilusContentViewFrameClass *klass)
{
NautilusViewClientClass *view_class = ((NautilusViewClientClass *)klass);
NautilusViewFrameClass *view_class = ((NautilusViewFrameClass *)klass);
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_content_view_client_destroy;
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_content_view_frame_destroy;
view_class->servant_init_func = POA_Nautilus_ContentView__init;
view_class->servant_destroy_func = POA_Nautilus_ContentView__fini;
......
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
/*
* libnautilus: A library for nautilus clients.
* libnautilus: A library for nautilus view implementations.
*
* Copyright (C) 1999, 2000 Red Hat, Inc.
*
......@@ -22,30 +22,32 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-content-view-client.h: Interface for object that represents a nautilus content view implementation. */
#ifndef NTL_CONTENT_VIEW_CLIENT_H
#define NTL_CONTENT_VIEW_CLIENT_H
/* ntl-content-view-client.h: Interface for object that represents a
the frame a nautilus content view plugs into. */
#ifndef NTL_CONTENT_VIEW_FRAME_H
#define NTL_CONTENT_VIEW_FRAME_H
#include <libnautilus/ntl-view-client.h>
#define NAUTILUS_TYPE_CONTENT_VIEW_CLIENT (nautilus_content_view_client_get_type ())
#define NAUTILUS_CONTENT_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CONTENT_VIEW_CLIENT, NautilusContentViewClient))
#define NAUTILUS_CONTENT_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CONTENT_VIEW_CLIENT, NautilusContentViewClientClass))
#define NAUTILUS_IS_CONTENT_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW_CLIENT))
#define NAUTILUS_IS_CONTENT_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW_CLIENT))
#define NAUTILUS_TYPE_CONTENT_VIEW_FRAME (nautilus_content_view_frame_get_type ())
#define NAUTILUS_CONTENT_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_CONTENT_VIEW_FRAME, NautilusContentViewFrame))
#define NAUTILUS_CONTENT_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_CONTENT_VIEW_FRAME, NautilusContentViewFrameClass))
#define NAUTILUS_IS_CONTENT_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW_FRAME))
#define NAUTILUS_IS_CONTENT_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_CONTENT_VIEW_FRAME))
typedef struct _NautilusContentViewClient NautilusContentViewClient;
typedef struct _NautilusContentViewClientClass NautilusContentViewClientClass;
typedef struct _NautilusContentViewFrame NautilusContentViewFrame;
typedef struct _NautilusContentViewFrameClass NautilusContentViewFrameClass;
struct _NautilusContentViewClientClass {
NautilusViewClientClass parent_spot;
struct _NautilusContentViewFrameClass {
NautilusViewFrameClass parent_spot;
};
struct _NautilusContentViewClient {
NautilusViewClient parent;
struct _NautilusContentViewFrame {
NautilusViewFrame parent;
};
GtkType nautilus_content_view_client_get_type (void);
GtkType nautilus_content_view_frame_get_type (void);
#endif
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
/*
* libnautilus: A library for nautilus clients.
* libnautilus: A library for nautilus view implementations.
*
* Copyright (C) 1999, 2000 Red Hat, Inc.
*
......@@ -22,14 +22,15 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-meta-view-client.c: Implementation for object that represents a nautilus meta view implementation. */
/* ntl-meta-view-client.c: Implementation for object that represents a
nautilus meta view implementation. */
#include "libnautilus.h"
typedef struct {
POA_Nautilus_View servant;
gpointer gnome_object;
NautilusMetaViewClient *view;
NautilusMetaViewFrame *view;
} impl_POA_Nautilus_MetaView;
extern POA_Nautilus_View__epv libnautilus_Nautilus_View_epv;
......@@ -48,55 +49,55 @@ static POA_Nautilus_MetaView__vepv impl_Nautilus_MetaView_vepv =
&impl_Nautilus_MetaView_epv
};
static void nautilus_meta_view_client_init (NautilusMetaViewClient *view);
static void nautilus_meta_view_client_destroy (NautilusMetaViewClient *view);
static void nautilus_meta_view_client_class_init (NautilusMetaViewClientClass *klass);
static void nautilus_meta_view_frame_init (NautilusMetaViewFrame *view);
static void nautilus_meta_view_frame_destroy (NautilusMetaViewFrame *view);
static void nautilus_meta_view_frame_class_init (NautilusMetaViewFrameClass *klass);
GtkType