From 9e4f25d532f59d85034cbef768bb941f748fb1f2 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 13 Nov 2002 04:40:07 +0000 Subject: Added to cvs. Currently contains no configurable stuff, but maybe it will 2002-11-13 Not Zed * GNOME_Evolution_Mail.server.in.in: Added to cvs. Currently contains no configurable stuff, but maybe it will one day. * Makefile.am (server_DATA): change oaf stuff to server stuff for bonobo activation. * mail-preferences.c (mail_preferences_apply): handle const entry text. * mail-composer-prefs.c (url_requested): Fixed typo. (mail_composer_prefs_construct): gnomepixmap->gtkimage. * mail-callbacks.c (configure_mail): destroy dialogue before dealing with response. (mail_generate_reply): Fix a typo. (popup_listener_cb): fix prototype. (tag_editor_response): Handle gtk dialog response. (flag_for_followup): Change gnome dialog to gtk dialog stuff. (tag_editor_destroy_cb): (tag_editor_cancel): (tag_editor_ok): Removed, handled in _response(). (filter_editor_response): renamed from _clicked, handle gtk dialogue signal. (filter_editor_destroy): Removed. (footer_info_new): gnome font api changes. (do_mail_print): port to gnome print 2. * mail-autofilter.c (mail_filter_delete_uri): message_dialog uses a specific button enum, not the stock ones. * mail-accounts.c (mail_accounts_tab_get_type): gobjectify. (account_delete_clicked): gdkdialogise. * mail-account-gui.c (mail_account_gui_setup): Hack around font metric determination code. * mail-account-editor.c (mail_account_editor_get_type): gobjectise. (mail_account_editor_new): "" * folder-info.c (evolution_folder_info_notify_ready): use pbclient interface. * folder-browser-factory.c (control_destroy_cb): fix a typo. (folder_browser_factory_new_control): More typos. * folder-browser.c (on_right_click): cast around const warning. (context_menu_position_func): fix for api change. * e-searching-tokenizer.c (e_searching_tokenizer_finalise): Changed from destroy since it only frees memory. (e_searching_tokenizer_get_type): glibify. * component-factory.c (request_quit): gtkdialogise. (send_receive_cb): " (create_component): gdk_pixbuf api. (component_factory_init): bonobo activation stuff. (warning_response): renamed from warning_clicked. (owner_set_cb): gtkdialogise. svn path=/trunk/; revision=18731 --- mail/mail-account-editor.c | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'mail/mail-account-editor.c') diff --git a/mail/mail-account-editor.c b/mail/mail-account-editor.c index 69de0a66d4..751c95519b 100644 --- a/mail/mail-account-editor.c +++ b/mail/mail-account-editor.c @@ -29,8 +29,6 @@ #include #include #include -#include -#include #include #include @@ -43,24 +41,23 @@ static void mail_account_editor_finalize (GObject *obj); static GtkDialogClass *parent_class = NULL; -GtkType +GType mail_account_editor_get_type () { static GtkType type = 0; if (!type) { - GtkTypeInfo type_info = { - "MailAccountEditor", - sizeof (MailAccountEditor), + GTypeInfo type_info = { sizeof (MailAccountEditorClass), - (GtkClassInitFunc) mail_account_editor_class_init, - (GtkObjectInitFunc) NULL, - /* reserved_1 */ NULL, - /* reserved_2 */ NULL, - (GtkClassInitFunc) NULL, + NULL, NULL, + (GClassInitFunc) mail_account_editor_class_init, + NULL, NULL, + sizeof (MailAccountEditor), + 0, + NULL }; - type = gtk_type_unique (gtk_dialog_get_type (), &type_info); + type = g_type_register_static (gtk_dialog_get_type (), "MailAccountEditor", &type_info, 0); } return type; @@ -71,7 +68,7 @@ mail_account_editor_class_init (MailAccountEditorClass *klass) { GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - parent_class = gtk_type_class (gtk_dialog_get_type ()); + parent_class = g_type_class_ref(gtk_dialog_get_type ()); gobject_class->finalize = mail_account_editor_finalize; } @@ -120,7 +117,7 @@ apply_changes (MailAccountEditor *editor) } static void -editor_response_cb (GtkWidget *widget, int button, gpointr user_data) +editor_response_cb (GtkWidget *widget, int button, gpointer user_data) { MailAccountEditor *editor = user_data; @@ -156,7 +153,7 @@ construct (MailAccountEditor *editor, MailConfigAccount *account, MailAccountsTa GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); - g_signal_connect (editor, "response", GTK_SIGNAL_FUNC (editor_response_cb), editor); + g_signal_connect (editor, "response", G_CALLBACK (editor_response_cb), editor); mail_account_gui_setup (editor->gui, GTK_WIDGET (editor)); @@ -170,8 +167,8 @@ mail_account_editor_new (MailConfigAccount *account, GtkWindow *parent, MailAcco { MailAccountEditor *new; - new = (MailAccountEditor *) gtk_type_new (mail_account_editor_get_type ()); - gtk_widget_set_parent_window ((GtkWidget *) new, parent->window); + new = (MailAccountEditor *) g_object_new(mail_account_editor_get_type (), NULL); + gtk_widget_set_parent_window ((GtkWidget *) new, ((GtkWidget *)parent)->window); construct (new, account, dialog); return new; -- cgit v1.2.3