diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-16 23:25:08 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-16 23:42:26 +0800 |
| commit | 672adf12a0923437e90d08ab7925bd9329fcce0d (patch) | |
| tree | 53c076d56359c111085dad615295ecf0f5be7342 /modules/mail | |
| parent | c4716bf2e904a4bcf573ee30841378c1f53092ee (diff) | |
| download | gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.gz gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.bz2 gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.lz gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.xz gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.tar.zst gsoc2013-evolution-672adf12a0923437e90d08ab7925bd9329fcce0d.zip | |
Fix compiler warnings and deprecated GTK+ API usage.
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/e-mail-shell-backend.c | 1 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-migrate.c | 8 | ||||
| -rw-r--r-- | modules/mail/em-composer-prefs.h | 3 | ||||
| -rw-r--r-- | modules/mail/em-mailer-prefs.h | 1 |
4 files changed, 5 insertions, 8 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index 1c24d56eab..3da217d2ea 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -29,6 +29,7 @@ #include "e-util/e-account-utils.h" #include "e-util/e-binding.h" +#include "e-util/e-error.h" #include "e-util/e-import.h" #include "e-util/e-util.h" #include "shell/e-shell.h" diff --git a/modules/mail/e-mail-shell-migrate.c b/modules/mail/e-mail-shell-migrate.c index d2614befdb..7176d4fba7 100644 --- a/modules/mail/e-mail-shell-migrate.c +++ b/modules/mail/e-mail-shell-migrate.c @@ -1114,19 +1114,19 @@ em_migrate_setup_progress_dialog (const gchar *title, const gchar *desc) gtk_label_set_line_wrap ((GtkLabel *) w, TRUE); gtk_widget_show (w); - gtk_box_pack_start_defaults ((GtkBox *) vbox, w); + gtk_box_pack_start ((GtkBox *) vbox, w, TRUE, TRUE, 0); hbox = gtk_hbox_new (FALSE, 6); gtk_widget_show (hbox); - gtk_box_pack_start_defaults ((GtkBox *) vbox, hbox); + gtk_box_pack_start ((GtkBox *) vbox, hbox, TRUE, TRUE, 0); label = (GtkLabel *) gtk_label_new (""); gtk_widget_show ((GtkWidget *) label); - gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) label); + gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) label, TRUE, TRUE, 0); progress = (GtkProgressBar *) gtk_progress_bar_new (); gtk_widget_show ((GtkWidget *) progress); - gtk_box_pack_start_defaults ((GtkBox *) hbox, (GtkWidget *) progress); + gtk_box_pack_start ((GtkBox *) hbox, (GtkWidget *) progress, TRUE, TRUE, 0); /* Prepare the message */ vbox = gtk_vbox_new (FALSE, 12); diff --git a/modules/mail/em-composer-prefs.h b/modules/mail/em-composer-prefs.h index 8f977dc9b9..6faa18b7d9 100644 --- a/modules/mail/em-composer-prefs.h +++ b/modules/mail/em-composer-prefs.h @@ -62,9 +62,6 @@ struct _EMComposerPrefs { /* General tab */ - /* Default Behavior */ - GtkOptionMenu *charset; - GtkTreeModel *language_model; /* Forwards and Replies */ diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h index e35c2085ab..01f823b11e 100644 --- a/modules/mail/em-mailer-prefs.h +++ b/modules/mail/em-mailer-prefs.h @@ -69,7 +69,6 @@ struct _EMMailerPrefs { /* Message Display */ GtkSpinButton *timeout; - GtkOptionMenu *charset; /* HTML Mail tab */ GtkFontButton *font_variable; |