diff options
| -rw-r--r-- | shell/ChangeLog | 3 | ||||
| -rw-r--r-- | shell/importer/evolution-intelligent-importer.c | 10 | ||||
| -rw-r--r-- | shell/importer/evolution-intelligent-importer.h | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index 580281abe5..02e3bd0610 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,5 +1,8 @@ 2003-02-05 Dan Winship <danw@ximian.com> + * importer/evolution-intelligent-importer.c: + s/BonoboXObject/BonoboObject/ + * e-folder-list.c (e_folder_list_class_init): s/glade_gnome_init/glade_init/ diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c index 79450a8458..e9d40d0f6d 100644 --- a/shell/importer/evolution-intelligent-importer.c +++ b/shell/importer/evolution-intelligent-importer.c @@ -30,7 +30,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 _EvolutionIntelligentImporterPrivate { @@ -191,7 +191,7 @@ evolution_intelligent_importer_new (EvolutionIntelligentImporterCanImportFn can_ return ii; } -BONOBO_X_TYPE_FUNC_FULL (EvolutionIntelligentImporter, - GNOME_Evolution_IntelligentImporter, - PARENT_TYPE, - evolution_intelligent_importer); +BONOBO_TYPE_FUNC_FULL (EvolutionIntelligentImporter, + GNOME_Evolution_IntelligentImporter, + PARENT_TYPE, + evolution_intelligent_importer); diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h index 814bb9ad24..d51177f817 100644 --- a/shell/importer/evolution-intelligent-importer.h +++ b/shell/importer/evolution-intelligent-importer.h @@ -24,7 +24,7 @@ #define EVOLUTION_INTELLIGENT_IMPORTER_H #include <glib.h> -#include <bonobo/bonobo-xobject.h> +#include <bonobo/bonobo-object.h> #include <importer/GNOME_Evolution_Importer.h> #ifdef __cplusplus @@ -48,13 +48,13 @@ typedef void (* EvolutionIntelligentImporterImportDataFn) (EvolutionIntelligentI void *closure); struct _EvolutionIntelligentImporter { - BonoboXObject parent; + BonoboObject parent; EvolutionIntelligentImporterPrivate *priv; }; struct _EvolutionIntelligentImporterClass { - BonoboXObjectClass parent_class; + BonoboObjectClass parent_class; POA_GNOME_Evolution_IntelligentImporter__epv epv; }; |