diff options
| author | Milan Crha <mcrha@redhat.com> | 2014-06-06 18:02:13 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-06-06 18:02:13 +0800 |
| commit | d6dcec1b5578cc6a67d3dea97e48b580149cf421 (patch) | |
| tree | 40afdbd12ca120d70f134de7e92461d881f15e7a /modules | |
| parent | 1205a86888d0d3af669c4c7f97b82ef6987b4beb (diff) | |
| download | gsoc2013-evolution-d6dcec1b5578cc6a67d3dea97e48b580149cf421.tar gsoc2013-evolution-d6dcec1b5578cc6a67d3dea97e48b580149cf421.tar.gz gsoc2013-evolution-d6dcec1b5578cc6a67d3dea97e48b580149cf421.tar.bz2 gsoc2013-evolution-d6dcec1b5578cc6a67d3dea97e48b580149cf421.tar.lz gsoc2013-evolution-d6dcec1b5578cc6a67d3dea97e48b580149cf421.tar.xz gsoc2013-evolution-d6dcec1b5578cc6a67d3dea97e48b580149cf421.tar.zst gsoc2013-evolution-d6dcec1b5578cc6a67d3dea97e48b580149cf421.zip | |
Bug 731321 - Missing custom types when loading .ui definition
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/mail/em-composer-prefs.c | 3 | ||||
| -rw-r--r-- | modules/mail/em-mailer-prefs.c | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index d5ce3401f1..3861519509 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -1046,8 +1046,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, /* Make sure our custom widget classes are registered with * GType before we load the GtkBuilder definition file. */ - E_TYPE_MAIL_JUNK_OPTIONS; - EM_TYPE_FOLDER_SELECTION_BUTTON; + g_type_ensure (E_TYPE_MAIL_JUNK_OPTIONS); prefs->builder = gtk_builder_new (); e_load_ui_builder_definition (prefs->builder, "mail-config.ui"); diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 6c30410fd4..3e3aa3909c 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -251,6 +251,8 @@ jh_add_cb (GtkWidget *widget, gchar *tok; const gchar *name, *value; + g_type_ensure (E_TYPE_MAIL_JUNK_OPTIONS); + e_load_ui_builder_definition (builder, "mail-config.ui"); dialog = e_builder_get_widget (builder, "add-custom-junk-header"); jh_dialog_entry_changed_cb (NULL, builder); @@ -842,8 +844,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, /* Make sure our custom widget classes are registered with * GType before we load the GtkBuilder definition file. */ - E_TYPE_MAIL_JUNK_OPTIONS; - EM_TYPE_FOLDER_SELECTION_BUTTON; + g_type_ensure (E_TYPE_MAIL_JUNK_OPTIONS); prefs->builder = gtk_builder_new (); e_load_ui_builder_definition (prefs->builder, "mail-config.ui"); |