From abda9814844d31daaf4c6355da9a886c69bda9be Mon Sep 17 00:00:00 2001 From: Not Zed Date: Mon, 18 Nov 2002 11:29:35 +0000 Subject: from clicked_cb. (start_import): gtkdialogise. 2002-11-18 Not Zed * importer/importer.c (dialog_response_cb): from clicked_cb. (start_import): gtkdialogise. * e-shell-importer.c: removed redundant header. (create_html): Removed utf8 from locale stuff. (get_name_from_component_info): oaf->bonobo activation. (get_iid_for_filetype): " (create_plugin_menu): Likewise, and change oafiid to bonoboiid (get_intelligent_importers): " (prepare_intelligent_page): " (show_import_wizard): add null domain to glade_xml_new. (choose_importer_from_list): gtkdialogise. (dialog_response_cb): changed from dialog_clicked_cb. (start_import): gtkdialogise. (show_error): use gtk message box. (error_response_cb): callback to close error box. (show_import_wizard): gnome_druid_page_start/finish -> gnome_druid_page_edge. (prepare_file_page): (filename_changed): set HELP button insensitive. (create_plugin_menu): casts for warnings and fix a typo, set_data->set_data_full. (import_druid_finish): folder_selection_dialog api change(?), allow create. (dialog_weak_notify): renamed from close_dialog(). (show_import_wizard): remove gnome_dialog_close_hides -> its a gtkwindow anyway(!). * Makefile.am (evolution_LDADD): Added back importer. (evolution_SOURCES): Added back importer. * importer/intelligent.c (get_intelligent_importers): bonobo-activationised. (create_gui): gtkdialogise. (intelligent_importer_init): gtkdialogise. (create_gui): remove gnome_util_user_home(). (intelligent_importer_init): " * importer/evolution-importer.c (finalise): from destroy. (evolution_importer_new): type_new->object_new. * importer/evolution-importer-listener.c (finalise): from destroy. (evolution_importer_listener_new): type_new->object_new. * importer/evolution-importer-client.c (destroy): removed, as it wasn't used anyway. (evolution_importer_client_new): g_object_new. (finalise): added, tho doesn't do anythign yet, should it unref the client->objref? This whole class doesn't seem much use. * importer/evolution-importer-client.h: removed bonobo-object-client, change to g_object. * importer/*.[ch]: ran fix script over everything. * importer/evolution-intelligent-importer.c: gobjectise. (finalise): renamed from destroy. (evolution_intelligent_importer_new): gtk_type_new -> g_object_new svn path=/trunk/; revision=18821 --- shell/importer/evolution-importer.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'shell/importer/evolution-importer.h') diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h index eea1eb6078..b4322d091e 100644 --- a/shell/importer/evolution-importer.h +++ b/shell/importer/evolution-importer.h @@ -33,10 +33,10 @@ extern "C" { #endif /* cplusplus */ #define EVOLUTION_TYPE_IMPORTER (evolution_importer_get_type ()) -#define EVOLUTION_IMPORTER(obj) (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_IMPORTER, EvolutionImporter)) -#define EVOLUTION_IMPORTER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_IMPORTER, EvolutionImporterClass)) -#define EVOLUTION_IS_IMPORTER(obj) (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_IMPORTER)) -#define EVOLUTION_IS_IMPORTER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_IMPORTER)) +#define EVOLUTION_IMPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TYPE_IMPORTER, EvolutionImporter)) +#define EVOLUTION_IMPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_IMPORTER, EvolutionImporterClass)) +#define EVOLUTION_IS_IMPORTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EVOLUTION_TYPE_IMPORTER)) +#define EVOLUTION_IS_IMPORTER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_IMPORTER)) typedef struct _EvolutionImporter EvolutionImporter; typedef struct _EvolutionImporterPrivate EvolutionImporterPrivate; @@ -80,7 +80,7 @@ struct _EvolutionImporterClass { POA_GNOME_Evolution_Importer__epv epv; }; -GtkType evolution_importer_get_type (void); +GType evolution_importer_get_type (void); EvolutionImporter *evolution_importer_new (EvolutionImporterSupportFormatFn support_format_fn, EvolutionImporterLoadFileFn load_file_fn, -- cgit v1.2.3