[evolution/evolution-3-12] Bug 731321 - Missing custom types when loading .ui definition

[Milan Crha <mcrha src gnome org>]

commit 5d6d3badfc34616c06207c0961ffdb8e37a71137
Author: Milan Crha <mcrha redhat com>
Date:   Fri Jun 6 12:02:13 2014 +0200

    Bug 731321 - Missing custom types when loading .ui definition

 .../contact-list-editor/e-contact-list-editor.c    |    2 ++
 calendar/gui/dialogs/event-page.c                  |    1 +
 calendar/gui/dialogs/memo-page.c                   |    1 +
 calendar/gui/dialogs/task-page.c                   |    2 ++
 em-format/e-mail-formatter-secure-button.c         |    4 ++++
 mail/e-mail-tag-editor.c                           |    4 ++++
 modules/mail/em-composer-prefs.c                   |    3 +--
 modules/mail/em-mailer-prefs.c                     |    5 +++--
 8 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c 
b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 47088aa..e1713bd 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -1445,6 +1445,8 @@ contact_list_editor_constructed (GObject *object)
        editor->priv->editable = TRUE;
        editor->priv->allows_contact_lists = TRUE;
 
+       g_type_ensure (E_TYPE_CLIENT_COMBO_BOX);
+
        editor->priv->builder = gtk_builder_new ();
        e_load_ui_builder_definition (
                editor->priv->builder, "contact-list-editor.ui");
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 0bd8efa..8ae6a21 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -3611,6 +3611,7 @@ event_page_construct (EventPage *epage,
 
        /* Make sure our custom widget classes are registered with
         * GType before we load the GtkBuilder definition file. */
+       g_type_ensure (E_TYPE_CLIENT_COMBO_BOX);
        g_type_ensure (E_TYPE_DATE_EDIT);
        g_type_ensure (E_TYPE_TIMEZONE_ENTRY);
        g_type_ensure (E_TYPE_SPELL_ENTRY);
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index bb8884d..b49836d 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -1238,6 +1238,7 @@ memo_page_construct (MemoPage *mpage)
 
        /* Make sure our custom widget classes are registered with
         * GType before we load the GtkBuilder definition file. */
+       g_type_ensure (E_TYPE_CLIENT_COMBO_BOX);
        g_type_ensure (E_TYPE_DATE_EDIT);
        g_type_ensure (E_TYPE_SPELL_ENTRY);
 
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 1a79172..a251017 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -2673,10 +2673,12 @@ task_page_construct (TaskPage *tpage,
 
        /* Make sure our custom widget classes are registered with
         * GType before we load the GtkBuilder definition file. */
+       g_type_ensure (E_TYPE_CLIENT_COMBO_BOX);
        g_type_ensure (E_TYPE_DATE_EDIT);
        g_type_ensure (E_TYPE_TIMEZONE_ENTRY);
        g_type_ensure (E_TYPE_SOURCE_COMBO_BOX);
        g_type_ensure (E_TYPE_SPELL_ENTRY);
+       g_type_ensure (E_TYPE_URL_ENTRY);
 
        priv->builder = gtk_builder_new ();
        e_load_ui_builder_definition (priv->builder, "task-page.ui");
diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c
index 1c09023..c457a11 100644
--- a/em-format/e-mail-formatter-secure-button.c
+++ b/em-format/e-mail-formatter-secure-button.c
@@ -270,6 +270,10 @@ secure_button_clicked_cb (GtkWidget *widget,
 
        g_return_if_fail (validity != NULL);
 
+       /* Make sure our custom widget classes are registered with
+        * GType before we load the GtkBuilder definition file. */
+       g_type_ensure (E_TYPE_DATE_EDIT);
+
        builder = gtk_builder_new ();
        e_load_ui_builder_definition (builder, "mail-dialogs.ui");
 
diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c
index ad2eff3..7558343 100644
--- a/mail/e-mail-tag-editor.c
+++ b/mail/e-mail-tag-editor.c
@@ -247,6 +247,10 @@ e_mail_tag_editor_init (EMailTagEditor *editor)
 
        content_area = gtk_dialog_get_content_area (dialog);
 
+       /* Make sure our custom widget classes are registered with
+        * GType before we load the GtkBuilder definition file. */
+       g_type_ensure (E_TYPE_DATE_EDIT);
+
        /* Load the rest of the UI from the builder file. */
 
        builder = gtk_builder_new ();
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 495274d..938f7df 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -1042,8 +1042,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 2a150a7..95616a7 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");