diff options
author | Maciej Stachowiak <mstachow@src.gnome.org> | 2000-01-10 08:37:41 +0000 |
---|---|---|
committer | Maciej Stachowiak <mstachow@src.gnome.org> | 2000-01-10 08:37:41 +0000 |
commit | 78106a7394fd85830f83b324d5f95a25e02e8bac (patch) | |
tree | c37c5d5df06e8b4d63a08f5051b69de4257845e0 /libnautilus | |
parent | 1cfc709b613c184e417420f7ee67f1dcb0f480c0 (diff) | |
download | nautilus-78106a7394fd85830f83b324d5f95a25e02e8bac.tar.gz |
Rename NautilusViewClient to NautilusViewFrame, NautilusContentViewClient
* libnautilus/ntl-view-client.c, libnautilus/ntl-view-client.h,
libnautilus/ntl-content-view-client.c,
libnautilus/ntl-content-view-client.h,
libnautilus/ntl-meta-view-client.c,
libnautilus/ntl-meta-view-client.h,: Rename NautilusViewClient to
NautilusViewFrame, NautilusContentViewClient to
NautilusContentViewFrame, and NautilusMetaViewClient to
NautilusMetaViewFrame.
* components/help/hyperbola-nav-tree.c,
components/history/ntl-history-view.c,
components/html/ntl-web-browser.c,
components/websearch/ntl-web-search.c, src/ntl-app.c,
src/file-manager/fm-directory-view.c,
src/file-manager/fm-directory-view.h: Reflect the above renaming.
Diffstat (limited to 'libnautilus')
-rw-r--r-- | libnautilus/nautilus-content-view-frame.c | 49 | ||||
-rw-r--r-- | libnautilus/nautilus-content-view-frame.h | 34 | ||||
-rw-r--r-- | libnautilus/nautilus-meta-view-frame.c | 51 | ||||
-rw-r--r-- | libnautilus/nautilus-meta-view-frame.h | 35 | ||||
-rw-r--r-- | libnautilus/nautilus-view-frame.c | 126 | ||||
-rw-r--r-- | libnautilus/nautilus-view-frame.h | 56 | ||||
-rw-r--r-- | libnautilus/nautilus-view.c | 126 | ||||
-rw-r--r-- | libnautilus/nautilus-view.h | 56 | ||||
-rw-r--r-- | libnautilus/ntl-content-view-client.c | 49 | ||||
-rw-r--r-- | libnautilus/ntl-content-view-client.h | 34 | ||||
-rw-r--r-- | libnautilus/ntl-content-view-frame.c | 49 | ||||
-rw-r--r-- | libnautilus/ntl-content-view-frame.h | 34 | ||||
-rw-r--r-- | libnautilus/ntl-meta-view-client.c | 51 | ||||
-rw-r--r-- | libnautilus/ntl-meta-view-client.h | 35 | ||||
-rw-r--r-- | libnautilus/ntl-meta-view-frame.c | 51 | ||||
-rw-r--r-- | libnautilus/ntl-meta-view-frame.h | 35 | ||||
-rw-r--r-- | libnautilus/ntl-view-client.c | 126 | ||||
-rw-r--r-- | libnautilus/ntl-view-client.h | 56 | ||||
-rw-r--r-- | libnautilus/ntl-view-frame.c | 126 | ||||
-rw-r--r-- | libnautilus/ntl-view-frame.h | 56 |
20 files changed, 636 insertions, 599 deletions
diff --git a/libnautilus/nautilus-content-view-frame.c b/libnautilus/nautilus-content-view-frame.c index 73c3498d6..1e36f7cca 100644 --- a/libnautilus/nautilus-content-view-frame.c +++ b/libnautilus/nautilus-content-view-frame.c @@ -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; diff --git a/libnautilus/nautilus-content-view-frame.h b/libnautilus/nautilus-content-view-frame.h index 68d2c4253..763b5921b 100644 --- a/libnautilus/nautilus-content-view-frame.h +++ b/libnautilus/nautilus-content-view-frame.h @@ -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 diff --git a/libnautilus/nautilus-meta-view-frame.c b/libnautilus/nautilus-meta-view-frame.c index 001233874..d6126ef6a 100644 --- a/libnautilus/nautilus-meta-view-frame.c +++ b/libnautilus/nautilus-meta-view-frame.c @@ -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) { diff --git a/libnautilus/nautilus-meta-view-frame.h b/libnautilus/nautilus-meta-view-frame.h index a146bfa81..d6e0b590a 100644 --- a/libnautilus/nautilus-meta-view-frame.h +++ b/libnautilus/nautilus-meta-view-frame.h @@ -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 diff --git a/libnautilus/nautilus-view-frame.c b/libnautilus/nautilus-view-frame.c index 89c7e533f..94f6826f4 100644 --- a/libnautilus/nautilus-view-frame.c +++ b/libnautilus/nautilus-view-frame.c @@ -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; } diff --git a/libnautilus/nautilus-view-frame.h b/libnautilus/nautilus-view-frame.h index a35b196e3..8c8fc7dae 100644 --- a/libnautilus/nautilus-view-frame.h +++ b/libnautilus/nautilus-view-frame.h @@ -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 } diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c index 89c7e533f..94f6826f4 100644 --- a/libnautilus/nautilus-view.c +++ b/libnautilus/nautilus-view.c @@ -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; } diff --git a/libnautilus/nautilus-view.h b/libnautilus/nautilus-view.h index a35b196e3..8c8fc7dae 100644 --- a/libnautilus/nautilus-view.h +++ b/libnautilus/nautilus-view.h @@ -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 } diff --git a/libnautilus/ntl-content-view-client.c b/libnautilus/ntl-content-view-client.c index 73c3498d6..1e36f7cca 100644 --- a/libnautilus/ntl-content-view-client.c +++ b/libnautilus/ntl-content-view-client.c @@ -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; diff --git a/libnautilus/ntl-content-view-client.h b/libnautilus/ntl-content-view-client.h index 68d2c4253..763b5921b 100644 --- a/libnautilus/ntl-content-view-client.h +++ b/libnautilus/ntl-content-view-client.h @@ -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 diff --git a/libnautilus/ntl-content-view-frame.c b/libnautilus/ntl-content-view-frame.c index 73c3498d6..1e36f7cca 100644 --- a/libnautilus/ntl-content-view-frame.c +++ b/libnautilus/ntl-content-view-frame.c @@ -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; diff --git a/libnautilus/ntl-content-view-frame.h b/libnautilus/ntl-content-view-frame.h index 68d2c4253..763b5921b 100644 --- a/libnautilus/ntl-content-view-frame.h +++ b/libnautilus/ntl-content-view-frame.h @@ -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 diff --git a/libnautilus/ntl-meta-view-client.c b/libnautilus/ntl-meta-view-client.c index 001233874..d6126ef6a 100644 --- a/libnautilus/ntl-meta-view-client.c +++ b/libnautilus/ntl-meta-view-client.c @@ -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) { diff --git a/libnautilus/ntl-meta-view-client.h b/libnautilus/ntl-meta-view-client.h index a146bfa81..d6e0b590a 100644 --- a/libnautilus/ntl-meta-view-client.h +++ b/libnautilus/ntl-meta-view-client.h @@ -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 diff --git a/libnautilus/ntl-meta-view-frame.c b/libnautilus/ntl-meta-view-frame.c index 001233874..d6126ef6a 100644 --- a/libnautilus/ntl-meta-view-frame.c +++ b/libnautilus/ntl-meta-view-frame.c @@ -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) { diff --git a/libnautilus/ntl-meta-view-frame.h b/libnautilus/ntl-meta-view-frame.h index a146bfa81..d6e0b590a 100644 --- a/libnautilus/ntl-meta-view-frame.h +++ b/libnautilus/ntl-meta-view-frame.h @@ -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 diff --git a/libnautilus/ntl-view-client.c b/libnautilus/ntl-view-client.c index 89c7e533f..94f6826f4 100644 --- a/libnautilus/ntl-view-client.c +++ b/libnautilus/ntl-view-client.c @@ -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; } diff --git a/libnautilus/ntl-view-client.h b/libnautilus/ntl-view-client.h index a35b196e3..8c8fc7dae 100644 --- a/libnautilus/ntl-view-client.h +++ b/libnautilus/ntl-view-client.h @@ -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 } diff --git a/libnautilus/ntl-view-frame.c b/libnautilus/ntl-view-frame.c index 89c7e533f..94f6826f4 100644 --- a/libnautilus/ntl-view-frame.c +++ b/libnautilus/ntl-view-frame.c @@ -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; } diff --git a/libnautilus/ntl-view-frame.h b/libnautilus/ntl-view-frame.h index a35b196e3..8c8fc7dae 100644 --- a/libnautilus/ntl-view-frame.h +++ b/libnautilus/ntl-view-frame.h @@ -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 } |