[anjal] Fix account warning
- From: Srinivasa Ragavan <sragavan src gnome org>
- To: svn-commits-list gnome org
- Subject: [anjal] Fix account warning
- Date: Fri, 29 May 2009 08:01:04 -0400 (EDT)
commit 438599e50f6962611acc7adcaeeb264a45d95c9a
Author: Srinivasa Ragavan <sragavan novell com>
Date: Fri May 29 12:14:06 2009 +0530
Fix account warning
---
src/mail-account-view.c | 176 +++++++++++++++++++++++-----------------------
1 files changed, 88 insertions(+), 88 deletions(-)
diff --git a/src/mail-account-view.c b/src/mail-account-view.c
index dd5670b..f7f9a6c 100644
--- a/src/mail-account-view.c
+++ b/src/mail-account-view.c
@@ -70,8 +70,7 @@ mail_account_view_init (MailAccountView *shell)
static void
mail_account_view_finalize (GObject *object)
{
- MailAccountView *shell = (MailAccountView *)object;
- MailAccountViewPrivate *priv = shell->priv;
+ /*MailAccountView *shell = (MailAccountView *)object;*/
G_OBJECT_CLASS (mail_account_view_parent_class)->finalize (object);
}
@@ -95,6 +94,8 @@ mail_account_view_class_init (MailAccountViewClass *klass)
}
+#ifdef NOT_USED
+
enum {
GMAIL = 0,
YAHOO,
@@ -112,7 +113,6 @@ struct _server_prefill {
{"aol", "imap.aol.com", "smtp.aol.com", "pop", "never"},
{"msn", "pop3.email.msn.com", "smtp.email.msn.com", "pop", "never"}
};
-
static int
check_servers (char *server)
{
@@ -125,7 +125,7 @@ check_servers (char *server)
return -1;
}
-
+#endif
static void
save_identity (MailAccountView *view)
{
@@ -177,8 +177,8 @@ save_identity (MailAccountView *view)
static int
validate_identity (MailAccountView *view)
{
- char *user = e_account_get_string(view->edit->account, E_ACCOUNT_ID_NAME);
- char *email = e_account_get_string(view->edit->account, E_ACCOUNT_ID_ADDRESS);
+ char *user = (char *)e_account_get_string(view->edit->account, E_ACCOUNT_ID_NAME);
+ char *email = (char *)e_account_get_string(view->edit->account, E_ACCOUNT_ID_ADDRESS);
char *tmp;
if (!user || !*user)
@@ -191,7 +191,7 @@ validate_identity (MailAccountView *view)
return 0;
}
-
+#ifdef NOT_USED
static void
save_send (MailAccountView *view)
{
@@ -201,141 +201,143 @@ static void
save_account (MailAccountView *view)
{
}
+#endif
-#define PACK_BOX(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(box, w, FALSE, FALSE, 12); gtk_widget_show(box);
-#define PACK_BOXF(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start(box, w, FALSE, FALSE, 0); gtk_widget_show(box);
+#define PACK_BOX(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 12); gtk_widget_show(box);
+#define PACK_BOXF(w) box = gtk_hbox_new(FALSE, 0); gtk_box_pack_start((GtkBox *)box, w, FALSE, FALSE, 0); gtk_widget_show(box);
static GtkWidget *
create_review (MailAccountView *view)
{
- GtkWidget *table, *box, *tmp, *label, *entry;
+ GtkWidget *table, *box, *label, *entry;
char *uri;
char *enc;
CamelURL *url;
- uri = e_account_get_string(view->edit->account, E_ACCOUNT_SOURCE_URL);
+ uri = (char *)e_account_get_string(view->edit->account, E_ACCOUNT_SOURCE_URL);
if (!uri || (url = camel_url_new(uri, NULL)) == NULL)
- return;
+ return NULL;
table = gtk_table_new (4,2, FALSE);
- gtk_table_set_row_spacings (table, 4);
+ gtk_table_set_row_spacings ((GtkTable *)table, 4);
label = gtk_label_new (NULL);
- gtk_label_set_markup (label, _("<span size=\"large\" weight=\"bold\">Personal details:</span>"));
+ gtk_label_set_markup ((GtkLabel *)label, _("<span size=\"large\" weight=\"bold\">Personal details:</span>"));
gtk_widget_show (label);
PACK_BOXF(label)
- gtk_table_attach (table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 0, 1, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Name:"));
gtk_widget_show (label);
PACK_BOX(label);
- gtk_table_attach (table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
entry = gtk_label_new(e_account_get_string(view->edit->account, E_ACCOUNT_ID_NAME));
gtk_widget_show(entry);
PACK_BOX(entry)
- gtk_table_attach (table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 1, 2, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Email address:"));
gtk_widget_show (label);
PACK_BOX(label)
- gtk_table_attach (table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
entry = gtk_label_new (e_account_get_string(view->edit->account, E_ACCOUNT_ID_ADDRESS));
gtk_widget_show(entry);
PACK_BOX(entry)
- gtk_table_attach (table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 2, 3, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (NULL);
- gtk_label_set_markup (label, _("<span size=\"large\" weight=\"bold\">Receiving details:</span>"));
+ gtk_label_set_markup ((GtkLabel *)label, _("<span size=\"large\" weight=\"bold\">Receiving details:</span>"));
gtk_widget_show (label);
PACK_BOXF(label);
- gtk_table_attach (table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 3, 4, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Server type:"));
gtk_widget_show (label);
PACK_BOX(label);
- gtk_table_attach (table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
entry = gtk_label_new (url->protocol);
gtk_widget_show(entry);
PACK_BOX(entry)
- gtk_table_attach (table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 4, 5, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Server address:"));
gtk_widget_show (label);
PACK_BOX(label);
- gtk_table_attach (table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
entry = gtk_label_new (url->host);
gtk_widget_show(entry);
PACK_BOX(entry);
- gtk_table_attach (table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 5, 6, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Username:"));
gtk_widget_show (label);
PACK_BOX(label);
- gtk_table_attach (table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
entry = gtk_label_new (url->user);
gtk_widget_show(entry);
PACK_BOX(entry);
- gtk_table_attach (table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 6, 7, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Use encryption:"));
gtk_widget_show (label);
PACK_BOX(label);
- gtk_table_attach (table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
- enc = camel_url_get_param(url, "use_ssl");
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ enc = (char *)camel_url_get_param(url, "use_ssl");
entry = gtk_label_new (enc ? enc : _("never"));
gtk_widget_show(entry);
PACK_BOX(entry);
- gtk_table_attach (table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 7, 8, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+
camel_url_free(url);
- uri = e_account_get_string(view->edit->account, E_ACCOUNT_TRANSPORT_URL);
+ uri =(char *) e_account_get_string(view->edit->account, E_ACCOUNT_TRANSPORT_URL);
if (!uri || (url = camel_url_new(uri, NULL)) == NULL)
- return;
+ return NULL;
label = gtk_label_new (NULL);
- gtk_label_set_markup (label, _("<span size=\"large\" weight=\"bold\">Sending details:</span>"));
+ gtk_label_set_markup ((GtkLabel *)label, _("<span size=\"large\" weight=\"bold\">Sending details:</span>"));
gtk_widget_show (label);
PACK_BOXF(label);
- gtk_table_attach (table, box, 0, 1, 8, 9, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 8, 9, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Server type:"));
gtk_widget_show (label);
PACK_BOX(label);
- gtk_table_attach (table, box, 0, 1, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
entry = gtk_label_new (url->protocol);
gtk_widget_show(entry);
PACK_BOX(entry)
- gtk_table_attach (table, box, 1, 2, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 9, 10, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Server address:"));
gtk_widget_show (label);
PACK_BOX(label);
- gtk_table_attach (table, box, 0, 1, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
entry = gtk_label_new (url->host);
gtk_widget_show(entry);
PACK_BOX(entry);
- gtk_table_attach (table, box, 1, 2, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 10, 11, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Username:"));
gtk_widget_show (label);
PACK_BOX(label);
- gtk_table_attach (table, box, 0, 1, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
entry = gtk_label_new (url->user);
gtk_widget_show(entry);
PACK_BOX(entry);
- gtk_table_attach (table, box, 1, 2, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 11, 12, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
label = gtk_label_new (_("Use encryption:"));
gtk_widget_show (label);
PACK_BOX(label);
- gtk_table_attach (table, box, 0, 1, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
- enc = camel_url_get_param(url, "use_ssl");
+ gtk_table_attach ((GtkTable *)table, box, 0, 1, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ enc = (char *)camel_url_get_param(url, "use_ssl");
entry = gtk_label_new (enc ? enc : _("never"));
gtk_widget_show(entry);
PACK_BOX(entry);
- gtk_table_attach (table, box, 1, 2, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
+ gtk_table_attach ((GtkTable *)table, box, 1, 2, 12, 13, GTK_EXPAND|GTK_FILL, GTK_SHRINK, 10, 3);
/*
label = gtk_label_new (_("Organization:"));
@@ -388,12 +390,12 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
int ret = (*mail_account_pages[mav->current_page].validate_page) (mav);
MAVPage *page = mav->pages[mav->current_page];
if (ret) {
- gtk_label_set_text (page->error_label, dialog_errors[ret-1].detail);
+ gtk_label_set_text ((GtkLabel *)page->error_label, dialog_errors[ret-1].detail);
gtk_widget_show (page->error);
return;
}
gtk_widget_hide (page->error);
- gtk_label_set_text (page->error_label, "");
+ gtk_label_set_text ((GtkLabel *)page->error_label, "");
}
if (mail_account_pages[mav->current_page].save_page) {
(*mail_account_pages[mav->current_page].save_page) (mav);
@@ -408,9 +410,9 @@ mav_next_pressed (GtkButton *button, MailAccountView *mav)
tmp = mail_account_pages[mav->current_page+1].create_page(mav);
page->main = gtk_hbox_new (FALSE, 0);
gtk_widget_show (page->main);
- gtk_box_pack_start(page->main, tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start((GtkBox *)page->main, tmp, FALSE, FALSE, 0);
gtk_widget_show(tmp);
- gtk_box_pack_start(page->box, page->main, FALSE, FALSE, 3);
+ gtk_box_pack_start((GtkBox *)page->box, page->main, FALSE, FALSE, 3);
}
if (mav->current_page == MAV_LAST - 1) {
@@ -458,8 +460,8 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
error_box = gtk_hbox_new (FALSE, 2);
page->error_label = gtk_label_new ("");
tmp = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
- gtk_box_pack_start (error_box, tmp, FALSE, FALSE, 2);
- gtk_box_pack_start (error_box, page->error_label, FALSE, FALSE, 2);
+ gtk_box_pack_start ((GtkBox *)error_box, tmp, FALSE, FALSE, 2);
+ gtk_box_pack_start ((GtkBox *)error_box, page->error_label, FALSE, FALSE, 2);
gtk_widget_hide (tmp);
gtk_widget_show (page->error_label);
page->error = tmp;
@@ -467,31 +469,31 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
box = gtk_hbox_new (FALSE, 12);
gtk_widget_show(box);
- gtk_box_pack_start(page->box, box, FALSE, FALSE, 12);
+ gtk_box_pack_start((GtkBox *)page->box, box, FALSE, FALSE, 12);
tmp = gtk_label_new (NULL);
str = g_strdup_printf("<span size=\"xx-large\" weight=\"heavy\">%s</span>", mail_account_pages[type].head);
- gtk_label_set_markup (tmp, str);
+ gtk_label_set_markup ((GtkLabel *)tmp, str);
g_free(str);
gtk_widget_show (tmp);
- gtk_box_pack_start(box, tmp, FALSE, FALSE, 12);
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 12);
box = gtk_hbox_new (FALSE, 12);
gtk_widget_show(box);
- gtk_box_pack_start(page->box, box, FALSE, FALSE, 12);
+ gtk_box_pack_start((GtkBox *)page->box, box, FALSE, FALSE, 12);
tmp = gtk_label_new (mail_account_pages[type].detail);
gtk_widget_set_size_request (tmp, 600, -1);
- gtk_label_set_line_wrap (tmp, TRUE);
- gtk_label_set_line_wrap_mode (tmp, PANGO_WRAP_WORD);
+ gtk_label_set_line_wrap ((GtkLabel *)tmp, TRUE);
+ gtk_label_set_line_wrap_mode ((GtkLabel *)tmp, PANGO_WRAP_WORD);
gtk_widget_show(tmp);
- gtk_box_pack_start(box, tmp, FALSE, FALSE, 12);
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 12);
page->main = NULL;
if (mail_account_pages[type].create_page && mail_account_pages[type].path) {
tmp = (*mail_account_pages[type].create_page) (view);
- gtk_box_pack_start (page->box, tmp, FALSE, FALSE, 3);
+ gtk_box_pack_start ((GtkBox *)page->box, tmp, FALSE, FALSE, 3);
page->main = gtk_hbox_new (FALSE, 0);
gtk_widget_show (page->main);
- gtk_box_pack_start(page->main, tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start((GtkBox *)page->main, tmp, FALSE, FALSE, 0);
}
if (mail_account_pages[type].fill_page) {
@@ -501,11 +503,11 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
if (mail_account_pages[type].prev) {
box = gtk_hbox_new(FALSE, 0);
tmp = gtk_image_new_from_pixbuf (e_icon_factory_get_icon("go-previous", E_ICON_SIZE_BUTTON));
- gtk_box_pack_start(box, tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0);
tmp = gtk_label_new (mail_account_pages[type].prev);
- gtk_box_pack_start(box, tmp, FALSE, FALSE, 3);
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
page->prev = gtk_button_new ();
- gtk_container_add (page->prev, box);
+ gtk_container_add ((GtkContainer *)page->prev, box);
gtk_widget_show_all(page->prev);
g_signal_connect(page->prev, "clicked", G_CALLBACK(mav_prev_pressed), view);
}
@@ -513,25 +515,25 @@ mav_construct_page(MailAccountView *view, MAVPageType type)
if (mail_account_pages[type].next) {
box = gtk_hbox_new(FALSE, 0);
tmp = gtk_label_new (mail_account_pages[type].next);
- gtk_box_pack_start(box, tmp, FALSE, FALSE, 3);
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 3);
tmp = gtk_image_new_from_pixbuf (e_icon_factory_get_icon("go-next", E_ICON_SIZE_BUTTON));
- gtk_box_pack_start(box, tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start((GtkBox *)box, tmp, FALSE, FALSE, 0);
page->next = gtk_button_new ();
- gtk_container_add (page->next, box);
+ gtk_container_add ((GtkContainer *)page->next, box);
gtk_widget_show_all(page->next);
g_signal_connect(page->next, "clicked", G_CALLBACK(mav_next_pressed), view);
}
box = gtk_hbox_new (FALSE, 0);
if (page->prev)
- gtk_box_pack_start (box, page->prev, FALSE, FALSE, 12);
+ gtk_box_pack_start ((GtkBox *)box, page->prev, FALSE, FALSE, 12);
if (page->next)
- gtk_box_pack_end (box, page->next, FALSE, FALSE, 12);
+ gtk_box_pack_end ((GtkBox *)box, page->next, FALSE, FALSE, 12);
gtk_widget_show (box);
- gtk_box_pack_end (page->box, box, FALSE, FALSE, 6);
+ gtk_box_pack_end ((GtkBox *)page->box, box, FALSE, FALSE, 6);
gtk_widget_show(page->box);
- gtk_box_pack_end (page->box, error_box, FALSE, FALSE, 2);
- return page;
+ gtk_box_pack_end ((GtkBox *)page->box, error_box, FALSE, FALSE, 2);
+ return (GtkWidget *)page;
}
void
@@ -540,22 +542,22 @@ mail_account_view_construct (MailAccountView *view)
int i;
view->scroll = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (view->scroll, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_scrolled_window_set_shadow_type (view->scroll, GTK_SHADOW_NONE);
+ gtk_scrolled_window_set_policy ((GtkScrolledWindow *)view->scroll, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+ gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *)view->scroll, GTK_SHADOW_NONE);
view->page_widget = gtk_vbox_new (FALSE, 3);
- gtk_scrolled_window_add_with_viewport (view->scroll, view->page_widget);
+ gtk_scrolled_window_add_with_viewport ((GtkScrolledWindow *)view->scroll, view->page_widget);
gtk_widget_show_all (view->scroll);
- gtk_widget_set_size_request (view, -1, 300);
+ gtk_widget_set_size_request ((GtkWidget *)view, -1, 300);
for (i=0; i<MAV_LAST; i++) {
- view->pages[i] = mav_construct_page (view, i);
+ view->pages[i] = (MAVPage *)mav_construct_page (view, i);
view->pages[i]->done = FALSE;
view->wpages[i] = view->pages[i]->box;
- gtk_box_pack_start (view->page_widget, view->pages[i]->box, TRUE, TRUE, 0);
+ gtk_box_pack_start ((GtkBox *)view->page_widget, view->pages[i]->box, TRUE, TRUE, 0);
gtk_widget_hide (view->pages[i]->box);
}
gtk_widget_show (view->pages[0]->box);
view->current_page = 0;
- gtk_box_pack_start (view, view->scroll, TRUE, TRUE, 0);
+ gtk_box_pack_start ((GtkBox *)view, view->scroll, TRUE, TRUE, 0);
view->edit = em_account_editor_new_for_pages (view->original, EMAE_PAGES, "org.gnome.evolution.mail.config.accountWizard", view->wpages);
em_account_editor_check (view->edit, mail_account_pages[0].path);
view->pages[0]->done = TRUE;
@@ -577,10 +579,8 @@ mail_account_view_new (EAccount *account)
static gboolean
mav_btn_expose (GtkWidget *w, GdkEventExpose *event, MailAccountView *mfv)
{
- GdkPixbuf *img = g_object_get_data (w, "pbuf");
+ GdkPixbuf *img = g_object_get_data ((GObject *)w, "pbuf");
cairo_t *cr = gdk_cairo_create (w->window);
- int wid = w->allocation.width;
- int heig = w->allocation.height;
cairo_save (cr);
gdk_cairo_set_source_pixbuf (cr, img, event->area.x-4, event->area.y-5);
cairo_paint(cr);
@@ -606,27 +606,27 @@ mail_account_view_get_tab_widget(MailAccountView *mcv)
int w=-1, h=-1;
GtkWidget *tab_label;
- img = gtk_image_new_from_pixbuf (pbuf);
- g_object_set_data (img, "pbuf", pbuf);
- g_signal_connect (img, "expose-event", mav_btn_expose, mcv);
+ img = (GtkWidget *)gtk_image_new_from_pixbuf (pbuf);
+ g_object_set_data ((GObject *)img, "pbuf", pbuf);
+ g_signal_connect (img, "expose-event", G_CALLBACK(mav_btn_expose), mcv);
tool = gtk_button_new ();
- gtk_button_set_relief(tool, GTK_RELIEF_NONE);
- gtk_button_set_focus_on_click (tool, FALSE);
+ gtk_button_set_relief((GtkButton *)tool, GTK_RELIEF_NONE);
+ gtk_button_set_focus_on_click ((GtkButton *)tool, FALSE);
gtk_widget_set_tooltip_text (tool, _("Close Tab"));
g_signal_connect (tool, "clicked", G_CALLBACK(mav_close), mcv);
box = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (box, img, FALSE, FALSE, 0);
- gtk_container_add (tool, box);
+ gtk_box_pack_start ((GtkBox *)box, img, FALSE, FALSE, 0);
+ gtk_container_add ((GtkContainer *)tool, box);
gtk_widget_show_all (tool);
gtk_icon_size_lookup_for_settings (gtk_widget_get_settings(tool) , GTK_ICON_SIZE_MENU, &w, &h);
gtk_widget_set_size_request (tool, w+2, h+2);
box = gtk_label_new (_("Account Wizard"));
tab_label = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (tab_label, box, FALSE, FALSE, 0);
- gtk_box_pack_start (tab_label, tool, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)tab_label, box, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *)tab_label, tool, FALSE, FALSE, 0);
gtk_widget_show_all (tab_label);
return tab_label;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]