gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-09-12 20:41:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename NautilusViewClient to NautilusViewFrame, NautilusContentViewClient

Browse source 
* 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.
This commit is contained in:
Maciej Stachowiak 2000-01-10 08:37:41 +00:00
parent 1cfc709b61
commit 78106a7394
42 changed files with 1097 additions and 1021 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ChangeLog-20000414
View file

@ -1,8 +1,25 @@
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>

18
components/help/hyperbola-nav-tree.c
View file

@ -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--;
}

26
components/history/nautilus-history-view.c
View file

@ -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

26
components/history/ntl-history-view.c
View file

@ -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

24
components/html/ntl-web-browser.c
View file

@ -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[])

28
components/websearch/ntl-web-search.c
View file

@ -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;

49
libnautilus-extensions/ntl-content-view-client.c
View file

@ -1,7 +1,7 @@
/* -*- 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;

34
libnautilus-extensions/ntl-content-view-client.h
View file

@ -1,7 +1,7 @@
/* -*- 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

51
libnautilus-extensions/ntl-meta-view-client.c
View file

@ -1,7 +1,7 @@
/* -*- 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
nautilus_meta_view_client_get_type (void)
nautilus_meta_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 =
{
"NautilusMetaViewClient",
sizeof (NautilusMetaViewClient),
sizeof (NautilusMetaViewClientClass),
(GtkClassInitFunc) nautilus_meta_view_client_class_init,
(GtkObjectInitFunc) nautilus_meta_view_client_init,
"NautilusMetaViewFrame",
sizeof (NautilusMetaViewFrame),
sizeof (NautilusMetaViewFrameClass),
(GtkClassInitFunc) nautilus_meta_view_frame_class_init,
(GtkObjectInitFunc) nautilus_meta_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_meta_view_client_init (NautilusMetaViewClient *view)
nautilus_meta_view_frame_init (NautilusMetaViewFrame *view)
{
}
static void
nautilus_meta_view_client_destroy (NautilusMetaViewClient *view)
nautilus_meta_view_frame_destroy (NautilusMetaViewFrame *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_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
nautilus_meta_view_frame_class_init (NautilusMetaViewFrameClass *klass)
{
NautilusViewClientClass *view_class = ((NautilusViewClientClass *)klass);
NautilusViewFrameClass *view_class = ((NautilusViewFrameClass *)klass);
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_client_destroy;
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_frame_destroy;
view_class->servant_init_func = POA_Nautilus_MetaView__init;
view_class->servant_destroy_func = POA_Nautilus_MetaView__fini;
@ -104,12 +105,12 @@ nautilus_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
}
void
nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc, const char *label)
nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc, const char *label)
{
GnomeObject *ctl;
GnomePropertyBag *bag;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(mvc));
bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
if(!bag)
{

35
libnautilus-extensions/ntl-meta-view-client.h
View file

@ -1,7 +1,7 @@
/* -*- 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,32 +22,33 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-meta-view-client.h: Interface for object that represents a nautilus meta view implementation. */
/* ntl-meta-view-client.h: Interface for object that represents the
frame a nautilus meta view plugs into. */
#ifndef NTL_META_VIEW_CLIENT_H
#define NTL_META_VIEW_CLIENT_H
#ifndef NTL_META_VIEW_FRAME_H
#define NTL_META_VIEW_FRAME_H
#include <libnautilus/ntl-view-client.h>
#define NAUTILUS_TYPE_META_VIEW_CLIENT (nautilus_meta_view_client_get_type ())
#define NAUTILUS_META_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClient))
#define NAUTILUS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClientClass))
#define NAUTILUS_IS_META_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_IS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_TYPE_META_VIEW_FRAME (nautilus_meta_view_frame_get_type ())
#define NAUTILUS_META_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrame))
#define NAUTILUS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrameClass))
#define NAUTILUS_IS_META_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
#define NAUTILUS_IS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
typedef struct _NautilusMetaViewClient NautilusMetaViewClient;
typedef struct _NautilusMetaViewClientClass NautilusMetaViewClientClass;
typedef struct _NautilusMetaViewFrame NautilusMetaViewFrame;
typedef struct _NautilusMetaViewFrameClass NautilusMetaViewFrameClass;
struct _NautilusMetaViewClientClass {
NautilusViewClientClass parent_spot;
struct _NautilusMetaViewFrameClass {
NautilusViewFrameClass parent_spot;
};
struct _NautilusMetaViewClient {
NautilusViewClient parent;
struct _NautilusMetaViewFrame {
NautilusViewFrame parent;
};
GtkType nautilus_meta_view_client_get_type (void);
void nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc,
GtkType nautilus_meta_view_frame_get_type (void);
void nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc,
const char *label);
#endif

126
libnautilus-extensions/ntl-view-client.c
View file

@ -1,7 +1,7 @@
/* -*- 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,7 +22,9 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.c: Implementation for object that represents a nautilus view implementation. */
/* ntl-view-client.c: Implementation for object that represents a
nautilus view implementation. */
#include <gtk/gtk.h>
#include "libnautilus.h"
@ -31,7 +33,7 @@ typedef struct {
POA_Nautilus_View servant;
gpointer gnome_object;
NautilusViewClient *view;
NautilusViewFrame *view;
} impl_POA_Nautilus_View;
static void
@ -138,7 +140,7 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
CORBA_exception_init(&ev);
servant_destroy_func = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
servant_destroy_func = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
objid = PortableServer_POA_servant_to_id(bonobo_poa(), servant, &ev);
PortableServer_POA_deactivate_object(bonobo_poa(), objid, &ev);
CORBA_free(objid);
@ -150,12 +152,12 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
}
static GnomeObject *
impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev)
{
GnomeObject *retval;
impl_POA_Nautilus_View *newservant;
void (*servant_init_func)(PortableServer_Servant servant, CORBA_Environment *ev);
NautilusViewClientClass *view_class = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
servant_init_func = view_class->servant_init_func;
newservant = g_new0(impl_POA_Nautilus_View, 1);
@ -173,43 +175,43 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
return retval;
}
static void nautilus_view_client_init (NautilusViewClient *view);
static void nautilus_view_client_destroy (NautilusViewClient *view);
static void nautilus_view_client_class_init (NautilusViewClientClass *klass);
static void nautilus_view_client_set_arg (GtkObject *object,
static void nautilus_view_frame_init (NautilusViewFrame *view);
static void nautilus_view_frame_destroy (NautilusViewFrame *view);
static void nautilus_view_frame_class_init (NautilusViewFrameClass *klass);
static void nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_get_arg (GtkObject *object,
static void nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_size_request (GtkWidget *widget,
static void nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void nautilus_view_client_size_allocate (GtkWidget *widget,
static void nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
GtkType
nautilus_view_client_get_type (void)
nautilus_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 =
{
"NautilusViewClient",
sizeof (NautilusViewClient),
sizeof (NautilusViewClientClass),
(GtkClassInitFunc) nautilus_view_client_class_init,
(GtkObjectInitFunc) nautilus_view_client_init,
"NautilusViewFrame",
sizeof (NautilusViewFrame),
sizeof (NautilusViewFrameClass),
(GtkClassInitFunc) nautilus_view_frame_class_init,
(GtkObjectInitFunc) nautilus_view_frame_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
view_client_type = gtk_type_unique (gtk_bin_get_type(), &view_client_info);
view_frame_type = gtk_type_unique (gtk_bin_get_type(), &view_frame_info);
}
return view_client_type;
return view_frame_type;
}
#if 0
@ -235,20 +237,20 @@ gtk_marshal_NONE__BOXED_OBJECT_BOXED (GtkObject * object,
#endif
static void
nautilus_view_client_class_init (NautilusViewClientClass *klass)
nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
int i;
object_class = (GtkObjectClass*) klass;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_client_destroy;
object_class->set_arg = nautilus_view_client_set_arg;
object_class->get_arg = nautilus_view_client_get_arg;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_frame_destroy;
object_class->set_arg = nautilus_view_frame_set_arg;
object_class->get_arg = nautilus_view_frame_get_arg;
widget_class = (GtkWidgetClass*) klass;
widget_class->size_request = nautilus_view_client_size_request;
widget_class->size_allocate = nautilus_view_client_size_allocate;
widget_class->size_request = nautilus_view_frame_size_request;
widget_class->size_allocate = nautilus_view_frame_size_allocate;
klass->notify_location_change = NULL;
@ -258,61 +260,61 @@ nautilus_view_client_class_init (NautilusViewClientClass *klass)
klass->vepv = &impl_Nautilus_View_vepv;
i = 0;
klass->view_client_signals[i++] = gtk_signal_new("notify_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("load_state",
klass->view_frame_signals[i++] = gtk_signal_new("load_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, load_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("save_state",
klass->view_frame_signals[i++] = gtk_signal_new("save_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, save_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("show_properties",
klass->view_frame_signals[i++] = gtk_signal_new("show_properties",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, show_properties),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->view_client_signals[i++] = gtk_signal_new("notify_selection_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_selection_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("stop_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("stop_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, stop_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, klass->view_client_signals, i);
gtk_object_class_add_signals (object_class, klass->view_frame_signals, i);
}
static void
nautilus_view_client_set_arg (GtkObject *object,
nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_get_arg (GtkObject *object,
nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_init (NautilusViewClient *view)
nautilus_view_frame_init (NautilusViewFrame *view)
{
CORBA_Environment ev;
GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW);
@ -320,17 +322,17 @@ nautilus_view_client_init (NautilusViewClient *view)
view->control = GNOME_OBJECT(gnome_control_new(GTK_WIDGET(view)));
CORBA_exception_init(&ev);
view->view_client = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_client);
view->view_server = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_server);
CORBA_exception_free(&ev);
}
static void
nautilus_view_client_destroy (NautilusViewClient *view)
nautilus_view_frame_destroy (NautilusViewFrame *view)
{
NautilusViewClientClass *klass = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
gnome_object_destroy(view->view_client);
gnome_object_destroy(view->view_server);
gnome_object_destroy(view->control);
if(((GtkObjectClass *)klass->parent_class)->destroy)
@ -338,13 +340,13 @@ nautilus_view_client_destroy (NautilusViewClient *view)
}
void
nautilus_view_client_request_location_change(NautilusViewClient *view,
nautilus_view_frame_request_location_change(NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -366,13 +368,13 @@ nautilus_view_client_request_location_change(NautilusViewClient *view,
}
void
nautilus_view_client_request_selection_change (NautilusViewClient *view,
nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -394,13 +396,13 @@ nautilus_view_client_request_selection_change (NautilusViewClient *
}
void
nautilus_view_client_request_status_change (NautilusViewClient *view,
nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -422,13 +424,13 @@ nautilus_view_client_request_status_change (NautilusViewClient *view,
}
void
nautilus_view_client_request_progress_change(NautilusViewClient *view,
nautilus_view_frame_request_progress_change(NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -450,7 +452,7 @@ nautilus_view_client_request_progress_change(NautilusViewClient *view,
}
static void
nautilus_view_client_size_request (GtkWidget *widget,
nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkBin *bin;
@ -472,7 +474,7 @@ nautilus_view_client_size_request (GtkWidget *widget,
}
static void
nautilus_view_client_size_allocate (GtkWidget *widget,
nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkBin *bin;
@ -486,7 +488,7 @@ nautilus_view_client_size_allocate (GtkWidget *widget,
}
GnomeObject *
nautilus_view_client_get_gnome_object (NautilusViewClient *view)
nautilus_view_frame_get_gnome_object (NautilusViewFrame *view)
{
return view->control;
}

56
libnautilus-extensions/ntl-view-client.h
View file

@ -1,7 +1,7 @@
/* -*- 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,10 +22,12 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.h: Interface for object that represents a nautilus client. */
#ifndef NTL_VIEW_CLIENT_H
#define NTL_VIEW_CLIENT_H
/* ntl-view-client.h: Interface of the object representing the frame a
data view plugs into. */
#ifndef NTL_VIEW_FRAME_H
#define NTL_VIEW_FRAME_H
#include <gtk/gtk.h>
@ -33,55 +35,55 @@
extern "C" {
#endif /* __cplusplus */
#define NAUTILUS_TYPE_VIEW_CLIENT (nautilus_view_client_get_type ())
#define NAUTILUS_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClient))
#define NAUTILUS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClientClass))
#define NAUTILUS_IS_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_IS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ())
#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame))
#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass))
#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
typedef struct _NautilusViewClient NautilusViewClient;
typedef struct _NautilusViewClientClass NautilusViewClientClass;
typedef struct _NautilusViewFrame NautilusViewFrame;
typedef struct _NautilusViewFrameClass NautilusViewFrameClass;
struct _NautilusViewClientClass
struct _NautilusViewFrameClass
{
GtkBinClass parent_spot;
void (*notify_location_change) (NautilusViewClient *view,
void (*notify_location_change) (NautilusViewFrame *view,
Nautilus_NavigationInfo *nav_context);
void (*notify_selection_change) (NautilusViewClient *view,
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*load_state) (NautilusViewClient *view, const char *config_path);
void (*save_state) (NautilusViewClient *view, const char *config_path);
void (*show_properties) (NautilusViewClient *view);
void (*stop_location_change) (NautilusViewClient *view);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*show_properties) (NautilusViewFrame *view);
void (*stop_location_change) (NautilusViewFrame *view);
GtkBinClass *parent_class;
gpointer servant_init_func, servant_destroy_func, vepv;
guint view_client_signals[5];
guint view_frame_signals[5];
};
struct _NautilusViewClient
struct _NautilusViewFrame
{
GtkBin parent;
GtkWidget *main_window;
GnomeObject *control, *view_client;
GnomeObject *control, *view_server;
Nautilus_ViewFrame view_frame;
};
GtkType nautilus_view_client_get_type (void);
void nautilus_view_client_request_location_change (NautilusViewClient *view,
GtkType nautilus_view_frame_get_type (void);
void nautilus_view_frame_request_location_change (NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc);
void nautilus_view_client_request_selection_change (NautilusViewClient *view,
void nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc);
void nautilus_view_client_request_status_change (NautilusViewClient *view,
void nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc);
void nautilus_view_client_request_progress_change (NautilusViewClient *view,
void nautilus_view_frame_request_progress_change (NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc);
GnomeObject *nautilus_view_client_get_gnome_object (NautilusViewClient *view);
GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view);
#ifdef __cplusplus
}

49
libnautilus-private/ntl-content-view-client.c
View file

@ -1,7 +1,7 @@
/* -*- 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;

34
libnautilus-private/ntl-content-view-client.h
View file

@ -1,7 +1,7 @@
/* -*- 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

51
libnautilus-private/ntl-meta-view-client.c
View file

@ -1,7 +1,7 @@
/* -*- 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
nautilus_meta_view_client_get_type (void)
nautilus_meta_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 =
{
"NautilusMetaViewClient",
sizeof (NautilusMetaViewClient),
sizeof (NautilusMetaViewClientClass),
(GtkClassInitFunc) nautilus_meta_view_client_class_init,
(GtkObjectInitFunc) nautilus_meta_view_client_init,
"NautilusMetaViewFrame",
sizeof (NautilusMetaViewFrame),
sizeof (NautilusMetaViewFrameClass),
(GtkClassInitFunc) nautilus_meta_view_frame_class_init,
(GtkObjectInitFunc) nautilus_meta_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_meta_view_client_init (NautilusMetaViewClient *view)
nautilus_meta_view_frame_init (NautilusMetaViewFrame *view)
{
}
static void
nautilus_meta_view_client_destroy (NautilusMetaViewClient *view)
nautilus_meta_view_frame_destroy (NautilusMetaViewFrame *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_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
nautilus_meta_view_frame_class_init (NautilusMetaViewFrameClass *klass)
{
NautilusViewClientClass *view_class = ((NautilusViewClientClass *)klass);
NautilusViewFrameClass *view_class = ((NautilusViewFrameClass *)klass);
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_client_destroy;
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_frame_destroy;
view_class->servant_init_func = POA_Nautilus_MetaView__init;
view_class->servant_destroy_func = POA_Nautilus_MetaView__fini;
@ -104,12 +105,12 @@ nautilus_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
}
void
nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc, const char *label)
nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc, const char *label)
{
GnomeObject *ctl;
GnomePropertyBag *bag;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(mvc));
bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
if(!bag)
{

35
libnautilus-private/ntl-meta-view-client.h
View file

@ -1,7 +1,7 @@
/* -*- 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,32 +22,33 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-meta-view-client.h: Interface for object that represents a nautilus meta view implementation. */
/* ntl-meta-view-client.h: Interface for object that represents the
frame a nautilus meta view plugs into. */
#ifndef NTL_META_VIEW_CLIENT_H
#define NTL_META_VIEW_CLIENT_H
#ifndef NTL_META_VIEW_FRAME_H
#define NTL_META_VIEW_FRAME_H
#include <libnautilus/ntl-view-client.h>
#define NAUTILUS_TYPE_META_VIEW_CLIENT (nautilus_meta_view_client_get_type ())
#define NAUTILUS_META_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClient))
#define NAUTILUS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClientClass))
#define NAUTILUS_IS_META_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_IS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_TYPE_META_VIEW_FRAME (nautilus_meta_view_frame_get_type ())
#define NAUTILUS_META_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrame))
#define NAUTILUS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrameClass))
#define NAUTILUS_IS_META_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
#define NAUTILUS_IS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
typedef struct _NautilusMetaViewClient NautilusMetaViewClient;
typedef struct _NautilusMetaViewClientClass NautilusMetaViewClientClass;
typedef struct _NautilusMetaViewFrame NautilusMetaViewFrame;
typedef struct _NautilusMetaViewFrameClass NautilusMetaViewFrameClass;
struct _NautilusMetaViewClientClass {
NautilusViewClientClass parent_spot;
struct _NautilusMetaViewFrameClass {
NautilusViewFrameClass parent_spot;
};
struct _NautilusMetaViewClient {
NautilusViewClient parent;
struct _NautilusMetaViewFrame {
NautilusViewFrame parent;
};
GtkType nautilus_meta_view_client_get_type (void);
void nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc,
GtkType nautilus_meta_view_frame_get_type (void);
void nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc,
const char *label);
#endif

126
libnautilus-private/ntl-view-client.c
View file

@ -1,7 +1,7 @@
/* -*- 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,7 +22,9 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.c: Implementation for object that represents a nautilus view implementation. */
/* ntl-view-client.c: Implementation for object that represents a
nautilus view implementation. */
#include <gtk/gtk.h>
#include "libnautilus.h"
@ -31,7 +33,7 @@ typedef struct {
POA_Nautilus_View servant;
gpointer gnome_object;
NautilusViewClient *view;
NautilusViewFrame *view;
} impl_POA_Nautilus_View;
static void
@ -138,7 +140,7 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
CORBA_exception_init(&ev);
servant_destroy_func = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
servant_destroy_func = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
objid = PortableServer_POA_servant_to_id(bonobo_poa(), servant, &ev);
PortableServer_POA_deactivate_object(bonobo_poa(), objid, &ev);
CORBA_free(objid);
@ -150,12 +152,12 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
}
static GnomeObject *
impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev)
{
GnomeObject *retval;
impl_POA_Nautilus_View *newservant;
void (*servant_init_func)(PortableServer_Servant servant, CORBA_Environment *ev);
NautilusViewClientClass *view_class = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
servant_init_func = view_class->servant_init_func;
newservant = g_new0(impl_POA_Nautilus_View, 1);
@ -173,43 +175,43 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
return retval;
}
static void nautilus_view_client_init (NautilusViewClient *view);
static void nautilus_view_client_destroy (NautilusViewClient *view);
static void nautilus_view_client_class_init (NautilusViewClientClass *klass);
static void nautilus_view_client_set_arg (GtkObject *object,
static void nautilus_view_frame_init (NautilusViewFrame *view);
static void nautilus_view_frame_destroy (NautilusViewFrame *view);
static void nautilus_view_frame_class_init (NautilusViewFrameClass *klass);
static void nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_get_arg (GtkObject *object,
static void nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_size_request (GtkWidget *widget,
static void nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void nautilus_view_client_size_allocate (GtkWidget *widget,
static void nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
GtkType
nautilus_view_client_get_type (void)
nautilus_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 =
{
"NautilusViewClient",
sizeof (NautilusViewClient),
sizeof (NautilusViewClientClass),
(GtkClassInitFunc) nautilus_view_client_class_init,
(GtkObjectInitFunc) nautilus_view_client_init,
"NautilusViewFrame",
sizeof (NautilusViewFrame),
sizeof (NautilusViewFrameClass),
(GtkClassInitFunc) nautilus_view_frame_class_init,
(GtkObjectInitFunc) nautilus_view_frame_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
view_client_type = gtk_type_unique (gtk_bin_get_type(), &view_client_info);
view_frame_type = gtk_type_unique (gtk_bin_get_type(), &view_frame_info);
}
return view_client_type;
return view_frame_type;
}
#if 0
@ -235,20 +237,20 @@ gtk_marshal_NONE__BOXED_OBJECT_BOXED (GtkObject * object,
#endif
static void
nautilus_view_client_class_init (NautilusViewClientClass *klass)
nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
int i;
object_class = (GtkObjectClass*) klass;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_client_destroy;
object_class->set_arg = nautilus_view_client_set_arg;
object_class->get_arg = nautilus_view_client_get_arg;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_frame_destroy;
object_class->set_arg = nautilus_view_frame_set_arg;
object_class->get_arg = nautilus_view_frame_get_arg;
widget_class = (GtkWidgetClass*) klass;
widget_class->size_request = nautilus_view_client_size_request;
widget_class->size_allocate = nautilus_view_client_size_allocate;
widget_class->size_request = nautilus_view_frame_size_request;
widget_class->size_allocate = nautilus_view_frame_size_allocate;
klass->notify_location_change = NULL;
@ -258,61 +260,61 @@ nautilus_view_client_class_init (NautilusViewClientClass *klass)
klass->vepv = &impl_Nautilus_View_vepv;
i = 0;
klass->view_client_signals[i++] = gtk_signal_new("notify_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("load_state",
klass->view_frame_signals[i++] = gtk_signal_new("load_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, load_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("save_state",
klass->view_frame_signals[i++] = gtk_signal_new("save_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, save_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("show_properties",
klass->view_frame_signals[i++] = gtk_signal_new("show_properties",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, show_properties),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->view_client_signals[i++] = gtk_signal_new("notify_selection_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_selection_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("stop_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("stop_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, stop_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, klass->view_client_signals, i);
gtk_object_class_add_signals (object_class, klass->view_frame_signals, i);
}
static void
nautilus_view_client_set_arg (GtkObject *object,
nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_get_arg (GtkObject *object,
nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_init (NautilusViewClient *view)
nautilus_view_frame_init (NautilusViewFrame *view)
{
CORBA_Environment ev;
GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW);
@ -320,17 +322,17 @@ nautilus_view_client_init (NautilusViewClient *view)
view->control = GNOME_OBJECT(gnome_control_new(GTK_WIDGET(view)));
CORBA_exception_init(&ev);
view->view_client = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_client);
view->view_server = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_server);
CORBA_exception_free(&ev);
}
static void
nautilus_view_client_destroy (NautilusViewClient *view)
nautilus_view_frame_destroy (NautilusViewFrame *view)
{
NautilusViewClientClass *klass = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
gnome_object_destroy(view->view_client);
gnome_object_destroy(view->view_server);
gnome_object_destroy(view->control);
if(((GtkObjectClass *)klass->parent_class)->destroy)
@ -338,13 +340,13 @@ nautilus_view_client_destroy (NautilusViewClient *view)
}
void
nautilus_view_client_request_location_change(NautilusViewClient *view,
nautilus_view_frame_request_location_change(NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -366,13 +368,13 @@ nautilus_view_client_request_location_change(NautilusViewClient *view,
}
void
nautilus_view_client_request_selection_change (NautilusViewClient *view,
nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -394,13 +396,13 @@ nautilus_view_client_request_selection_change (NautilusViewClient *
}
void
nautilus_view_client_request_status_change (NautilusViewClient *view,
nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -422,13 +424,13 @@ nautilus_view_client_request_status_change (NautilusViewClient *view,
}
void
nautilus_view_client_request_progress_change(NautilusViewClient *view,
nautilus_view_frame_request_progress_change(NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -450,7 +452,7 @@ nautilus_view_client_request_progress_change(NautilusViewClient *view,
}
static void
nautilus_view_client_size_request (GtkWidget *widget,
nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkBin *bin;
@ -472,7 +474,7 @@ nautilus_view_client_size_request (GtkWidget *widget,
}
static void
nautilus_view_client_size_allocate (GtkWidget *widget,
nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkBin *bin;
@ -486,7 +488,7 @@ nautilus_view_client_size_allocate (GtkWidget *widget,
}
GnomeObject *
nautilus_view_client_get_gnome_object (NautilusViewClient *view)
nautilus_view_frame_get_gnome_object (NautilusViewFrame *view)
{
return view->control;
}

56
libnautilus-private/ntl-view-client.h
View file

@ -1,7 +1,7 @@
/* -*- 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,10 +22,12 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.h: Interface for object that represents a nautilus client. */
#ifndef NTL_VIEW_CLIENT_H
#define NTL_VIEW_CLIENT_H
/* ntl-view-client.h: Interface of the object representing the frame a
data view plugs into. */
#ifndef NTL_VIEW_FRAME_H
#define NTL_VIEW_FRAME_H
#include <gtk/gtk.h>
@ -33,55 +35,55 @@
extern "C" {
#endif /* __cplusplus */
#define NAUTILUS_TYPE_VIEW_CLIENT (nautilus_view_client_get_type ())
#define NAUTILUS_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClient))
#define NAUTILUS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClientClass))
#define NAUTILUS_IS_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_IS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ())
#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame))
#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass))
#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
typedef struct _NautilusViewClient NautilusViewClient;
typedef struct _NautilusViewClientClass NautilusViewClientClass;
typedef struct _NautilusViewFrame NautilusViewFrame;
typedef struct _NautilusViewFrameClass NautilusViewFrameClass;
struct _NautilusViewClientClass
struct _NautilusViewFrameClass
{
GtkBinClass parent_spot;
void (*notify_location_change) (NautilusViewClient *view,
void (*notify_location_change) (NautilusViewFrame *view,
Nautilus_NavigationInfo *nav_context);
void (*notify_selection_change) (NautilusViewClient *view,
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*load_state) (NautilusViewClient *view, const char *config_path);
void (*save_state) (NautilusViewClient *view, const char *config_path);
void (*show_properties) (NautilusViewClient *view);
void (*stop_location_change) (NautilusViewClient *view);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*show_properties) (NautilusViewFrame *view);
void (*stop_location_change) (NautilusViewFrame *view);
GtkBinClass *parent_class;
gpointer servant_init_func, servant_destroy_func, vepv;
guint view_client_signals[5];
guint view_frame_signals[5];
};
struct _NautilusViewClient
struct _NautilusViewFrame
{
GtkBin parent;
GtkWidget *main_window;
GnomeObject *control, *view_client;
GnomeObject *control, *view_server;
Nautilus_ViewFrame view_frame;
};
GtkType nautilus_view_client_get_type (void);
void nautilus_view_client_request_location_change (NautilusViewClient *view,
GtkType nautilus_view_frame_get_type (void);
void nautilus_view_frame_request_location_change (NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc);
void nautilus_view_client_request_selection_change (NautilusViewClient *view,
void nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc);
void nautilus_view_client_request_status_change (NautilusViewClient *view,
void nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc);
void nautilus_view_client_request_progress_change (NautilusViewClient *view,
void nautilus_view_frame_request_progress_change (NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc);
GnomeObject *nautilus_view_client_get_gnome_object (NautilusViewClient *view);
GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view);
#ifdef __cplusplus
}

49
libnautilus/nautilus-content-view-frame.c
View file

@ -1,7 +1,7 @@
/* -*- 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;

34
libnautilus/nautilus-content-view-frame.h
View file

@ -1,7 +1,7 @@
/* -*- 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

51
libnautilus/nautilus-meta-view-frame.c
View file

@ -1,7 +1,7 @@
/* -*- 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
nautilus_meta_view_client_get_type (void)
nautilus_meta_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 =
{
"NautilusMetaViewClient",
sizeof (NautilusMetaViewClient),
sizeof (NautilusMetaViewClientClass),
(GtkClassInitFunc) nautilus_meta_view_client_class_init,
(GtkObjectInitFunc) nautilus_meta_view_client_init,
"NautilusMetaViewFrame",
sizeof (NautilusMetaViewFrame),
sizeof (NautilusMetaViewFrameClass),
(GtkClassInitFunc) nautilus_meta_view_frame_class_init,
(GtkObjectInitFunc) nautilus_meta_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_meta_view_client_init (NautilusMetaViewClient *view)
nautilus_meta_view_frame_init (NautilusMetaViewFrame *view)
{
}
static void
nautilus_meta_view_client_destroy (NautilusMetaViewClient *view)
nautilus_meta_view_frame_destroy (NautilusMetaViewFrame *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_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
nautilus_meta_view_frame_class_init (NautilusMetaViewFrameClass *klass)
{
NautilusViewClientClass *view_class = ((NautilusViewClientClass *)klass);
NautilusViewFrameClass *view_class = ((NautilusViewFrameClass *)klass);
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_client_destroy;
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_frame_destroy;
view_class->servant_init_func = POA_Nautilus_MetaView__init;
view_class->servant_destroy_func = POA_Nautilus_MetaView__fini;
@ -104,12 +105,12 @@ nautilus_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
}
void
nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc, const char *label)
nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc, const char *label)
{
GnomeObject *ctl;
GnomePropertyBag *bag;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(mvc));
bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
if(!bag)
{

35
libnautilus/nautilus-meta-view-frame.h
View file

@ -1,7 +1,7 @@
/* -*- 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,32 +22,33 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-meta-view-client.h: Interface for object that represents a nautilus meta view implementation. */
/* ntl-meta-view-client.h: Interface for object that represents the
frame a nautilus meta view plugs into. */
#ifndef NTL_META_VIEW_CLIENT_H
#define NTL_META_VIEW_CLIENT_H
#ifndef NTL_META_VIEW_FRAME_H
#define NTL_META_VIEW_FRAME_H
#include <libnautilus/ntl-view-client.h>
#define NAUTILUS_TYPE_META_VIEW_CLIENT (nautilus_meta_view_client_get_type ())
#define NAUTILUS_META_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClient))
#define NAUTILUS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClientClass))
#define NAUTILUS_IS_META_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_IS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_TYPE_META_VIEW_FRAME (nautilus_meta_view_frame_get_type ())
#define NAUTILUS_META_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrame))
#define NAUTILUS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrameClass))
#define NAUTILUS_IS_META_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
#define NAUTILUS_IS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
typedef struct _NautilusMetaViewClient NautilusMetaViewClient;
typedef struct _NautilusMetaViewClientClass NautilusMetaViewClientClass;
typedef struct _NautilusMetaViewFrame NautilusMetaViewFrame;
typedef struct _NautilusMetaViewFrameClass NautilusMetaViewFrameClass;
struct _NautilusMetaViewClientClass {
NautilusViewClientClass parent_spot;
struct _NautilusMetaViewFrameClass {
NautilusViewFrameClass parent_spot;
};
struct _NautilusMetaViewClient {
NautilusViewClient parent;
struct _NautilusMetaViewFrame {
NautilusViewFrame parent;
};
GtkType nautilus_meta_view_client_get_type (void);
void nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc,
GtkType nautilus_meta_view_frame_get_type (void);
void nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc,
const char *label);
#endif

126
libnautilus/nautilus-view-frame.c
View file

@ -1,7 +1,7 @@
/* -*- 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,7 +22,9 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.c: Implementation for object that represents a nautilus view implementation. */
/* ntl-view-client.c: Implementation for object that represents a
nautilus view implementation. */
#include <gtk/gtk.h>
#include "libnautilus.h"
@ -31,7 +33,7 @@ typedef struct {
POA_Nautilus_View servant;
gpointer gnome_object;
NautilusViewClient *view;
NautilusViewFrame *view;
} impl_POA_Nautilus_View;
static void
@ -138,7 +140,7 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
CORBA_exception_init(&ev);
servant_destroy_func = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
servant_destroy_func = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
objid = PortableServer_POA_servant_to_id(bonobo_poa(), servant, &ev);
PortableServer_POA_deactivate_object(bonobo_poa(), objid, &ev);
CORBA_free(objid);
@ -150,12 +152,12 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
}
static GnomeObject *
impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev)
{
GnomeObject *retval;
impl_POA_Nautilus_View *newservant;
void (*servant_init_func)(PortableServer_Servant servant, CORBA_Environment *ev);
NautilusViewClientClass *view_class = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
servant_init_func = view_class->servant_init_func;
newservant = g_new0(impl_POA_Nautilus_View, 1);
@ -173,43 +175,43 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
return retval;
}
static void nautilus_view_client_init (NautilusViewClient *view);
static void nautilus_view_client_destroy (NautilusViewClient *view);
static void nautilus_view_client_class_init (NautilusViewClientClass *klass);
static void nautilus_view_client_set_arg (GtkObject *object,
static void nautilus_view_frame_init (NautilusViewFrame *view);
static void nautilus_view_frame_destroy (NautilusViewFrame *view);
static void nautilus_view_frame_class_init (NautilusViewFrameClass *klass);
static void nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_get_arg (GtkObject *object,
static void nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_size_request (GtkWidget *widget,
static void nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void nautilus_view_client_size_allocate (GtkWidget *widget,
static void nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
GtkType
nautilus_view_client_get_type (void)
nautilus_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 =
{
"NautilusViewClient",
sizeof (NautilusViewClient),
sizeof (NautilusViewClientClass),
(GtkClassInitFunc) nautilus_view_client_class_init,
(GtkObjectInitFunc) nautilus_view_client_init,
"NautilusViewFrame",
sizeof (NautilusViewFrame),
sizeof (NautilusViewFrameClass),
(GtkClassInitFunc) nautilus_view_frame_class_init,
(GtkObjectInitFunc) nautilus_view_frame_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
view_client_type = gtk_type_unique (gtk_bin_get_type(), &view_client_info);
view_frame_type = gtk_type_unique (gtk_bin_get_type(), &view_frame_info);
}
return view_client_type;
return view_frame_type;
}
#if 0
@ -235,20 +237,20 @@ gtk_marshal_NONE__BOXED_OBJECT_BOXED (GtkObject * object,
#endif
static void
nautilus_view_client_class_init (NautilusViewClientClass *klass)
nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
int i;
object_class = (GtkObjectClass*) klass;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_client_destroy;
object_class->set_arg = nautilus_view_client_set_arg;
object_class->get_arg = nautilus_view_client_get_arg;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_frame_destroy;
object_class->set_arg = nautilus_view_frame_set_arg;
object_class->get_arg = nautilus_view_frame_get_arg;
widget_class = (GtkWidgetClass*) klass;
widget_class->size_request = nautilus_view_client_size_request;
widget_class->size_allocate = nautilus_view_client_size_allocate;
widget_class->size_request = nautilus_view_frame_size_request;
widget_class->size_allocate = nautilus_view_frame_size_allocate;
klass->notify_location_change = NULL;
@ -258,61 +260,61 @@ nautilus_view_client_class_init (NautilusViewClientClass *klass)
klass->vepv = &impl_Nautilus_View_vepv;
i = 0;
klass->view_client_signals[i++] = gtk_signal_new("notify_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("load_state",
klass->view_frame_signals[i++] = gtk_signal_new("load_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, load_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("save_state",
klass->view_frame_signals[i++] = gtk_signal_new("save_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, save_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("show_properties",
klass->view_frame_signals[i++] = gtk_signal_new("show_properties",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, show_properties),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->view_client_signals[i++] = gtk_signal_new("notify_selection_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_selection_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("stop_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("stop_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, stop_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, klass->view_client_signals, i);
gtk_object_class_add_signals (object_class, klass->view_frame_signals, i);
}
static void
nautilus_view_client_set_arg (GtkObject *object,
nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_get_arg (GtkObject *object,
nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_init (NautilusViewClient *view)
nautilus_view_frame_init (NautilusViewFrame *view)
{
CORBA_Environment ev;
GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW);
@ -320,17 +322,17 @@ nautilus_view_client_init (NautilusViewClient *view)
view->control = GNOME_OBJECT(gnome_control_new(GTK_WIDGET(view)));
CORBA_exception_init(&ev);
view->view_client = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_client);
view->view_server = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_server);
CORBA_exception_free(&ev);
}
static void
nautilus_view_client_destroy (NautilusViewClient *view)
nautilus_view_frame_destroy (NautilusViewFrame *view)
{
NautilusViewClientClass *klass = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
gnome_object_destroy(view->view_client);
gnome_object_destroy(view->view_server);
gnome_object_destroy(view->control);
if(((GtkObjectClass *)klass->parent_class)->destroy)
@ -338,13 +340,13 @@ nautilus_view_client_destroy (NautilusViewClient *view)
}
void
nautilus_view_client_request_location_change(NautilusViewClient *view,
nautilus_view_frame_request_location_change(NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -366,13 +368,13 @@ nautilus_view_client_request_location_change(NautilusViewClient *view,
}
void
nautilus_view_client_request_selection_change (NautilusViewClient *view,
nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -394,13 +396,13 @@ nautilus_view_client_request_selection_change (NautilusViewClient *
}
void
nautilus_view_client_request_status_change (NautilusViewClient *view,
nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -422,13 +424,13 @@ nautilus_view_client_request_status_change (NautilusViewClient *view,
}
void
nautilus_view_client_request_progress_change(NautilusViewClient *view,
nautilus_view_frame_request_progress_change(NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -450,7 +452,7 @@ nautilus_view_client_request_progress_change(NautilusViewClient *view,
}
static void
nautilus_view_client_size_request (GtkWidget *widget,
nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkBin *bin;
@ -472,7 +474,7 @@ nautilus_view_client_size_request (GtkWidget *widget,
}
static void
nautilus_view_client_size_allocate (GtkWidget *widget,
nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkBin *bin;
@ -486,7 +488,7 @@ nautilus_view_client_size_allocate (GtkWidget *widget,
}
GnomeObject *
nautilus_view_client_get_gnome_object (NautilusViewClient *view)
nautilus_view_frame_get_gnome_object (NautilusViewFrame *view)
{
return view->control;
}

56
libnautilus/nautilus-view-frame.h
View file

@ -1,7 +1,7 @@
/* -*- 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,10 +22,12 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.h: Interface for object that represents a nautilus client. */
#ifndef NTL_VIEW_CLIENT_H
#define NTL_VIEW_CLIENT_H
/* ntl-view-client.h: Interface of the object representing the frame a
data view plugs into. */
#ifndef NTL_VIEW_FRAME_H
#define NTL_VIEW_FRAME_H
#include <gtk/gtk.h>
@ -33,55 +35,55 @@
extern "C" {
#endif /* __cplusplus */
#define NAUTILUS_TYPE_VIEW_CLIENT (nautilus_view_client_get_type ())
#define NAUTILUS_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClient))
#define NAUTILUS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClientClass))
#define NAUTILUS_IS_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_IS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ())
#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame))
#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass))
#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
typedef struct _NautilusViewClient NautilusViewClient;
typedef struct _NautilusViewClientClass NautilusViewClientClass;
typedef struct _NautilusViewFrame NautilusViewFrame;
typedef struct _NautilusViewFrameClass NautilusViewFrameClass;
struct _NautilusViewClientClass
struct _NautilusViewFrameClass
{
GtkBinClass parent_spot;
void (*notify_location_change) (NautilusViewClient *view,
void (*notify_location_change) (NautilusViewFrame *view,
Nautilus_NavigationInfo *nav_context);
void (*notify_selection_change) (NautilusViewClient *view,
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*load_state) (NautilusViewClient *view, const char *config_path);
void (*save_state) (NautilusViewClient *view, const char *config_path);
void (*show_properties) (NautilusViewClient *view);
void (*stop_location_change) (NautilusViewClient *view);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*show_properties) (NautilusViewFrame *view);
void (*stop_location_change) (NautilusViewFrame *view);
GtkBinClass *parent_class;
gpointer servant_init_func, servant_destroy_func, vepv;
guint view_client_signals[5];
guint view_frame_signals[5];
};
struct _NautilusViewClient
struct _NautilusViewFrame
{
GtkBin parent;
GtkWidget *main_window;
GnomeObject *control, *view_client;
GnomeObject *control, *view_server;
Nautilus_ViewFrame view_frame;
};
GtkType nautilus_view_client_get_type (void);
void nautilus_view_client_request_location_change (NautilusViewClient *view,
GtkType nautilus_view_frame_get_type (void);
void nautilus_view_frame_request_location_change (NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc);
void nautilus_view_client_request_selection_change (NautilusViewClient *view,
void nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc);
void nautilus_view_client_request_status_change (NautilusViewClient *view,
void nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc);
void nautilus_view_client_request_progress_change (NautilusViewClient *view,
void nautilus_view_frame_request_progress_change (NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc);
GnomeObject *nautilus_view_client_get_gnome_object (NautilusViewClient *view);
GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view);
#ifdef __cplusplus
}

126
libnautilus/nautilus-view.c
View file

@ -1,7 +1,7 @@
/* -*- 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,7 +22,9 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.c: Implementation for object that represents a nautilus view implementation. */
/* ntl-view-client.c: Implementation for object that represents a
nautilus view implementation. */
#include <gtk/gtk.h>
#include "libnautilus.h"
@ -31,7 +33,7 @@ typedef struct {
POA_Nautilus_View servant;
gpointer gnome_object;
NautilusViewClient *view;
NautilusViewFrame *view;
} impl_POA_Nautilus_View;
static void
@ -138,7 +140,7 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
CORBA_exception_init(&ev);
servant_destroy_func = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
servant_destroy_func = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
objid = PortableServer_POA_servant_to_id(bonobo_poa(), servant, &ev);
PortableServer_POA_deactivate_object(bonobo_poa(), objid, &ev);
CORBA_free(objid);
@ -150,12 +152,12 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
}
static GnomeObject *
impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev)
{
GnomeObject *retval;
impl_POA_Nautilus_View *newservant;
void (*servant_init_func)(PortableServer_Servant servant, CORBA_Environment *ev);
NautilusViewClientClass *view_class = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
servant_init_func = view_class->servant_init_func;
newservant = g_new0(impl_POA_Nautilus_View, 1);
@ -173,43 +175,43 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
return retval;
}
static void nautilus_view_client_init (NautilusViewClient *view);
static void nautilus_view_client_destroy (NautilusViewClient *view);
static void nautilus_view_client_class_init (NautilusViewClientClass *klass);
static void nautilus_view_client_set_arg (GtkObject *object,
static void nautilus_view_frame_init (NautilusViewFrame *view);
static void nautilus_view_frame_destroy (NautilusViewFrame *view);
static void nautilus_view_frame_class_init (NautilusViewFrameClass *klass);
static void nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_get_arg (GtkObject *object,
static void nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_size_request (GtkWidget *widget,
static void nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void nautilus_view_client_size_allocate (GtkWidget *widget,
static void nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
GtkType
nautilus_view_client_get_type (void)
nautilus_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 =
{
"NautilusViewClient",
sizeof (NautilusViewClient),
sizeof (NautilusViewClientClass),
(GtkClassInitFunc) nautilus_view_client_class_init,
(GtkObjectInitFunc) nautilus_view_client_init,
"NautilusViewFrame",
sizeof (NautilusViewFrame),
sizeof (NautilusViewFrameClass),
(GtkClassInitFunc) nautilus_view_frame_class_init,
(GtkObjectInitFunc) nautilus_view_frame_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
view_client_type = gtk_type_unique (gtk_bin_get_type(), &view_client_info);
view_frame_type = gtk_type_unique (gtk_bin_get_type(), &view_frame_info);
}
return view_client_type;
return view_frame_type;
}
#if 0
@ -235,20 +237,20 @@ gtk_marshal_NONE__BOXED_OBJECT_BOXED (GtkObject * object,
#endif
static void
nautilus_view_client_class_init (NautilusViewClientClass *klass)
nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
int i;
object_class = (GtkObjectClass*) klass;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_client_destroy;
object_class->set_arg = nautilus_view_client_set_arg;
object_class->get_arg = nautilus_view_client_get_arg;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_frame_destroy;
object_class->set_arg = nautilus_view_frame_set_arg;
object_class->get_arg = nautilus_view_frame_get_arg;
widget_class = (GtkWidgetClass*) klass;
widget_class->size_request = nautilus_view_client_size_request;
widget_class->size_allocate = nautilus_view_client_size_allocate;
widget_class->size_request = nautilus_view_frame_size_request;
widget_class->size_allocate = nautilus_view_frame_size_allocate;
klass->notify_location_change = NULL;
@ -258,61 +260,61 @@ nautilus_view_client_class_init (NautilusViewClientClass *klass)
klass->vepv = &impl_Nautilus_View_vepv;
i = 0;
klass->view_client_signals[i++] = gtk_signal_new("notify_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("load_state",
klass->view_frame_signals[i++] = gtk_signal_new("load_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, load_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("save_state",
klass->view_frame_signals[i++] = gtk_signal_new("save_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, save_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("show_properties",
klass->view_frame_signals[i++] = gtk_signal_new("show_properties",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, show_properties),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->view_client_signals[i++] = gtk_signal_new("notify_selection_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_selection_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("stop_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("stop_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, stop_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, klass->view_client_signals, i);
gtk_object_class_add_signals (object_class, klass->view_frame_signals, i);
}
static void
nautilus_view_client_set_arg (GtkObject *object,
nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_get_arg (GtkObject *object,
nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_init (NautilusViewClient *view)
nautilus_view_frame_init (NautilusViewFrame *view)
{
CORBA_Environment ev;
GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW);
@ -320,17 +322,17 @@ nautilus_view_client_init (NautilusViewClient *view)
view->control = GNOME_OBJECT(gnome_control_new(GTK_WIDGET(view)));
CORBA_exception_init(&ev);
view->view_client = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_client);
view->view_server = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_server);
CORBA_exception_free(&ev);
}
static void
nautilus_view_client_destroy (NautilusViewClient *view)
nautilus_view_frame_destroy (NautilusViewFrame *view)
{
NautilusViewClientClass *klass = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
gnome_object_destroy(view->view_client);
gnome_object_destroy(view->view_server);
gnome_object_destroy(view->control);
if(((GtkObjectClass *)klass->parent_class)->destroy)
@ -338,13 +340,13 @@ nautilus_view_client_destroy (NautilusViewClient *view)
}
void
nautilus_view_client_request_location_change(NautilusViewClient *view,
nautilus_view_frame_request_location_change(NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -366,13 +368,13 @@ nautilus_view_client_request_location_change(NautilusViewClient *view,
}
void
nautilus_view_client_request_selection_change (NautilusViewClient *view,
nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -394,13 +396,13 @@ nautilus_view_client_request_selection_change (NautilusViewClient *
}
void
nautilus_view_client_request_status_change (NautilusViewClient *view,
nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -422,13 +424,13 @@ nautilus_view_client_request_status_change (NautilusViewClient *view,
}
void
nautilus_view_client_request_progress_change(NautilusViewClient *view,
nautilus_view_frame_request_progress_change(NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -450,7 +452,7 @@ nautilus_view_client_request_progress_change(NautilusViewClient *view,
}
static void
nautilus_view_client_size_request (GtkWidget *widget,
nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkBin *bin;
@ -472,7 +474,7 @@ nautilus_view_client_size_request (GtkWidget *widget,
}
static void
nautilus_view_client_size_allocate (GtkWidget *widget,
nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkBin *bin;
@ -486,7 +488,7 @@ nautilus_view_client_size_allocate (GtkWidget *widget,
}
GnomeObject *
nautilus_view_client_get_gnome_object (NautilusViewClient *view)
nautilus_view_frame_get_gnome_object (NautilusViewFrame *view)
{
return view->control;
}

56
libnautilus/nautilus-view.h
View file

@ -1,7 +1,7 @@
/* -*- 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,10 +22,12 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.h: Interface for object that represents a nautilus client. */
#ifndef NTL_VIEW_CLIENT_H
#define NTL_VIEW_CLIENT_H
/* ntl-view-client.h: Interface of the object representing the frame a
data view plugs into. */
#ifndef NTL_VIEW_FRAME_H
#define NTL_VIEW_FRAME_H
#include <gtk/gtk.h>
@ -33,55 +35,55 @@
extern "C" {
#endif /* __cplusplus */
#define NAUTILUS_TYPE_VIEW_CLIENT (nautilus_view_client_get_type ())
#define NAUTILUS_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClient))
#define NAUTILUS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClientClass))
#define NAUTILUS_IS_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_IS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ())
#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame))
#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass))
#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
typedef struct _NautilusViewClient NautilusViewClient;
typedef struct _NautilusViewClientClass NautilusViewClientClass;
typedef struct _NautilusViewFrame NautilusViewFrame;
typedef struct _NautilusViewFrameClass NautilusViewFrameClass;
struct _NautilusViewClientClass
struct _NautilusViewFrameClass
{
GtkBinClass parent_spot;
void (*notify_location_change) (NautilusViewClient *view,
void (*notify_location_change) (NautilusViewFrame *view,
Nautilus_NavigationInfo *nav_context);
void (*notify_selection_change) (NautilusViewClient *view,
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*load_state) (NautilusViewClient *view, const char *config_path);
void (*save_state) (NautilusViewClient *view, const char *config_path);
void (*show_properties) (NautilusViewClient *view);
void (*stop_location_change) (NautilusViewClient *view);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*show_properties) (NautilusViewFrame *view);
void (*stop_location_change) (NautilusViewFrame *view);
GtkBinClass *parent_class;
gpointer servant_init_func, servant_destroy_func, vepv;
guint view_client_signals[5];
guint view_frame_signals[5];
};
struct _NautilusViewClient
struct _NautilusViewFrame
{
GtkBin parent;
GtkWidget *main_window;
GnomeObject *control, *view_client;
GnomeObject *control, *view_server;
Nautilus_ViewFrame view_frame;
};
GtkType nautilus_view_client_get_type (void);
void nautilus_view_client_request_location_change (NautilusViewClient *view,
GtkType nautilus_view_frame_get_type (void);
void nautilus_view_frame_request_location_change (NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc);
void nautilus_view_client_request_selection_change (NautilusViewClient *view,
void nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc);
void nautilus_view_client_request_status_change (NautilusViewClient *view,
void nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc);
void nautilus_view_client_request_progress_change (NautilusViewClient *view,
void nautilus_view_frame_request_progress_change (NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc);
GnomeObject *nautilus_view_client_get_gnome_object (NautilusViewClient *view);
GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view);
#ifdef __cplusplus
}

49
libnautilus/ntl-content-view-client.c
View file

@ -1,7 +1,7 @@
/* -*- 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;

34
libnautilus/ntl-content-view-client.h
View file

@ -1,7 +1,7 @@
/* -*- 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

49
libnautilus/ntl-content-view-frame.c
View file

@ -1,7 +1,7 @@
/* -*- 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;

34
libnautilus/ntl-content-view-frame.h
View file

@ -1,7 +1,7 @@
/* -*- 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

51
libnautilus/ntl-meta-view-client.c
View file

@ -1,7 +1,7 @@
/* -*- 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
nautilus_meta_view_client_get_type (void)
nautilus_meta_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 =
{
"NautilusMetaViewClient",
sizeof (NautilusMetaViewClient),
sizeof (NautilusMetaViewClientClass),
(GtkClassInitFunc) nautilus_meta_view_client_class_init,
(GtkObjectInitFunc) nautilus_meta_view_client_init,
"NautilusMetaViewFrame",
sizeof (NautilusMetaViewFrame),
sizeof (NautilusMetaViewFrameClass),
(GtkClassInitFunc) nautilus_meta_view_frame_class_init,
(GtkObjectInitFunc) nautilus_meta_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_meta_view_client_init (NautilusMetaViewClient *view)
nautilus_meta_view_frame_init (NautilusMetaViewFrame *view)
{
}
static void
nautilus_meta_view_client_destroy (NautilusMetaViewClient *view)
nautilus_meta_view_frame_destroy (NautilusMetaViewFrame *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_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
nautilus_meta_view_frame_class_init (NautilusMetaViewFrameClass *klass)
{
NautilusViewClientClass *view_class = ((NautilusViewClientClass *)klass);
NautilusViewFrameClass *view_class = ((NautilusViewFrameClass *)klass);
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_client_destroy;
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_frame_destroy;
view_class->servant_init_func = POA_Nautilus_MetaView__init;
view_class->servant_destroy_func = POA_Nautilus_MetaView__fini;
@ -104,12 +105,12 @@ nautilus_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
}
void
nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc, const char *label)
nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc, const char *label)
{
GnomeObject *ctl;
GnomePropertyBag *bag;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(mvc));
bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
if(!bag)
{

35
libnautilus/ntl-meta-view-client.h
View file

@ -1,7 +1,7 @@
/* -*- 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,32 +22,33 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-meta-view-client.h: Interface for object that represents a nautilus meta view implementation. */
/* ntl-meta-view-client.h: Interface for object that represents the
frame a nautilus meta view plugs into. */
#ifndef NTL_META_VIEW_CLIENT_H
#define NTL_META_VIEW_CLIENT_H
#ifndef NTL_META_VIEW_FRAME_H
#define NTL_META_VIEW_FRAME_H
#include <libnautilus/ntl-view-client.h>
#define NAUTILUS_TYPE_META_VIEW_CLIENT (nautilus_meta_view_client_get_type ())
#define NAUTILUS_META_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClient))
#define NAUTILUS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClientClass))
#define NAUTILUS_IS_META_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_IS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_TYPE_META_VIEW_FRAME (nautilus_meta_view_frame_get_type ())
#define NAUTILUS_META_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrame))
#define NAUTILUS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrameClass))
#define NAUTILUS_IS_META_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
#define NAUTILUS_IS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
typedef struct _NautilusMetaViewClient NautilusMetaViewClient;
typedef struct _NautilusMetaViewClientClass NautilusMetaViewClientClass;
typedef struct _NautilusMetaViewFrame NautilusMetaViewFrame;
typedef struct _NautilusMetaViewFrameClass NautilusMetaViewFrameClass;
struct _NautilusMetaViewClientClass {
NautilusViewClientClass parent_spot;
struct _NautilusMetaViewFrameClass {
NautilusViewFrameClass parent_spot;
};
struct _NautilusMetaViewClient {
NautilusViewClient parent;
struct _NautilusMetaViewFrame {
NautilusViewFrame parent;
};
GtkType nautilus_meta_view_client_get_type (void);
void nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc,
GtkType nautilus_meta_view_frame_get_type (void);
void nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc,
const char *label);
#endif

51
libnautilus/ntl-meta-view-frame.c
View file

@ -1,7 +1,7 @@
/* -*- 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
nautilus_meta_view_client_get_type (void)
nautilus_meta_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 =
{
"NautilusMetaViewClient",
sizeof (NautilusMetaViewClient),
sizeof (NautilusMetaViewClientClass),
(GtkClassInitFunc) nautilus_meta_view_client_class_init,
(GtkObjectInitFunc) nautilus_meta_view_client_init,
"NautilusMetaViewFrame",
sizeof (NautilusMetaViewFrame),
sizeof (NautilusMetaViewFrameClass),
(GtkClassInitFunc) nautilus_meta_view_frame_class_init,
(GtkObjectInitFunc) nautilus_meta_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_meta_view_client_init (NautilusMetaViewClient *view)
nautilus_meta_view_frame_init (NautilusMetaViewFrame *view)
{
}
static void
nautilus_meta_view_client_destroy (NautilusMetaViewClient *view)
nautilus_meta_view_frame_destroy (NautilusMetaViewFrame *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_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
nautilus_meta_view_frame_class_init (NautilusMetaViewFrameClass *klass)
{
NautilusViewClientClass *view_class = ((NautilusViewClientClass *)klass);
NautilusViewFrameClass *view_class = ((NautilusViewFrameClass *)klass);
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_client_destroy;
GTK_OBJECT_CLASS(klass)->destroy = (void (*)(GtkObject *))nautilus_meta_view_frame_destroy;
view_class->servant_init_func = POA_Nautilus_MetaView__init;
view_class->servant_destroy_func = POA_Nautilus_MetaView__fini;
@ -104,12 +105,12 @@ nautilus_meta_view_client_class_init (NautilusMetaViewClientClass *klass)
}
void
nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc, const char *label)
nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc, const char *label)
{
GnomeObject *ctl;
GnomePropertyBag *bag;
ctl = nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(mvc));
ctl = nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(mvc));
bag = gnome_control_get_property_bag(GNOME_CONTROL(ctl));
if(!bag)
{

35
libnautilus/ntl-meta-view-frame.h
View file

@ -1,7 +1,7 @@
/* -*- 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,32 +22,33 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-meta-view-client.h: Interface for object that represents a nautilus meta view implementation. */
/* ntl-meta-view-client.h: Interface for object that represents the
frame a nautilus meta view plugs into. */
#ifndef NTL_META_VIEW_CLIENT_H
#define NTL_META_VIEW_CLIENT_H
#ifndef NTL_META_VIEW_FRAME_H
#define NTL_META_VIEW_FRAME_H
#include <libnautilus/ntl-view-client.h>
#define NAUTILUS_TYPE_META_VIEW_CLIENT (nautilus_meta_view_client_get_type ())
#define NAUTILUS_META_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClient))
#define NAUTILUS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_CLIENT, NautilusMetaViewClientClass))
#define NAUTILUS_IS_META_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_IS_META_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_CLIENT))
#define NAUTILUS_TYPE_META_VIEW_FRAME (nautilus_meta_view_frame_get_type ())
#define NAUTILUS_META_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrame))
#define NAUTILUS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_META_VIEW_FRAME, NautilusMetaViewFrameClass))
#define NAUTILUS_IS_META_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
#define NAUTILUS_IS_META_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_META_VIEW_FRAME))
typedef struct _NautilusMetaViewClient NautilusMetaViewClient;
typedef struct _NautilusMetaViewClientClass NautilusMetaViewClientClass;
typedef struct _NautilusMetaViewFrame NautilusMetaViewFrame;
typedef struct _NautilusMetaViewFrameClass NautilusMetaViewFrameClass;
struct _NautilusMetaViewClientClass {
NautilusViewClientClass parent_spot;
struct _NautilusMetaViewFrameClass {
NautilusViewFrameClass parent_spot;
};
struct _NautilusMetaViewClient {
NautilusViewClient parent;
struct _NautilusMetaViewFrame {
NautilusViewFrame parent;
};
GtkType nautilus_meta_view_client_get_type (void);
void nautilus_meta_view_client_set_label(NautilusMetaViewClient *mvc,
GtkType nautilus_meta_view_frame_get_type (void);
void nautilus_meta_view_frame_set_label(NautilusMetaViewFrame *mvc,
const char *label);
#endif

126
libnautilus/ntl-view-client.c
View file

@ -1,7 +1,7 @@
/* -*- 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,7 +22,9 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.c: Implementation for object that represents a nautilus view implementation. */
/* ntl-view-client.c: Implementation for object that represents a
nautilus view implementation. */
#include <gtk/gtk.h>
#include "libnautilus.h"
@ -31,7 +33,7 @@ typedef struct {
POA_Nautilus_View servant;
gpointer gnome_object;
NautilusViewClient *view;
NautilusViewFrame *view;
} impl_POA_Nautilus_View;
static void
@ -138,7 +140,7 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
CORBA_exception_init(&ev);
servant_destroy_func = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
servant_destroy_func = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
objid = PortableServer_POA_servant_to_id(bonobo_poa(), servant, &ev);
PortableServer_POA_deactivate_object(bonobo_poa(), objid, &ev);
CORBA_free(objid);
@ -150,12 +152,12 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
}
static GnomeObject *
impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev)
{
GnomeObject *retval;
impl_POA_Nautilus_View *newservant;
void (*servant_init_func)(PortableServer_Servant servant, CORBA_Environment *ev);
NautilusViewClientClass *view_class = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
servant_init_func = view_class->servant_init_func;
newservant = g_new0(impl_POA_Nautilus_View, 1);
@ -173,43 +175,43 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
return retval;
}
static void nautilus_view_client_init (NautilusViewClient *view);
static void nautilus_view_client_destroy (NautilusViewClient *view);
static void nautilus_view_client_class_init (NautilusViewClientClass *klass);
static void nautilus_view_client_set_arg (GtkObject *object,
static void nautilus_view_frame_init (NautilusViewFrame *view);
static void nautilus_view_frame_destroy (NautilusViewFrame *view);
static void nautilus_view_frame_class_init (NautilusViewFrameClass *klass);
static void nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_get_arg (GtkObject *object,
static void nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_size_request (GtkWidget *widget,
static void nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void nautilus_view_client_size_allocate (GtkWidget *widget,
static void nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
GtkType
nautilus_view_client_get_type (void)
nautilus_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 =
{
"NautilusViewClient",
sizeof (NautilusViewClient),
sizeof (NautilusViewClientClass),
(GtkClassInitFunc) nautilus_view_client_class_init,
(GtkObjectInitFunc) nautilus_view_client_init,
"NautilusViewFrame",
sizeof (NautilusViewFrame),
sizeof (NautilusViewFrameClass),
(GtkClassInitFunc) nautilus_view_frame_class_init,
(GtkObjectInitFunc) nautilus_view_frame_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
view_client_type = gtk_type_unique (gtk_bin_get_type(), &view_client_info);
view_frame_type = gtk_type_unique (gtk_bin_get_type(), &view_frame_info);
}
return view_client_type;
return view_frame_type;
}
#if 0
@ -235,20 +237,20 @@ gtk_marshal_NONE__BOXED_OBJECT_BOXED (GtkObject * object,
#endif
static void
nautilus_view_client_class_init (NautilusViewClientClass *klass)
nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
int i;
object_class = (GtkObjectClass*) klass;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_client_destroy;
object_class->set_arg = nautilus_view_client_set_arg;
object_class->get_arg = nautilus_view_client_get_arg;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_frame_destroy;
object_class->set_arg = nautilus_view_frame_set_arg;
object_class->get_arg = nautilus_view_frame_get_arg;
widget_class = (GtkWidgetClass*) klass;
widget_class->size_request = nautilus_view_client_size_request;
widget_class->size_allocate = nautilus_view_client_size_allocate;
widget_class->size_request = nautilus_view_frame_size_request;
widget_class->size_allocate = nautilus_view_frame_size_allocate;
klass->notify_location_change = NULL;
@ -258,61 +260,61 @@ nautilus_view_client_class_init (NautilusViewClientClass *klass)
klass->vepv = &impl_Nautilus_View_vepv;
i = 0;
klass->view_client_signals[i++] = gtk_signal_new("notify_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("load_state",
klass->view_frame_signals[i++] = gtk_signal_new("load_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, load_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("save_state",
klass->view_frame_signals[i++] = gtk_signal_new("save_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, save_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("show_properties",
klass->view_frame_signals[i++] = gtk_signal_new("show_properties",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, show_properties),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->view_client_signals[i++] = gtk_signal_new("notify_selection_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_selection_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("stop_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("stop_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, stop_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, klass->view_client_signals, i);
gtk_object_class_add_signals (object_class, klass->view_frame_signals, i);
}
static void
nautilus_view_client_set_arg (GtkObject *object,
nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_get_arg (GtkObject *object,
nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_init (NautilusViewClient *view)
nautilus_view_frame_init (NautilusViewFrame *view)
{
CORBA_Environment ev;
GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW);
@ -320,17 +322,17 @@ nautilus_view_client_init (NautilusViewClient *view)
view->control = GNOME_OBJECT(gnome_control_new(GTK_WIDGET(view)));
CORBA_exception_init(&ev);
view->view_client = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_client);
view->view_server = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_server);
CORBA_exception_free(&ev);
}
static void
nautilus_view_client_destroy (NautilusViewClient *view)
nautilus_view_frame_destroy (NautilusViewFrame *view)
{
NautilusViewClientClass *klass = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
gnome_object_destroy(view->view_client);
gnome_object_destroy(view->view_server);
gnome_object_destroy(view->control);
if(((GtkObjectClass *)klass->parent_class)->destroy)
@ -338,13 +340,13 @@ nautilus_view_client_destroy (NautilusViewClient *view)
}
void
nautilus_view_client_request_location_change(NautilusViewClient *view,
nautilus_view_frame_request_location_change(NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -366,13 +368,13 @@ nautilus_view_client_request_location_change(NautilusViewClient *view,
}
void
nautilus_view_client_request_selection_change (NautilusViewClient *view,
nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -394,13 +396,13 @@ nautilus_view_client_request_selection_change (NautilusViewClient *
}
void
nautilus_view_client_request_status_change (NautilusViewClient *view,
nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -422,13 +424,13 @@ nautilus_view_client_request_status_change (NautilusViewClient *view,
}
void
nautilus_view_client_request_progress_change(NautilusViewClient *view,
nautilus_view_frame_request_progress_change(NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -450,7 +452,7 @@ nautilus_view_client_request_progress_change(NautilusViewClient *view,
}
static void
nautilus_view_client_size_request (GtkWidget *widget,
nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkBin *bin;
@ -472,7 +474,7 @@ nautilus_view_client_size_request (GtkWidget *widget,
}
static void
nautilus_view_client_size_allocate (GtkWidget *widget,
nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkBin *bin;
@ -486,7 +488,7 @@ nautilus_view_client_size_allocate (GtkWidget *widget,
}
GnomeObject *
nautilus_view_client_get_gnome_object (NautilusViewClient *view)
nautilus_view_frame_get_gnome_object (NautilusViewFrame *view)
{
return view->control;
}

56
libnautilus/ntl-view-client.h
View file

@ -1,7 +1,7 @@
/* -*- 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,10 +22,12 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.h: Interface for object that represents a nautilus client. */
#ifndef NTL_VIEW_CLIENT_H
#define NTL_VIEW_CLIENT_H
/* ntl-view-client.h: Interface of the object representing the frame a
data view plugs into. */
#ifndef NTL_VIEW_FRAME_H
#define NTL_VIEW_FRAME_H
#include <gtk/gtk.h>
@ -33,55 +35,55 @@
extern "C" {
#endif /* __cplusplus */
#define NAUTILUS_TYPE_VIEW_CLIENT (nautilus_view_client_get_type ())
#define NAUTILUS_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClient))
#define NAUTILUS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClientClass))
#define NAUTILUS_IS_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_IS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ())
#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame))
#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass))
#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
typedef struct _NautilusViewClient NautilusViewClient;
typedef struct _NautilusViewClientClass NautilusViewClientClass;
typedef struct _NautilusViewFrame NautilusViewFrame;
typedef struct _NautilusViewFrameClass NautilusViewFrameClass;
struct _NautilusViewClientClass
struct _NautilusViewFrameClass
{
GtkBinClass parent_spot;
void (*notify_location_change) (NautilusViewClient *view,
void (*notify_location_change) (NautilusViewFrame *view,
Nautilus_NavigationInfo *nav_context);
void (*notify_selection_change) (NautilusViewClient *view,
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*load_state) (NautilusViewClient *view, const char *config_path);
void (*save_state) (NautilusViewClient *view, const char *config_path);
void (*show_properties) (NautilusViewClient *view);
void (*stop_location_change) (NautilusViewClient *view);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*show_properties) (NautilusViewFrame *view);
void (*stop_location_change) (NautilusViewFrame *view);
GtkBinClass *parent_class;
gpointer servant_init_func, servant_destroy_func, vepv;
guint view_client_signals[5];
guint view_frame_signals[5];
};
struct _NautilusViewClient
struct _NautilusViewFrame
{
GtkBin parent;
GtkWidget *main_window;
GnomeObject *control, *view_client;
GnomeObject *control, *view_server;
Nautilus_ViewFrame view_frame;
};
GtkType nautilus_view_client_get_type (void);
void nautilus_view_client_request_location_change (NautilusViewClient *view,
GtkType nautilus_view_frame_get_type (void);
void nautilus_view_frame_request_location_change (NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc);
void nautilus_view_client_request_selection_change (NautilusViewClient *view,
void nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc);
void nautilus_view_client_request_status_change (NautilusViewClient *view,
void nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc);
void nautilus_view_client_request_progress_change (NautilusViewClient *view,
void nautilus_view_frame_request_progress_change (NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc);
GnomeObject *nautilus_view_client_get_gnome_object (NautilusViewClient *view);
GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view);
#ifdef __cplusplus
}

126
libnautilus/ntl-view-frame.c
View file

@ -1,7 +1,7 @@
/* -*- 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,7 +22,9 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.c: Implementation for object that represents a nautilus view implementation. */
/* ntl-view-client.c: Implementation for object that represents a
nautilus view implementation. */
#include <gtk/gtk.h>
#include "libnautilus.h"
@ -31,7 +33,7 @@ typedef struct {
POA_Nautilus_View servant;
gpointer gnome_object;
NautilusViewClient *view;
NautilusViewFrame *view;
} impl_POA_Nautilus_View;
static void
@ -138,7 +140,7 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
CORBA_exception_init(&ev);
servant_destroy_func = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
servant_destroy_func = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(servant->view)->klass)->servant_destroy_func;
objid = PortableServer_POA_servant_to_id(bonobo_poa(), servant, &ev);
PortableServer_POA_deactivate_object(bonobo_poa(), objid, &ev);
CORBA_free(objid);
@ -150,12 +152,12 @@ impl_Nautilus_View__destroy(GnomeObject *obj, impl_POA_Nautilus_View *servant)
}
static GnomeObject *
impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
impl_Nautilus_View__create(NautilusViewFrame *view, CORBA_Environment * ev)
{
GnomeObject *retval;
impl_POA_Nautilus_View *newservant;
void (*servant_init_func)(PortableServer_Servant servant, CORBA_Environment *ev);
NautilusViewClientClass *view_class = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *view_class = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
servant_init_func = view_class->servant_init_func;
newservant = g_new0(impl_POA_Nautilus_View, 1);
@ -173,43 +175,43 @@ impl_Nautilus_View__create(NautilusViewClient *view, CORBA_Environment * ev)
return retval;
}
static void nautilus_view_client_init (NautilusViewClient *view);
static void nautilus_view_client_destroy (NautilusViewClient *view);
static void nautilus_view_client_class_init (NautilusViewClientClass *klass);
static void nautilus_view_client_set_arg (GtkObject *object,
static void nautilus_view_frame_init (NautilusViewFrame *view);
static void nautilus_view_frame_destroy (NautilusViewFrame *view);
static void nautilus_view_frame_class_init (NautilusViewFrameClass *klass);
static void nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_get_arg (GtkObject *object,
static void nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id);
static void nautilus_view_client_size_request (GtkWidget *widget,
static void nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition);
static void nautilus_view_client_size_allocate (GtkWidget *widget,
static void nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
GtkType
nautilus_view_client_get_type (void)
nautilus_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 =
{
"NautilusViewClient",
sizeof (NautilusViewClient),
sizeof (NautilusViewClientClass),
(GtkClassInitFunc) nautilus_view_client_class_init,
(GtkObjectInitFunc) nautilus_view_client_init,
"NautilusViewFrame",
sizeof (NautilusViewFrame),
sizeof (NautilusViewFrameClass),
(GtkClassInitFunc) nautilus_view_frame_class_init,
(GtkObjectInitFunc) nautilus_view_frame_init,
/* reserved_1 */ NULL,
/* reserved_2 */ NULL,
(GtkClassInitFunc) NULL,
};
view_client_type = gtk_type_unique (gtk_bin_get_type(), &view_client_info);
view_frame_type = gtk_type_unique (gtk_bin_get_type(), &view_frame_info);
}
return view_client_type;
return view_frame_type;
}
#if 0
@ -235,20 +237,20 @@ gtk_marshal_NONE__BOXED_OBJECT_BOXED (GtkObject * object,
#endif
static void
nautilus_view_client_class_init (NautilusViewClientClass *klass)
nautilus_view_frame_class_init (NautilusViewFrameClass *klass)
{
GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
int i;
object_class = (GtkObjectClass*) klass;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_client_destroy;
object_class->set_arg = nautilus_view_client_set_arg;
object_class->get_arg = nautilus_view_client_get_arg;
object_class->destroy = (void (*)(GtkObject*))nautilus_view_frame_destroy;
object_class->set_arg = nautilus_view_frame_set_arg;
object_class->get_arg = nautilus_view_frame_get_arg;
widget_class = (GtkWidgetClass*) klass;
widget_class->size_request = nautilus_view_client_size_request;
widget_class->size_allocate = nautilus_view_client_size_allocate;
widget_class->size_request = nautilus_view_frame_size_request;
widget_class->size_allocate = nautilus_view_frame_size_allocate;
klass->notify_location_change = NULL;
@ -258,61 +260,61 @@ nautilus_view_client_class_init (NautilusViewClientClass *klass)
klass->vepv = &impl_Nautilus_View_vepv;
i = 0;
klass->view_client_signals[i++] = gtk_signal_new("notify_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("load_state",
klass->view_frame_signals[i++] = gtk_signal_new("load_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, load_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, load_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("save_state",
klass->view_frame_signals[i++] = gtk_signal_new("save_state",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, save_state),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, save_state),
gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
klass->view_client_signals[i++] = gtk_signal_new("show_properties",
klass->view_frame_signals[i++] = gtk_signal_new("show_properties",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, show_properties),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, show_properties),
gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->view_client_signals[i++] = gtk_signal_new("notify_selection_change",
klass->view_frame_signals[i++] = gtk_signal_new("notify_selection_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, notify_selection_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, notify_selection_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 1, GTK_TYPE_BOXED);
klass->view_client_signals[i++] = gtk_signal_new("stop_location_change",
klass->view_frame_signals[i++] = gtk_signal_new("stop_location_change",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (NautilusViewClientClass, stop_location_change),
GTK_SIGNAL_OFFSET (NautilusViewFrameClass, stop_location_change),
gtk_marshal_NONE__BOXED,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, klass->view_client_signals, i);
gtk_object_class_add_signals (object_class, klass->view_frame_signals, i);
}
static void
nautilus_view_client_set_arg (GtkObject *object,
nautilus_view_frame_set_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_get_arg (GtkObject *object,
nautilus_view_frame_get_arg (GtkObject *object,
GtkArg *arg,
guint arg_id)
{
}
static void
nautilus_view_client_init (NautilusViewClient *view)
nautilus_view_frame_init (NautilusViewFrame *view)
{
CORBA_Environment ev;
GTK_WIDGET_SET_FLAGS (view, GTK_NO_WINDOW);
@ -320,17 +322,17 @@ nautilus_view_client_init (NautilusViewClient *view)
view->control = GNOME_OBJECT(gnome_control_new(GTK_WIDGET(view)));
CORBA_exception_init(&ev);
view->view_client = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_client);
view->view_server = impl_Nautilus_View__create(view, &ev);
gnome_object_add_interface(view->control, view->view_server);
CORBA_exception_free(&ev);
}
static void
nautilus_view_client_destroy (NautilusViewClient *view)
nautilus_view_frame_destroy (NautilusViewFrame *view)
{
NautilusViewClientClass *klass = NAUTILUS_VIEW_CLIENT_CLASS(GTK_OBJECT(view)->klass);
NautilusViewFrameClass *klass = NAUTILUS_VIEW_FRAME_CLASS(GTK_OBJECT(view)->klass);
gnome_object_destroy(view->view_client);
gnome_object_destroy(view->view_server);
gnome_object_destroy(view->control);
if(((GtkObjectClass *)klass->parent_class)->destroy)
@ -338,13 +340,13 @@ nautilus_view_client_destroy (NautilusViewClient *view)
}
void
nautilus_view_client_request_location_change(NautilusViewClient *view,
nautilus_view_frame_request_location_change(NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -366,13 +368,13 @@ nautilus_view_client_request_location_change(NautilusViewClient *view,
}
void
nautilus_view_client_request_selection_change (NautilusViewClient *view,
nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -394,13 +396,13 @@ nautilus_view_client_request_selection_change (NautilusViewClient *
}
void
nautilus_view_client_request_status_change (NautilusViewClient *view,
nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -422,13 +424,13 @@ nautilus_view_client_request_status_change (NautilusViewClient *view,
}
void
nautilus_view_client_request_progress_change(NautilusViewClient *view,
nautilus_view_frame_request_progress_change(NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc)
{
CORBA_Environment ev;
g_return_if_fail (view != NULL);
g_return_if_fail (NAUTILUS_IS_VIEW_CLIENT (view));
g_return_if_fail (NAUTILUS_IS_VIEW_FRAME (view));
CORBA_exception_init(&ev);
if(CORBA_Object_is_nil(view->view_frame, &ev))
@ -450,7 +452,7 @@ nautilus_view_client_request_progress_change(NautilusViewClient *view,
}
static void
nautilus_view_client_size_request (GtkWidget *widget,
nautilus_view_frame_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkBin *bin;
@ -472,7 +474,7 @@ nautilus_view_client_size_request (GtkWidget *widget,
}
static void
nautilus_view_client_size_allocate (GtkWidget *widget,
nautilus_view_frame_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
GtkBin *bin;
@ -486,7 +488,7 @@ nautilus_view_client_size_allocate (GtkWidget *widget,
}
GnomeObject *
nautilus_view_client_get_gnome_object (NautilusViewClient *view)
nautilus_view_frame_get_gnome_object (NautilusViewFrame *view)
{
return view->control;
}

56
libnautilus/ntl-view-frame.h
View file

@ -1,7 +1,7 @@
/* -*- 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,10 +22,12 @@
* Author: Elliot Lee <sopwith@redhat.com>
*
*/
/* ntl-view-client.h: Interface for object that represents a nautilus client. */
#ifndef NTL_VIEW_CLIENT_H
#define NTL_VIEW_CLIENT_H
/* ntl-view-client.h: Interface of the object representing the frame a
data view plugs into. */
#ifndef NTL_VIEW_FRAME_H
#define NTL_VIEW_FRAME_H
#include <gtk/gtk.h>
@ -33,55 +35,55 @@
extern "C" {
#endif /* __cplusplus */
#define NAUTILUS_TYPE_VIEW_CLIENT (nautilus_view_client_get_type ())
#define NAUTILUS_VIEW_CLIENT(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClient))
#define NAUTILUS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_CLIENT, NautilusViewClientClass))
#define NAUTILUS_IS_VIEW_CLIENT(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_IS_VIEW_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_CLIENT))
#define NAUTILUS_TYPE_VIEW_FRAME (nautilus_view_frame_get_type ())
#define NAUTILUS_VIEW_FRAME(obj) (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrame))
#define NAUTILUS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW_FRAME, NautilusViewFrameClass))
#define NAUTILUS_IS_VIEW_FRAME(obj) (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
#define NAUTILUS_IS_VIEW_FRAME_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), NAUTILUS_TYPE_VIEW_FRAME))
typedef struct _NautilusViewClient NautilusViewClient;
typedef struct _NautilusViewClientClass NautilusViewClientClass;
typedef struct _NautilusViewFrame NautilusViewFrame;
typedef struct _NautilusViewFrameClass NautilusViewFrameClass;
struct _NautilusViewClientClass
struct _NautilusViewFrameClass
{
GtkBinClass parent_spot;
void (*notify_location_change) (NautilusViewClient *view,
void (*notify_location_change) (NautilusViewFrame *view,
Nautilus_NavigationInfo *nav_context);
void (*notify_selection_change) (NautilusViewClient *view,
void (*notify_selection_change) (NautilusViewFrame *view,
Nautilus_SelectionInfo *nav_context);
void (*load_state) (NautilusViewClient *view, const char *config_path);
void (*save_state) (NautilusViewClient *view, const char *config_path);
void (*show_properties) (NautilusViewClient *view);
void (*stop_location_change) (NautilusViewClient *view);
void (*load_state) (NautilusViewFrame *view, const char *config_path);
void (*save_state) (NautilusViewFrame *view, const char *config_path);
void (*show_properties) (NautilusViewFrame *view);
void (*stop_location_change) (NautilusViewFrame *view);
GtkBinClass *parent_class;
gpointer servant_init_func, servant_destroy_func, vepv;
guint view_client_signals[5];
guint view_frame_signals[5];
};
struct _NautilusViewClient
struct _NautilusViewFrame
{
GtkBin parent;
GtkWidget *main_window;
GnomeObject *control, *view_client;
GnomeObject *control, *view_server;
Nautilus_ViewFrame view_frame;
};
GtkType nautilus_view_client_get_type (void);
void nautilus_view_client_request_location_change (NautilusViewClient *view,
GtkType nautilus_view_frame_get_type (void);
void nautilus_view_frame_request_location_change (NautilusViewFrame *view,
Nautilus_NavigationRequestInfo *loc);
void nautilus_view_client_request_selection_change (NautilusViewClient *view,
void nautilus_view_frame_request_selection_change (NautilusViewFrame *view,
Nautilus_SelectionRequestInfo *loc);
void nautilus_view_client_request_status_change (NautilusViewClient *view,
void nautilus_view_frame_request_status_change (NautilusViewFrame *view,
Nautilus_StatusRequestInfo *loc);
void nautilus_view_client_request_progress_change (NautilusViewClient *view,
void nautilus_view_frame_request_progress_change (NautilusViewFrame *view,
Nautilus_ProgressRequestInfo *loc);
GnomeObject *nautilus_view_client_get_gnome_object (NautilusViewClient *view);
GnomeObject *nautilus_view_frame_get_gnome_object (NautilusViewFrame *view);
#ifdef __cplusplus
}

24
src/file-manager/fm-directory-view.c
View file

@ -41,7 +41,7 @@
#define DISPLAY_TIMEOUT_INTERVAL 500
#define ENTRIES_PER_CB 1
static NautilusViewClientClass *parent_class = NULL;
static NautilusViewFrameClass *parent_class = NULL;
/* FIXME this no longer has any reason to be global,
given fm_get_current_icon_cache()
@ -71,7 +71,7 @@ display_selection_info (FMDirectoryView *view,
if (count == 0) {
memset(&sri, 0, sizeof(sri));
sri.status_string = "";
nautilus_view_client_request_status_change(NAUTILUS_VIEW_CLIENT(view), &sri);
nautilus_view_frame_request_status_change(NAUTILUS_VIEW_FRAME(view), &sri);
return;
}
@ -111,7 +111,7 @@ display_selection_info (FMDirectoryView *view,
count, (count==1)?_("file"):_("files"), size_string);
memset(&sri, 0, sizeof(sri));
sri.status_string = msg;
nautilus_view_client_request_status_change(NAUTILUS_VIEW_CLIENT(view), &sri);
nautilus_view_frame_request_status_change(NAUTILUS_VIEW_FRAME(view), &sri);
g_free (msg);
g_free (size_string);
@ -199,7 +199,7 @@ icon_container_activate_cb (GnomeIconContainer *icon_container,
nri.requested_uri = gnome_vfs_uri_to_string(new_uri, 0);
nri.new_window_default = nri.new_window_suggested = Nautilus_V_FALSE;
nri.new_window_enforced = Nautilus_V_UNKNOWN;
nautilus_view_client_request_location_change(NAUTILUS_VIEW_CLIENT(directory_view),
nautilus_view_frame_request_location_change(NAUTILUS_VIEW_FRAME(directory_view),
&nri);
g_free(nri.requested_uri);
gnome_vfs_uri_unref (new_uri);
@ -398,7 +398,7 @@ flist_activate_cb (GtkFList *flist,
nri.requested_uri = gnome_vfs_uri_to_string(new_uri, 0);
nri.new_window_default = nri.new_window_suggested = Nautilus_V_FALSE;
nri.new_window_enforced = Nautilus_V_UNKNOWN;
nautilus_view_client_request_location_change(NAUTILUS_VIEW_CLIENT(directory_view),
nautilus_view_frame_request_location_change(NAUTILUS_VIEW_FRAME(directory_view),
&nri);
g_free(nri.requested_uri);
gnome_vfs_uri_unref (new_uri);
@ -498,14 +498,14 @@ setup_flist (FMDirectoryView *view,
/* Signals. */
static void
real_location_change(NautilusViewClient *directory_view, Nautilus_NavigationInfo *nav_context)
real_location_change(NautilusViewFrame *directory_view, Nautilus_NavigationInfo *nav_context)
{
g_message("Directory view is loading URL %s", nav_context->requested_uri);
fm_directory_view_load_uri(FM_DIRECTORY_VIEW(directory_view), nav_context->requested_uri);
}
static void
real_stop_location_change(NautilusViewClient *directory_view)
real_stop_location_change(NautilusViewFrame *directory_view)
{
g_message("Directory view is stopping");
fm_directory_view_stop(FM_DIRECTORY_VIEW(directory_view));
@ -548,10 +548,10 @@ static void
class_init (FMDirectoryViewClass *class)
{
GtkObjectClass *object_class;
NautilusViewClientClass *vc;
NautilusViewFrameClass *vc;
object_class = GTK_OBJECT_CLASS (class);
vc = NAUTILUS_VIEW_CLIENT_CLASS (class);
vc = NAUTILUS_VIEW_FRAME_CLASS (class);
parent_class = gtk_type_class (gtk_type_parent(object_class->type));
object_class->destroy = destroy;
@ -624,7 +624,7 @@ stop_load (FMDirectoryView *view, gboolean error)
pri.amount = 100.0;
pri.type = error ? Nautilus_PROGRESS_DONE_ERROR : Nautilus_PROGRESS_DONE_OK;
nautilus_view_client_request_progress_change(NAUTILUS_VIEW_CLIENT(view),
nautilus_view_frame_request_progress_change(NAUTILUS_VIEW_FRAME(view),
&pri);
}
@ -844,7 +844,7 @@ fm_directory_view_get_type (void)
};
directory_view_type
= gtk_type_unique (nautilus_content_view_client_get_type (),
= gtk_type_unique (nautilus_content_view_frame_get_type (),
&directory_view_info);
}
@ -924,7 +924,7 @@ fm_directory_view_load_uri (FMDirectoryView *view,
memset(&pri, 0, sizeof(pri));
pri.type = Nautilus_PROGRESS_UNDERWAY;
pri.amount = 0;
nautilus_view_client_request_progress_change(NAUTILUS_VIEW_CLIENT(view), &pri);
nautilus_view_frame_request_progress_change(NAUTILUS_VIEW_FRAME(view), &pri);
result = gnome_vfs_async_load_directory_uri
(&view->vfs_async_handle, /* handle */

4
src/file-manager/fm-directory-view.h
View file

@ -57,7 +57,7 @@ typedef struct _FMDirectoryViewClass FMDirectoryViewClass;
#define FM_IS_DIRECTORY_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), FM_TYPE_DIRECTORY_VIEW))
struct _FMDirectoryView {
NautilusContentViewClient parent;
NautilusContentViewFrame parent;
FMDirectoryViewMode mode;
@ -81,7 +81,7 @@ struct _FMDirectoryView {
};
struct _FMDirectoryViewClass {
NautilusContentViewClientClass parent_class;
NautilusContentViewFrameClass parent_class;
};

4
src/nautilus-application.c
View file

@ -17,10 +17,10 @@ nautilus_make_object(GnomeGenericFactory *gfact, const char *goad_id, gpointer c
if(GNOME_IS_OBJECT(theobj))
return GNOME_OBJECT(theobj);
if(NAUTILUS_IS_VIEW_CLIENT(theobj))
if(NAUTILUS_IS_VIEW_FRAME(theobj))
{
gtk_widget_show(GTK_WIDGET(theobj));
return nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(theobj));
return nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(theobj));
}
gtk_object_destroy(theobj);

4
src/ntl-app.c
View file

@ -17,10 +17,10 @@ nautilus_make_object(GnomeGenericFactory *gfact, const char *goad_id, gpointer c
if(GNOME_IS_OBJECT(theobj))
return GNOME_OBJECT(theobj);
if(NAUTILUS_IS_VIEW_CLIENT(theobj))
if(NAUTILUS_IS_VIEW_FRAME(theobj))
{
gtk_widget_show(GTK_WIDGET(theobj));
return nautilus_view_client_get_gnome_object(NAUTILUS_VIEW_CLIENT(theobj));
return nautilus_view_frame_get_gnome_object(NAUTILUS_VIEW_FRAME(theobj));
}
gtk_object_destroy(theobj);