- hildon_button_add_title_size_group (HILDON_BUTTON (priv->from_field), size_group);
- to_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_to"), priv->to_field);
- priv->cc_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_cc"), priv->cc_field);
- priv->bcc_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_hotfix1"), priv->bcc_field);
- subject_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_subject"), subject_box);
- priv->attachments_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_attachment"), priv->attachments_view);
- g_object_unref (size_group);
-
- size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
- hildon_button_add_value_size_group (HILDON_BUTTON (priv->from_field), size_group);
- modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->to_field), size_group);
- modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->cc_field), size_group);
- modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->bcc_field), size_group);
- gtk_size_group_add_widget (size_group, priv->subject_field);
- gtk_size_group_add_widget (size_group, priv->attachments_view);
- g_object_unref (size_group);
+ to_caption = modest_maemo_utils_create_captioned_with_size_type
+ (title_size_group, value_size_group,
+ _("mail_va_to"), priv->to_field,
+ HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+ priv->cc_caption = modest_maemo_utils_create_captioned_with_size_type
+ (title_size_group, value_size_group,
+ _("mail_va_cc"), priv->cc_field,
+ HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+ priv->bcc_caption = modest_maemo_utils_create_captioned_with_size_type
+ (title_size_group, value_size_group,
+ _("mail_va_hotfix1"), priv->bcc_field,
+ HILDON_SIZE_AUTO_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+ subject_caption = modest_maemo_utils_create_captioned (title_size_group, value_size_group,
+ _("mail_va_subject"), subject_box);
+ priv->attachments_caption = modest_maemo_utils_create_captioned_with_size_type (title_size_group, value_size_group,
+ _("mail_va_attachment"),
+ priv->attachments_view,
+ HILDON_SIZE_AUTO_WIDTH |
+ HILDON_SIZE_AUTO_HEIGHT);
+ /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->to_field), value_size_group); */
+ /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->cc_field), value_size_group); */
+ /* modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->bcc_field), value_size_group); */
+ g_object_unref (title_size_group);
+ g_object_unref (value_size_group);