diff options
| -rw-r--r-- | mail/mail-account-editor-news.c | 28 | ||||
| -rw-r--r-- | mail/mail-account-editor-news.h | 2 | ||||
| -rw-r--r-- | mail/mail-accounts.c | 8 |
3 files changed, 19 insertions, 19 deletions
diff --git a/mail/mail-account-editor-news.c b/mail/mail-account-editor-news.c index 34aeea247a..2b5d80f785 100644 --- a/mail/mail-account-editor-news.c +++ b/mail/mail-account-editor-news.c @@ -141,21 +141,21 @@ cancel_clicked (GtkWidget *widget, gpointer data) gtk_widget_destroy (GTK_WIDGET (editor)); } -MailAccountEditorNews * +GtkWidget * mail_account_editor_news_new (MailConfigService *service) { MailAccountEditorNews *editor; GtkEntry *service_ent; editor = (MailAccountEditorNews *) gtk_type_new (mail_account_editor_news_get_type ()); - + editor->service = service; editor->xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-config.glade", NULL); - + /* get our toplevel widget and reparent it */ editor->notebook = GTK_NOTEBOOK (glade_xml_get_widget (editor->xml, "news_editor_notebook")); gtk_widget_reparent (GTK_WIDGET (editor->notebook), GNOME_DIALOG (editor)->vbox); - + /* give our dialog an OK button and title */ gtk_window_set_title (GTK_WINDOW (editor), _("Evolution News Editor")); gtk_window_set_policy (GTK_WINDOW (editor), FALSE, TRUE, TRUE); @@ -165,7 +165,7 @@ mail_account_editor_news_new (MailConfigService *service) GNOME_STOCK_BUTTON_APPLY, GNOME_STOCK_BUTTON_CANCEL, NULL); - + gnome_dialog_button_connect (GNOME_DIALOG (editor), 0 /* OK */, GTK_SIGNAL_FUNC (ok_clicked), editor); @@ -175,19 +175,19 @@ mail_account_editor_news_new (MailConfigService *service) gnome_dialog_button_connect (GNOME_DIALOG (editor), 2 /* CANCEL */, GTK_SIGNAL_FUNC (cancel_clicked), editor); - - if(service->url) { + + if (service->url) { CamelURL *url; - url = camel_url_new(service->url, NULL); + url = camel_url_new (service->url, NULL); - if(url->host) { - service_ent = GTK_ENTRY(glade_xml_get_widget(editor->xml, "source_name")); - gtk_entry_set_text(service_ent, url->host); + if (url->host) { + service_ent = GTK_ENTRY (glade_xml_get_widget (editor->xml, "source_name")); + gtk_entry_set_text (service_ent, url->host); } - camel_url_free(url); + camel_url_free (url); } - - return editor; + + return GTK_WIDGET (editor); } diff --git a/mail/mail-account-editor-news.h b/mail/mail-account-editor-news.h index a89b60eab5..b7c04fb305 100644 --- a/mail/mail-account-editor-news.h +++ b/mail/mail-account-editor-news.h @@ -63,7 +63,7 @@ typedef struct { GtkType mail_account_editor_news_get_type (void); -MailAccountEditorNews *mail_account_editor_news_new (MailConfigService *service); +GtkWidget *mail_account_editor_news_new (MailConfigService *service); #ifdef __cplusplus } diff --git a/mail/mail-accounts.c b/mail/mail-accounts.c index ce3dbde470..24ffaae30f 100644 --- a/mail/mail-accounts.c +++ b/mail/mail-accounts.c @@ -460,7 +460,7 @@ mail_accounts_load (MailAccountsTab *prefs) #ifdef ENABLE_NNTP static void -load_news (MailAccountsTab *prefs) +news_load (MailAccountsTab *prefs) { const MailConfigService *service; const GSList *node; @@ -528,7 +528,7 @@ news_editor_destroyed (GtkWidget *widget, gpointer user_data) { MailAccountsTab *prefs = user_data; - load_news (prefs); + news_load (prefs); prefs->news_editor = NULL; } @@ -564,12 +564,12 @@ news_add_destroyed (GtkWidget *widget, gpointer user_data) prefs = send[1]; g_free (send); - load_news (prefs); + news_load (prefs); mail_load_storage_by_uri (prefs->shell, service->url, NULL); /* FIXME: why do we re-load? */ - load_news (prefs); + news_load (prefs); } static void |