diff options
author | Not Zed <NotZed@Ximian.com> | 2002-11-18 19:29:35 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2002-11-18 19:29:35 +0800 |
commit | abda9814844d31daaf4c6355da9a886c69bda9be (patch) | |
tree | 96d29ba229f701c22f6af2216cb1336d45b0c773 /shell/importer/evolution-importer-listener.c | |
parent | be05081ea93b28c601dcb62a5190200c995c9d4d (diff) | |
download | gsoc2013-evolution-abda9814844d31daaf4c6355da9a886c69bda9be.tar gsoc2013-evolution-abda9814844d31daaf4c6355da9a886c69bda9be.tar.gz gsoc2013-evolution-abda9814844d31daaf4c6355da9a886c69bda9be.tar.bz2 gsoc2013-evolution-abda9814844d31daaf4c6355da9a886c69bda9be.tar.lz gsoc2013-evolution-abda9814844d31daaf4c6355da9a886c69bda9be.tar.xz gsoc2013-evolution-abda9814844d31daaf4c6355da9a886c69bda9be.tar.zst gsoc2013-evolution-abda9814844d31daaf4c6355da9a886c69bda9be.zip |
from clicked_cb. (start_import): gtkdialogise.
2002-11-18 Not Zed <NotZed@Ximian.com>
* 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
Diffstat (limited to 'shell/importer/evolution-importer-listener.c')
-rw-r--r-- | shell/importer/evolution-importer-listener.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c index f67b963cbb..84bcfe3b7e 100644 --- a/shell/importer/evolution-importer-listener.c +++ b/shell/importer/evolution-importer-listener.c @@ -118,9 +118,9 @@ impl_GNOME_Evolution_ImporterListener_notifyResult (PortableServer_Servant serva } -/* GtkObject methods */ +/* GObject methods */ static void -destroy (GtkObject *object) +finalise (GObject *object) { EvolutionImporterListener *listener; EvolutionImporterListenerPrivate *priv; @@ -134,7 +134,7 @@ destroy (GtkObject *object) g_free (priv); listener->priv = NULL; - GTK_OBJECT_CLASS (parent_class)->destroy (object); + G_OBJECT_CLASS (parent_class)->finalize(object); } #if 0 @@ -163,13 +163,13 @@ corba_class_init (void) static void evolution_importer_listener_class_init (EvolutionImporterListenerClass *klass) { - GtkObjectClass *object_class; + GObjectClass *object_class; POA_GNOME_Evolution_ImporterListener__epv *epv = &klass->epv; - object_class = GTK_OBJECT_CLASS (klass); - object_class->destroy = destroy; + object_class = G_OBJECT_CLASS (klass); + object_class->finalize = finalise; - parent_class = gtk_type_class (PARENT_TYPE); + parent_class = g_type_class_ref(PARENT_TYPE); epv->notifyResult = impl_GNOME_Evolution_ImporterListener_notifyResult; } @@ -213,7 +213,7 @@ evolution_importer_listener_new (EvolutionImporterListenerCallback callback, { EvolutionImporterListener *listener; - listener = gtk_type_new (evolution_importer_listener_get_type ()); + listener = g_object_new (evolution_importer_listener_get_type (), NULL); evolution_importer_listener_construct (listener, callback, closure); return listener; |