callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s/BonoboXObject/BonoboObject/ (for BONOBO_DISABLE_DEPRECATED)

Browse Source 
* s/BonoboXObject/BonoboObject/ (for BONOBO_DISABLE_DEPRECATED)

svn path=/trunk/; revision=19427
This commit is contained in:
Dan Winship
2003-01-13 18:51:39 +00:00
parent efa11b7781
commit 092ccc49c4
29 changed files with 148 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shell/ChangeLog
View File

@ -1,3 +1,7 @@
2003-01-13 Dan Winship <danw@ximian.com>
* s/BonoboXObject/BonoboObject/ (for BONOBO_DISABLE_DEPRECATED)
2003-01-10 Ettore Perazzoli <ettore@ximian.com>
* evolution-shell-component.c (impl_setOwner): Don't duplicate the

15
shell/e-activity-handler.c
View File

@ -40,8 +40,8 @@
#include <bonobo/bonobo-exception.h>
#define PARENT_TYPE bonobo_x_object_get_type ()
static BonoboXObjectClass *parent_class = NULL;
#define PARENT_TYPE bonobo_object_get_type ()
static BonoboObjectClass *parent_class = NULL;
#define ICON_SIZE 16
@ -510,7 +510,7 @@ impl_requestDialog (PortableServer_Servant servant,
/* GTK+ type stuff. */
static void
class_init (GObjectClass *object_class)
e_activity_handler_class_init (GObjectClass *object_class)
{
EActivityHandlerClass *handler_class;
@ -527,7 +527,7 @@ class_init (GObjectClass *object_class)
}
static void
init (EActivityHandler *activity_handler)
e_activity_handler_init (EActivityHandler *activity_handler)
{
EActivityHandlerPrivate *priv;
@ -582,6 +582,7 @@ e_activity_handler_attach_task_bar (EActivityHandler *activity_handler,
}
E_MAKE_X_TYPE (e_activity_handler, "EActivityHandler", EActivityHandler, class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_Activity__init,
G_STRUCT_OFFSET (EActivityHandlerClass, epv))
BONOBO_TYPE_FUNC_FULL (EActivityHandler,
GNOME_Evolution_Activity,
PARENT_TYPE,
e_activity_handler)

6
shell/e-activity-handler.h
View File

@ -27,7 +27,7 @@
#include "e-task-bar.h"
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#ifdef __cplusplus
extern "C" {
@ -46,13 +46,13 @@ typedef struct _EActivityHandlerPrivate EActivityHandlerPrivate;
typedef struct _EActivityHandlerClass EActivityHandlerClass;
struct _EActivityHandler {
BonoboXObject parent;
BonoboObject parent;
EActivityHandlerPrivate *priv;
};
struct _EActivityHandlerClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_Activity__epv epv;
};

16
shell/e-corba-shortcuts.c
View File

@ -33,8 +33,8 @@
#include <gal/util/e-util.h>
#define PARENT_TYPE bonobo_x_object_get_type ()
static BonoboXObjectClass *parent_class = NULL;
#define PARENT_TYPE bonobo_object_get_type ()
static BonoboObjectClass *parent_class = NULL;
struct _ECorbaShortcutsPrivate {
EShortcuts *shortcuts;
@ -292,7 +292,7 @@ impl__get_groups (PortableServer_Servant servant,
static void
class_init (GObjectClass *object_class)
e_corba_shortcuts_class_init (GObjectClass *object_class)
{
ECorbaShortcutsClass *corba_shortcuts_class;
POA_GNOME_Evolution_Shortcuts__epv *epv;
@ -315,7 +315,7 @@ class_init (GObjectClass *object_class)
}
static void
init (ECorbaShortcuts *corba_shortcuts)
e_corba_shortcuts_init (ECorbaShortcuts *corba_shortcuts)
{
ECorbaShortcutsPrivate *priv;
@ -343,7 +343,7 @@ e_corba_shortcuts_new (EShortcuts *shortcuts)
}
E_MAKE_X_TYPE (e_corba_shortcuts, "ECorbaShortcuts", ECorbaShortcuts,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_Shortcuts__init,
G_STRUCT_OFFSET (ECorbaShortcutsClass, epv))
BONOBO_TYPE_FUNC_FULL (ECorbaShortcuts,
GNOME_Evolution_Shortcuts,
PARENT_TYPE,
e_corba_shortcuts)

6
shell/e-corba-shortcuts.h
View File

@ -25,7 +25,7 @@
#include "e-shortcuts.h"
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#ifdef __cplusplus
extern "C" {
@ -44,13 +44,13 @@ typedef struct _ECorbaShortcutsPrivate ECorbaShortcutsPrivate;
typedef struct _ECorbaShortcutsClass ECorbaShortcutsClass;
struct _ECorbaShortcuts {
BonoboXObject parent;
BonoboObject parent;
ECorbaShortcutsPrivate *priv;
};
struct _ECorbaShortcutsClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_Shortcuts__epv epv;
};

16
shell/e-corba-storage-registry.c
View File

@ -37,8 +37,8 @@
#include <string.h>
#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
static BonoboXObjectClass *parent_class = NULL;
#define PARENT_TYPE BONOBO_OBJECT_TYPE
static BonoboObjectClass *parent_class = NULL;
struct _ECorbaStorageRegistryPrivate {
EStorageSet *storage_set;
@ -424,7 +424,7 @@ impl_finalize (GObject *object)
/* Initialization. */
static void
class_init (ECorbaStorageRegistryClass *klass)
e_corba_storage_registry_class_init (ECorbaStorageRegistryClass *klass)
{
GObjectClass *object_class;
POA_GNOME_Evolution_StorageRegistry__epv *epv;
@ -446,7 +446,7 @@ class_init (ECorbaStorageRegistryClass *klass)
}
static void
init (ECorbaStorageRegistry *corba_storage_registry)
e_corba_storage_registry_init (ECorbaStorageRegistry *corba_storage_registry)
{
ECorbaStorageRegistryPrivate *priv;
@ -488,7 +488,7 @@ e_corba_storage_registry_new (EStorageSet *storage_set)
}
E_MAKE_X_TYPE (e_corba_storage_registry, "ECorbaStorageRegistry", ECorbaStorageRegistry,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_StorageRegistry__init,
G_STRUCT_OFFSET (ECorbaStorageRegistryClass, epv))
BONOBO_TYPE_FUNC_FULL (ECorbaStorageRegistry,
GNOME_Evolution_StorageRegistry,
PARENT_TYPE,
e_corba_storage_registry)

6
shell/e-corba-storage-registry.h
View File

@ -23,7 +23,7 @@
#ifndef __E_CORBA_STORAGE_REGISTRY_H__
#define __E_CORBA_STORAGE_REGISTRY_H__
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#include "Evolution.h"
#include "e-storage-set.h"
@ -45,13 +45,13 @@ typedef struct _ECorbaStorageRegistryPrivate ECorbaStorageRegistryPrivate;
typedef struct _ECorbaStorageRegistryClass ECorbaStorageRegistryClass;
struct _ECorbaStorageRegistry {
BonoboXObject parent;
BonoboObject parent;
ECorbaStorageRegistryPrivate *priv;
};
struct _ECorbaStorageRegistryClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_StorageRegistry__epv epv;
};

16
shell/e-shell.c
View File

@ -81,8 +81,8 @@
#include "Evolution.h"
#define PARENT_TYPE bonobo_x_object_get_type ()
static BonoboXObjectClass *parent_class = NULL;
#define PARENT_TYPE bonobo_object_get_type ()
static BonoboObjectClass *parent_class = NULL;
struct _EShellPrivate {
/* IID for registering the object on OAF. */
@ -1161,7 +1161,7 @@ impl_finalize (GObject *object)
/* Initialization. */
static void
class_init (EShellClass *klass)
e_shell_class_init (EShellClass *klass)
{
GObjectClass *object_class;
POA_GNOME_Evolution_Shell__epv *epv;
@ -1214,7 +1214,7 @@ class_init (EShellClass *klass)
}
static void
init (EShell *shell)
e_shell_init (EShell *shell)
{
EShellPrivate *priv;
@ -2266,7 +2266,7 @@ e_shell_parse_uri (EShell *shell,
}
E_MAKE_X_TYPE (e_shell, "EShell", EShell,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_Shell__init,
G_STRUCT_OFFSET (EShellClass, epv));
BONOBO_TYPE_FUNC_FULL (EShell,
GNOME_Evolution_Shell,
PARENT_TYPE,
e_shell)

6
shell/e-shell.h
View File

@ -24,7 +24,7 @@
#define _E_SHELL_H_
#include <bonobo-activation/bonobo-activation.h>
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#ifdef __cplusplus
extern "C" {
@ -66,13 +66,13 @@ enum _EShellStartupLineMode {
typedef enum _EShellStartupLineMode EShellStartupLineMode;
struct _EShell {
BonoboXObject parent;
BonoboObject parent;
EShellPrivate *priv;
};
struct _EShellClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_Shell__epv epv;

16
shell/evolution-config-control.c
View File

@ -36,8 +36,8 @@
#include <bonobo/bonobo-event-source.h>
#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
static BonoboXObjectClass *parent_class = NULL;
#define PARENT_TYPE BONOBO_OBJECT_TYPE
static BonoboObjectClass *parent_class = NULL;
struct _EvolutionConfigControlPrivate {
gboolean changed;
@ -140,7 +140,7 @@ impl__get_eventSource (PortableServer_Servant servant,
static void
class_init (EvolutionConfigControlClass *class)
evolution_config_control_class_init (EvolutionConfigControlClass *class)
{
POA_GNOME_Evolution_ConfigControl__epv *epv;
GObjectClass *object_class;
@ -166,7 +166,7 @@ class_init (EvolutionConfigControlClass *class)
}
static void
init (EvolutionConfigControl *config_control)
evolution_config_control_init (EvolutionConfigControl *config_control)
{
EvolutionConfigControlPrivate *priv;
@ -235,7 +235,7 @@ evolution_config_control_changed (EvolutionConfigControl *config_control)
}
E_MAKE_X_TYPE (evolution_config_control, "EvolutionConfigControl", EvolutionConfigControl,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_ConfigControl__init,
G_STRUCT_OFFSET (EvolutionConfigControlClass, epv))
BONOBO_TYPE_FUNC_FULL (EvolutionConfigControl,
GNOME_Evolution_ConfigControl,
PARENT_TYPE,
evolution_config_control)

6
shell/evolution-config-control.h
View File

@ -25,7 +25,7 @@
#include "Evolution.h"
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#include <gtk/gtkwidget.h>
#ifdef cplusplus
@ -44,13 +44,13 @@ typedef struct _EvolutionConfigControlPrivate EvolutionConfigControlPrivate;
typedef struct _EvolutionConfigControlClass EvolutionConfigControlClass;
struct _EvolutionConfigControl {
BonoboXObject parent;
BonoboObject parent;
EvolutionConfigControlPrivate *priv;
};
struct _EvolutionConfigControlClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_ConfigControl__epv epv;

16
shell/evolution-session.c
View File

@ -34,8 +34,8 @@
#include "e-shell-marshal.h"
#define PARENT_TYPE bonobo_x_object_get_type ()
static BonoboXObjectClass *parent_class = NULL;
#define PARENT_TYPE bonobo_object_get_type ()
static BonoboObjectClass *parent_class = NULL;
struct _EvolutionSessionPrivate {
int dummy;
@ -113,7 +113,7 @@ corba_class_init (EvolutionSessionClass *klass)
}
static void
class_init (EvolutionSessionClass *klass)
evolution_session_class_init (EvolutionSessionClass *klass)
{
GObjectClass *object_class;
@ -146,7 +146,7 @@ class_init (EvolutionSessionClass *klass)
}
static void
init (EvolutionSession *session)
evolution_session_init (EvolutionSession *session)
{
EvolutionSessionPrivate *priv;
@ -163,7 +163,7 @@ evolution_session_new (void)
}
E_MAKE_X_TYPE (evolution_session, "EvolutionSession", EvolutionSession,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_Session__init,
G_STRUCT_OFFSET (EvolutionSessionClass, epv))
BONOBO_TYPE_FUNC_FULL (EvolutionSession,
GNOME_Evolution_Session,
PARENT_TYPE,
evolution_session)

6
shell/evolution-session.h
View File

@ -23,7 +23,7 @@
#ifndef __EVOLUTION_SESSION_H__
#define __EVOLUTION_SESSION_H__
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#ifdef __cplusplus
extern "C" {
@ -42,13 +42,13 @@ typedef struct _EvolutionSessionPrivate EvolutionSessionPrivate;
typedef struct _EvolutionSessionClass EvolutionSessionClass;
struct _EvolutionSession {
BonoboXObject parent;
BonoboObject parent;
EvolutionSessionPrivate *priv;
};
struct _EvolutionSessionClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_Session__epv epv;

29
shell/evolution-shell-component-dnd.c
View File

@ -27,9 +27,9 @@
#include <gtk/gtkobject.h>
#define PARENT_TYPE (bonobo_x_object_get_type ())
#define PARENT_TYPE (bonobo_object_get_type ())
static BonoboXObjectClass *parent_class;
static BonoboObjectClass *parent_class;
/* Source Folder stuff */
@ -149,14 +149,10 @@ evolution_shell_component_dnd_source_folder_init (EvolutionShellComponentDndSour
folder->priv = priv;
}
E_MAKE_X_TYPE (evolution_shell_component_dnd_source_folder,
"EvolutionShellComponentDndSourceFolder",
EvolutionShellComponentDndSourceFolder,
evolution_shell_component_dnd_source_folder_class_init,
evolution_shell_component_dnd_source_folder_init,
PARENT_TYPE,
POA_GNOME_Evolution_ShellComponentDnd_SourceFolder__init,
G_STRUCT_OFFSET (EvolutionShellComponentDndSourceFolderClass, epv))
BONOBO_TYPE_FUNC_FULL (EvolutionShellComponentDndSourceFolder,
GNOME_Evolution_ShellComponentDnd_SourceFolder,
PARENT_TYPE,
evolution_shell_component_dnd_source_folder)
EvolutionShellComponentDndSourceFolder*
evolution_shell_component_dnd_source_folder_new (DndSourceFolderBeginDragFn begin_drag,
@ -272,15 +268,10 @@ evolution_shell_component_dnd_destination_folder_init (EvolutionShellComponentDn
folder->priv = priv;
}
E_MAKE_X_TYPE (evolution_shell_component_dnd_destination_folder,
"EvolutionShellComponentDndDestinationFolder",
EvolutionShellComponentDndDestinationFolder,
evolution_shell_component_dnd_destination_folder_class_init,
evolution_shell_component_dnd_destination_folder_init,
PARENT_TYPE,
POA_GNOME_Evolution_ShellComponentDnd_DestinationFolder__init,
G_STRUCT_OFFSET (EvolutionShellComponentDndDestinationFolderClass, epv))
BONOBO_TYPE_FUNC_FULL (EvolutionShellComponentDndDestinationFolder,
GNOME_Evolution_ShellComponentDnd_DestinationFolder,
PARENT_TYPE,
evolution_shell_component_dnd_destination_folder)
EvolutionShellComponentDndDestinationFolder *
evolution_shell_component_dnd_destination_folder_new (DndDestinationFolderHandleMotionFn handle_motion,

10
shell/evolution-shell-component-dnd.h
View File

@ -23,7 +23,7 @@
#ifndef EVOLUTION_SHELL_COMPONENT_DND_H
#define EVOLUTION_SHELL_COMPONENT_DND_H
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#include <gtk/gtktypeutils.h>
#include "Evolution.h"
@ -65,12 +65,12 @@ typedef void (*DndSourceFolderEndDragFn)(EvolutionShellComponentDndSourceFolder
gpointer closure);
struct _EvolutionShellComponentDndSourceFolder {
BonoboXObject object;
BonoboObject object;
DndSourceFolderPrivate *priv;
};
struct _EvolutionShellComponentDndSourceFolderClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_ShellComponentDnd_SourceFolder__epv epv;
};
@ -112,12 +112,12 @@ typedef CORBA_boolean (*DndDestinationFolderHandleDropFn)(EvolutionShellComponen
gpointer closure);
struct _EvolutionShellComponentDndDestinationFolder {
BonoboXObject object;
BonoboObject object;
DndDestinationFolderPrivate *priv;
};
struct _EvolutionShellComponentDndDestinationFolderClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_ShellComponentDnd_DestinationFolder__epv epv;
};

16
shell/evolution-shell-component.c
View File

@ -43,9 +43,9 @@
#define PING_DELAY 10000
#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
#define PARENT_TYPE BONOBO_OBJECT_TYPE
static BonoboXObjectClass *parent_class = NULL;
static BonoboObjectClass *parent_class = NULL;
struct _UserCreatableItemType {
char *id;
@ -858,7 +858,7 @@ impl_owner_died (EvolutionShellComponent *shell_component)
/* Initialization. */
static void
class_init (EvolutionShellComponentClass *klass)
evolution_shell_component_class_init (EvolutionShellComponentClass *klass)
{
EvolutionShellComponentClass *shell_component_class;
GObjectClass *object_class;
@ -973,7 +973,7 @@ class_init (EvolutionShellComponentClass *klass)
}
static void
init (EvolutionShellComponent *shell_component)
evolution_shell_component_init (EvolutionShellComponent *shell_component)
{
EvolutionShellComponentPrivate *priv;
@ -1191,7 +1191,7 @@ evolution_shell_component_result_to_string (EvolutionShellComponentResult result
}
E_MAKE_X_TYPE (evolution_shell_component, "EvolutionShellComponent", EvolutionShellComponent,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_ShellComponent__init,
G_STRUCT_OFFSET (EvolutionShellComponentClass, epv))
BONOBO_TYPE_FUNC_FULL (EvolutionShellComponent,
GNOME_Evolution_ShellComponent,
PARENT_TYPE,
evolution_shell_component)

6
shell/evolution-shell-component.h
View File

@ -29,7 +29,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#include <bonobo/bonobo-control.h>
#ifdef cplusplus
@ -134,13 +134,13 @@ struct _EvolutionShellComponentFolderType {
typedef struct _EvolutionShellComponentFolderType EvolutionShellComponentFolderType;
struct _EvolutionShellComponent {
BonoboXObject parent;
BonoboObject parent;
EvolutionShellComponentPrivate *priv;
};
struct _EvolutionShellComponentClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_ShellComponent__epv epv;

18
shell/evolution-shell-view.c
View File

@ -33,8 +33,8 @@
#include "e-shell-marshal.h"
#define PARENT_TYPE bonobo_x_object_get_type ()
static BonoboXObjectClass *parent_class = NULL;
#define PARENT_TYPE bonobo_object_get_type ()
static BonoboObjectClass *parent_class = NULL;
struct _EvolutionShellViewPrivate {
int dummy;
@ -146,7 +146,7 @@ impl_finalize (GObject *object)
static void
class_init (EvolutionShellViewClass *klass)
evolution_shell_view_class_init (EvolutionShellViewClass *klass)
{
POA_GNOME_Evolution_ShellView__epv *epv;
GObjectClass *object_class;
@ -222,11 +222,11 @@ class_init (EvolutionShellViewClass *klass)
e_shell_marshal_NONE__NONE,
G_TYPE_NONE, 0);
parent_class = g_type_class_ref(bonobo_x_object_get_type ());
parent_class = g_type_class_ref(bonobo_object_get_type ());
}
static void
init (EvolutionShellView *shell_view)
evolution_shell_view_init (EvolutionShellView *shell_view)
{
EvolutionShellViewPrivate *priv;
@ -252,7 +252,7 @@ evolution_shell_view_new (void)
}
E_MAKE_X_TYPE (evolution_shell_view, "EvolutionShellView", EvolutionShellView,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_ShellView__init,
G_STRUCT_OFFSET (EvolutionShellViewClass, epv))
BONOBO_TYPE_FUNC_FULL (EvolutionShellView,
GNOME_Evolution_ShellView,
PARENT_TYPE,
evolution_shell_view)

6
shell/evolution-shell-view.h
View File

@ -24,7 +24,7 @@
#define __EVOLUTION_SHELL_VIEW_H__
#include <glib.h>
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#include "Evolution.h"
@ -45,13 +45,13 @@ typedef struct _EvolutionShellViewPrivate EvolutionShellViewPrivate;
typedef struct _EvolutionShellViewClass EvolutionShellViewClass;
struct _EvolutionShellView {
BonoboXObject parent;
BonoboObject parent;
EvolutionShellViewPrivate *priv;
};
struct _EvolutionShellViewClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
/* Signals. */

12
shell/evolution-storage-set-view.c
View File

@ -404,7 +404,7 @@ impl_finalize (GObject *object)
static void
class_init (EvolutionStorageSetViewClass *klass)
evolution_storage_set_view_class_init (EvolutionStorageSetViewClass *klass)
{
POA_GNOME_Evolution_StorageSetView__epv *epv;
GObjectClass *object_class;
@ -427,7 +427,7 @@ class_init (EvolutionStorageSetViewClass *klass)
}
static void
init (EvolutionStorageSetView *storage_set_view)
evolution_storage_set_view_init (EvolutionStorageSetView *storage_set_view)
{
EvolutionStorageSetViewPrivate *priv;
@ -475,7 +475,7 @@ evolution_storage_set_view_new (EStorageSetView *storage_set_view_widget)
}
E_MAKE_X_TYPE (evolution_storage_set_view, "EvolutionStorageSetView", EvolutionStorageSetView,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_StorageSetView__init,
G_STRUCT_OFFSET (EvolutionStorageSetViewClass, epv))
BONOBO_TYPE_FUNC_FULL (EvolutionStorageSetView,
GNOME_Evolution_StorageSetView,
PARENT_TYPE,
evolution_storage_set_view)

6
shell/evolution-storage-set-view.h
View File

@ -23,7 +23,7 @@
#ifndef _EVOLUTION_STORAGE_SET_VIEW_H_
#define _EVOLUTION_STORAGE_SET_VIEW_H_
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#include "e-storage-set-view.h"
@ -46,13 +46,13 @@ typedef struct _EvolutionStorageSetViewPrivate EvolutionStorageSetViewPrivate;
typedef struct _EvolutionStorageSetViewClass EvolutionStorageSetViewClass;
struct _EvolutionStorageSetView {
BonoboXObject parent;
BonoboObject parent;
EvolutionStorageSetViewPrivate *priv;
};
struct _EvolutionStorageSetViewClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_StorageSetView__epv epv;
};

14
shell/evolution-storage.c
View File

@ -45,7 +45,7 @@
#define PARENT_TYPE BONOBO_OBJECT_TYPE
static BonoboXObjectClass *parent_class = NULL;
static BonoboObjectClass *parent_class = NULL;
struct _FolderPropertyItem {
char *label;
@ -677,7 +677,7 @@ impl_finalize (GObject *object)
static void
class_init (EvolutionStorageClass *klass)
evolution_storage_class_init (EvolutionStorageClass *klass)
{
POA_GNOME_Evolution_Storage__epv *epv;
GObjectClass *object_class;
@ -814,7 +814,7 @@ class_init (EvolutionStorageClass *klass)
}
static void
init (EvolutionStorage *storage)
evolution_storage_init (EvolutionStorage *storage)
{
EvolutionStoragePrivate *priv;
@ -1340,7 +1340,7 @@ evolution_storage_add_property_item (EvolutionStorage *evolution_storage,
}
E_MAKE_X_TYPE (evolution_storage, "EvolutionStorage", EvolutionStorage,
class_init, init, PARENT_TYPE,
POA_GNOME_Evolution_Storage__init,
G_STRUCT_OFFSET (EvolutionStorageClass, epv))
BONOBO_TYPE_FUNC_FULL (EvolutionStorage,
GNOME_Evolution_Storage,
PARENT_TYPE,
evolution_storage)

6
shell/evolution-storage.h
View File

@ -30,7 +30,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#ifdef __cplusplus
extern "C" {
@ -76,13 +76,13 @@ enum _EvolutionStorageResult {
typedef enum _EvolutionStorageResult EvolutionStorageResult;
struct _EvolutionStorage {
BonoboXObject parent;
BonoboObject parent;
EvolutionStoragePrivate *priv;
};
struct _EvolutionStorageClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
/* signals */
void (*create_folder) (EvolutionStorage *storage,

6
shell/evolution-wizard.c
View File

@ -56,7 +56,7 @@ enum {
LAST_SIGNAL
};
#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
#define PARENT_TYPE BONOBO_OBJECT_TYPE
static GtkObjectClass *parent_class;
static guint32 signals[LAST_SIGNAL] = { 0 };
@ -258,8 +258,8 @@ evolution_wizard_init (EvolutionWizard *wizard)
wizard->priv = g_new0 (EvolutionWizardPrivate, 1);
}
BONOBO_X_TYPE_FUNC_FULL (EvolutionWizard, GNOME_Evolution_Wizard,
PARENT_TYPE, evolution_wizard);
BONOBO_TYPE_FUNC_FULL (EvolutionWizard, GNOME_Evolution_Wizard,
PARENT_TYPE, evolution_wizard);
EvolutionWizard *
evolution_wizard_construct (EvolutionWizard *wizard,

6
shell/evolution-wizard.h
View File

@ -9,7 +9,7 @@
#ifndef __EVOLUTION_WIZARD_H__
#define __EVOLUTION_WIZARD_H__
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-event-source.h>
@ -33,13 +33,13 @@ typedef BonoboControl *(* EvolutionWizardGetControlFn) (EvolutionWizard *wizard,
void *closure);
struct _EvolutionWizard {
BonoboXObject object;
BonoboObject object;
EvolutionWizardPrivate *priv;
};
typedef struct {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_Wizard__epv epv;

8
shell/importer/evolution-importer-listener.c
View File

@ -30,7 +30,7 @@
#include <gal/util/e-util.h>
#include "GNOME_Evolution_Importer.h"
#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
#define PARENT_TYPE BONOBO_OBJECT_TYPE
static BonoboObjectClass *parent_class = NULL;
@ -219,6 +219,6 @@ evolution_importer_listener_new (EvolutionImporterListenerCallback callback,
return listener;
}
BONOBO_X_TYPE_FUNC_FULL (EvolutionImporterListener,
GNOME_Evolution_ImporterListener,
PARENT_TYPE, evolution_importer_listener);
BONOBO_TYPE_FUNC_FULL (EvolutionImporterListener,
GNOME_Evolution_ImporterListener,
PARENT_TYPE, evolution_importer_listener);

6
shell/importer/evolution-importer-listener.h
View File

@ -24,7 +24,7 @@
#define EVOLUTION_IMPORTER_LISTENER_H
#include <glib.h>
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#include <importer/GNOME_Evolution_Importer.h>
#include "evolution-importer.h"
@ -48,13 +48,13 @@ typedef void (* EvolutionImporterListenerCallback) (EvolutionImporterListener *l
gboolean more_items,
void *closure);
struct _EvolutionImporterListener {
BonoboXObject parent;
BonoboObject parent;
EvolutionImporterListenerPrivate *priv;
};
struct _EvolutionImporterListenerClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_ImporterListener__epv epv;
};

10
shell/importer/evolution-importer.c
View File

@ -31,7 +31,7 @@
#include "GNOME_Evolution_Importer.h"
#define PARENT_TYPE BONOBO_X_OBJECT_TYPE
#define PARENT_TYPE BONOBO_OBJECT_TYPE
static BonoboObjectClass *parent_class = NULL;
struct _EvolutionImporterPrivate {
@ -223,7 +223,7 @@ evolution_importer_new (EvolutionImporterSupportFormatFn support_format_fn,
return importer;
}
BONOBO_X_TYPE_FUNC_FULL (EvolutionImporter,
GNOME_Evolution_Importer,
PARENT_TYPE,
evolution_importer);
BONOBO_TYPE_FUNC_FULL (EvolutionImporter,
GNOME_Evolution_Importer,
PARENT_TYPE,
evolution_importer);

6
shell/importer/evolution-importer.h
View File

@ -24,7 +24,7 @@
#define EVOLUTION_IMPORTER_H
#include <glib.h>
#include <bonobo/bonobo-xobject.h>
#include <bonobo/bonobo-object.h>
#include <importer/GNOME_Evolution_Importer.h>
#ifdef __cplusplus
@ -69,13 +69,13 @@ typedef enum {
} EvolutionImporterResult;
struct _EvolutionImporter {
BonoboXObject parent;
BonoboObject parent;
EvolutionImporterPrivate *priv;
};
struct _EvolutionImporterClass {
BonoboXObjectClass parent_class;
BonoboObjectClass parent_class;
POA_GNOME_Evolution_Importer__epv epv;
};