Fixed a type-punned warning in compilation

[modest] / src / hildon2 / modest-default-account-settings-dialog.c

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index 8e9c8df..b688662 100644 (file)
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -263,8 +263,9 @@ create_captioned (ModestDefaultAccountSettingsDialog *self,
 
        GtkWidget *result;
 
-       result = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
-                                                     label_text, use_markup, control);
+       result = modest_maemo_utils_create_captioned_with_size_type (title_sizegroup, value_sizegroup,
+                                                                    label_text, use_markup, control,
+                                                                    MODEST_EDITABLE_SIZE);
 
        /* Connect to the appropriate changed signal for the widget, 
         * so we can ask for the prev/next buttons to be enabled/disabled appropriately:
@@ -315,18 +316,16 @@ on_entry_max (ModestValidatingEntry *self, gpointer user_data)
 }
 
 static GtkWidget*
-create_page_account_details (ModestDefaultAccountSettingsDialog *self)
+create_page_account_details (ModestDefaultAccountSettingsDialog *self, 
+                            GtkSizeGroup *title_sizegroup,
+                            GtkSizeGroup *value_sizegroup)
 {
        ModestDefaultAccountSettingsDialogPrivate *priv;
        GtkWidget *box;
-       GtkSizeGroup* title_sizegroup;
-       GtkSizeGroup* value_sizegroup;
        GtkWidget *hbox;
 
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
        box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-       value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
            
        /* The description widgets: */  
        priv->entry_account_title = GTK_WIDGET (modest_validating_entry_new ());
@@ -380,9 +379,6 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self)
        gtk_box_pack_start (GTK_BOX (box), priv->checkbox_leave_messages, FALSE, FALSE, 0);
        gtk_widget_show (priv->checkbox_leave_messages);
 
-       g_object_unref (title_sizegroup);
-       g_object_unref (value_sizegroup);
-       
        gtk_widget_show (GTK_WIDGET (box));
        
        return GTK_WIDGET (box);
@@ -480,18 +476,16 @@ delete_button_clicked (ModestDefaultAccountSettingsDialog *self)
 }
 
 static GtkWidget*
-create_page_user_details (ModestDefaultAccountSettingsDialog *self)
+create_page_user_details (ModestDefaultAccountSettingsDialog *self,
+                         GtkSizeGroup *title_sizegroup,
+                         GtkSizeGroup *value_sizegroup)
 {
        ModestDefaultAccountSettingsDialogPrivate *priv;
        GtkWidget *box;
-       GtkSizeGroup* title_sizegroup;
-       GtkSizeGroup* value_sizegroup;
 
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self);
 
        box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
-       title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-       value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
  
        /* The name widgets: */
        priv->entry_user_name = GTK_WIDGET (modest_validating_entry_new ());
@@ -596,9 +590,6 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self)
                                                                RESPONSE_SIGNATURE_DUMMY);
        gtk_widget_show (priv->button_signature);
 
-       g_object_unref (title_sizegroup);
-       g_object_unref (value_sizegroup);
-
        gtk_widget_show (GTK_WIDGET (box));
 
        return GTK_WIDGET (box);
@@ -763,6 +754,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self,
 
        GtkWidget *separator = gtk_hseparator_new ();
        gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_DEFAULT);
+       hildon_gtk_widget_set_theme_size (separator, HILDON_SIZE_AUTO);
        gtk_widget_show (separator);
 
        /* connection-specific checkbox: */
@@ -1013,6 +1005,8 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog
        GtkWidget *pannable;
        GtkWidget *separator;
        GtkWidget *align;
+       GtkSizeGroup* account_title_sizegroup;
+       GtkSizeGroup* account_value_sizegroup;
        GtkSizeGroup *sec_title_sizegroup, *sec_value_sizegroup;
 
        priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(self);
@@ -1033,8 +1027,13 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog
        priv->protocol_authentication_incoming = MODEST_PROTOCOLS_AUTH_PASSWORD;
 
        /* Create the common pages */
-       priv->page_account_details = create_page_account_details (self);
-       priv->page_user_details = create_page_user_details (self);
+       account_title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       account_value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
+       priv->page_account_details = create_page_account_details (self, account_title_sizegroup, account_value_sizegroup);
+       priv->page_user_details = create_page_user_details (self, account_title_sizegroup, account_value_sizegroup);
+       g_object_unref (account_title_sizegroup);
+       g_object_unref (account_value_sizegroup);
+       
 
        /* Create size groups for security settings */
        sec_title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
@@ -1055,6 +1054,7 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog
                            FALSE, FALSE, 0);
 
        separator = gtk_hseparator_new ();
+       hildon_gtk_widget_set_theme_size (separator, HILDON_SIZE_AUTO);
        gtk_box_pack_start (GTK_BOX (priv->main_container), separator,
                            FALSE, FALSE, MODEST_MARGIN_DEFAULT);
        gtk_widget_show (separator);
@@ -1062,6 +1062,7 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog
                            priv->page_incoming,
                            FALSE, FALSE, 0);
        separator = gtk_hseparator_new ();
+       hildon_gtk_widget_set_theme_size (separator, HILDON_SIZE_AUTO);
        gtk_box_pack_start (GTK_BOX (priv->main_container), separator,
                            FALSE, FALSE, MODEST_MARGIN_DEFAULT);
        gtk_widget_show (separator);