* some changes in the account-dialog in modest.glade, for better handling

* adopted modest-ui-wizard.c and modest-main.c to change in identity_add
* added comment for "realname" parameter to modest-identity-mgr.h

pmo-trunk-r279

diff --git a/src/gtk-glade/modest-ui-wizard.c b/src/gtk-glade/modest-ui-wizard.c
index a4beffe..b323495 100644 (file)
--- a/src/gtk-glade/modest-ui-wizard.c
+++ b/src/gtk-glade/modest-ui-wizard.c
@@ -69,7 +69,7 @@ gchar *get_text_from_combobox (GtkWidget *combobox){
 }
 
 
-gboolean advance_sanity_check(GtkWindow *parent, GladeXML *glade_xml, gint cp) {
+gboolean advance_sanity_check(GladeXML *glade_xml, gint cp) {
         gchar *tmptext;
 
        /* FIXME:
@@ -113,7 +113,7 @@ gboolean advance_sanity_check(GtkWindow *parent, GladeXML *glade_xml, gint cp) {
                        wizard_missing_notification(NULL, "Please specify outgoing server address.");
                        return FALSE;
                }
-               /* smtp servers may work without a username 
+               /* smtp servers may work without a username
                if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(glade_xml_get_widget(glade_xml, "AWUseIncomingCheckButton")))==FALSE
                    && strlen(gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWOutUserNameEntry"))))==0) {
                        wizard_missing_notification(NULL, "Please enter user name.");
@@ -195,7 +195,8 @@ gboolean wizard_account_add(GladeXML *glade_xml, ModestUI *modest_ui)
 
        identity=search_unused_account_or_identity_name(id_mgr, MODEST_IDENTITY_DEFAULT_IDENTITY);
        if (!modest_identity_mgr_add_identity (id_mgr,
-                                              identity,
+                                               identity,
+                                              gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWRealNameEntry"))),
                                               gtk_entry_get_text(GTK_ENTRY(glade_xml_get_widget(glade_xml, "AWEMailAddressEntry"))),
                                               "", "", FALSE, transport, FALSE ))
                g_warning ("failed to add default identity");
@@ -273,7 +274,7 @@ void wizard_account_dialog(ModestUI *modest_ui)
 
                 switch (result) {
                 case 1:
-                        if (advance_sanity_check(NULL, glade_xml, cp)==TRUE)
+                        if (advance_sanity_check(glade_xml, cp)==TRUE)
                                 gtk_notebook_next_page(GTK_NOTEBOOK(notebook));
                         break;
                 case 2:

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index fc75f04..a2c2b71 100644 (file)
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -3352,7 +3352,7 @@ LOCAL</property>
                  <property name="sensitive">False</property>
                  <property name="can_focus">True</property>
                  <property name="editable">True</property>
-                 <property name="visibility">True</property>
+                 <property name="visibility">False</property>
                  <property name="max_length">0</property>
                  <property name="text" translatable="yes"></property>
                  <property name="has_frame">True</property>
@@ -3476,6 +3476,8 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
+  <property name="default_width">500</property>
+  <property name="default_height">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
@@ -3499,7 +3501,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
          <child>
-           <widget class="GtkButton" id="cancelbutton1">
+           <widget class="GtkButton" id="button1">
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
@@ -3512,7 +3514,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
          </child>
 
          <child>
-           <widget class="GtkButton" id="okbutton1">
+           <widget class="GtkButton" id="button2">
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
@@ -3542,7 +3544,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
          <property name="column_spacing">10</property>
 
          <child>
-           <widget class="GtkLabel" id="EMailAddressLabel">
+           <widget class="GtkLabel" id="ISEMailAddressLabel">
              <property name="visible">True</property>
              <property name="label" translatable="yes">E-mail address:</property>
              <property name="use_underline">False</property>
@@ -3562,34 +3564,6 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
            <packing>
              <property name="left_attach">0</property>
              <property name="right_attach">1</property>
-             <property name="top_attach">0</property>
-             <property name="bottom_attach">1</property>
-             <property name="x_options">fill</property>
-             <property name="y_options"></property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkLabel" id="RealNameLabel">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">Your name:</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">1</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="left_attach">0</property>
-             <property name="right_attach">1</property>
              <property name="top_attach">1</property>
              <property name="bottom_attach">2</property>
              <property name="x_options">fill</property>
@@ -3598,9 +3572,9 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label63">
+           <widget class="GtkLabel" id="ISRealNameLabel">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Outgoing Server:</property>
+             <property name="label" translatable="yes">Your name:</property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3626,7 +3600,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
          </child>
 
          <child>
-           <widget class="GtkEntry" id="entry12">
+           <widget class="GtkEntry" id="ISNameEntry">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="editable">True</property>
@@ -3640,30 +3614,35 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
            <packing>
              <property name="left_attach">1</property>
              <property name="right_attach">2</property>
-             <property name="top_attach">1</property>
-             <property name="bottom_attach">2</property>
+             <property name="top_attach">2</property>
+             <property name="bottom_attach">3</property>
              <property name="y_options"></property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkComboBox" id="combobox12">
+           <widget class="GtkEntry" id="ISEMailAddress">
              <property name="visible">True</property>
-             <property name="add_tearoffs">False</property>
-             <property name="focus_on_click">True</property>
+             <property name="can_focus">True</property>
+             <property name="editable">True</property>
+             <property name="visibility">True</property>
+             <property name="max_length">0</property>
+             <property name="text" translatable="yes"></property>
+             <property name="has_frame">True</property>
+             <property name="invisible_char">*</property>
+             <property name="activates_default">False</property>
            </widget>
            <packing>
              <property name="left_attach">1</property>
              <property name="right_attach">2</property>
-             <property name="top_attach">2</property>
-             <property name="bottom_attach">3</property>
-             <property name="x_options">fill</property>
-             <property name="y_options">fill</property>
+             <property name="top_attach">1</property>
+             <property name="bottom_attach">2</property>
+             <property name="y_options"></property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkCheckButton" id="UseReplyToCheckButton">
+           <widget class="GtkCheckButton" id="ISUseSignatureCheckButton">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="label" translatable="yes"></property>
@@ -3677,17 +3656,17 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
            <packing>
              <property name="left_attach">1</property>
              <property name="right_attach">2</property>
-             <property name="top_attach">3</property>
-             <property name="bottom_attach">4</property>
+             <property name="top_attach">5</property>
+             <property name="bottom_attach">6</property>
              <property name="x_options">fill</property>
              <property name="y_options"></property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="UseReplyToLabel">
+           <widget class="GtkLabel" id="ISUseSignatureLabel">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Use &quot;Reply-To&quot;:</property>
+             <property name="label" translatable="yes">Use Signature:</property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3705,18 +3684,57 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
            <packing>
              <property name="left_attach">0</property>
              <property name="right_attach">1</property>
-             <property name="top_attach">3</property>
-             <property name="bottom_attach">4</property>
+             <property name="top_attach">5</property>
+             <property name="bottom_attach">6</property>
              <property name="x_options">fill</property>
              <property name="y_options"></property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="ReplyToLabel">
+           <widget class="GtkScrolledWindow" id="scrolledwindow11">
              <property name="visible">True</property>
              <property name="sensitive">False</property>
-             <property name="label" translatable="yes">Reply-To:</property>
+             <property name="can_focus">True</property>
+             <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
+             <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+             <property name="shadow_type">GTK_SHADOW_IN</property>
+             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+             <child>
+               <widget class="GtkTextView" id="ISSignatureTextView">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
+                 <property name="can_focus">True</property>
+                 <property name="editable">True</property>
+                 <property name="overwrite">False</property>
+                 <property name="accepts_tab">True</property>
+                 <property name="justification">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap_mode">GTK_WRAP_NONE</property>
+                 <property name="cursor_visible">True</property>
+                 <property name="pixels_above_lines">0</property>
+                 <property name="pixels_below_lines">0</property>
+                 <property name="pixels_inside_wrap">0</property>
+                 <property name="left_margin">0</property>
+                 <property name="right_margin">0</property>
+                 <property name="indent">0</property>
+                 <property name="text" translatable="yes"></property>
+               </widget>
+             </child>
+           </widget>
+           <packing>
+             <property name="left_attach">0</property>
+             <property name="right_attach">2</property>
+             <property name="top_attach">6</property>
+             <property name="bottom_attach">7</property>
+             <property name="x_options">fill</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="ISIdentityLabel">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">Identity</property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3734,37 +3752,15 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
            <packing>
              <property name="left_attach">0</property>
              <property name="right_attach">1</property>
-             <property name="top_attach">4</property>
-             <property name="bottom_attach">5</property>
+             <property name="top_attach">0</property>
+             <property name="bottom_attach">1</property>
              <property name="x_options">fill</property>
              <property name="y_options"></property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkEntry" id="ReplyToEntry">
-             <property name="visible">True</property>
-             <property name="sensitive">False</property>
-             <property name="can_focus">True</property>
-             <property name="editable">True</property>
-             <property name="visibility">True</property>
-             <property name="max_length">0</property>
-             <property name="text" translatable="yes"></property>
-             <property name="has_frame">True</property>
-             <property name="invisible_char">*</property>
-             <property name="activates_default">False</property>
-           </widget>
-           <packing>
-             <property name="left_attach">1</property>
-             <property name="right_attach">2</property>
-             <property name="top_attach">4</property>
-             <property name="bottom_attach">5</property>
-             <property name="y_options"></property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkEntry" id="entry14">
+           <widget class="GtkEntry" id="ISIdentityEntry">
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="editable">True</property>
@@ -3785,31 +3781,37 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
          </child>
 
          <child>
-           <widget class="GtkCheckButton" id="UseSignatureCheckButton">
+           <widget class="GtkLabel" id="ISOutServerLabel">
              <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes"></property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="active">False</property>
-             <property name="inconsistent">False</property>
-             <property name="draw_indicator">True</property>
+             <property name="label" translatable="yes">Outgoing Server:</property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">1</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+             <property name="width_chars">-1</property>
+             <property name="single_line_mode">False</property>
+             <property name="angle">0</property>
            </widget>
            <packing>
-             <property name="left_attach">1</property>
-             <property name="right_attach">2</property>
-             <property name="top_attach">5</property>
-             <property name="bottom_attach">6</property>
+             <property name="left_attach">0</property>
+             <property name="right_attach">1</property>
+             <property name="top_attach">4</property>
+             <property name="bottom_attach">5</property>
              <property name="x_options">fill</property>
              <property name="y_options"></property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="UseSignatureLabel">
+           <widget class="GtkLabel" id="ISReplyToLabel">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Use Signature:</property>
+             <property name="label" translatable="yes">Reply-To:</property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3827,50 +3829,47 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
            <packing>
              <property name="left_attach">0</property>
              <property name="right_attach">1</property>
-             <property name="top_attach">5</property>
-             <property name="bottom_attach">6</property>
+             <property name="top_attach">3</property>
+             <property name="bottom_attach">4</property>
              <property name="x_options">fill</property>
              <property name="y_options"></property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkScrolledWindow" id="scrolledwindow11">
+           <widget class="GtkComboBox" id="ISOutServerComboBox">
              <property name="visible">True</property>
-             <property name="sensitive">False</property>
-             <property name="can_focus">True</property>
-             <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-             <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-             <property name="shadow_type">GTK_SHADOW_IN</property>
-             <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-             <child>
-               <widget class="GtkTextView" id="textview3">
-                 <property name="visible">True</property>
-                 <property name="sensitive">False</property>
-                 <property name="can_focus">True</property>
-                 <property name="editable">True</property>
-                 <property name="overwrite">False</property>
-                 <property name="accepts_tab">True</property>
-                 <property name="justification">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap_mode">GTK_WRAP_NONE</property>
-                 <property name="cursor_visible">True</property>
-                 <property name="pixels_above_lines">0</property>
-                 <property name="pixels_below_lines">0</property>
-                 <property name="pixels_inside_wrap">0</property>
-                 <property name="left_margin">0</property>
-                 <property name="right_margin">0</property>
-                 <property name="indent">0</property>
-                 <property name="text" translatable="yes"></property>
-               </widget>
-             </child>
+             <property name="add_tearoffs">False</property>
+             <property name="focus_on_click">True</property>
            </widget>
            <packing>
-             <property name="left_attach">0</property>
+             <property name="left_attach">1</property>
              <property name="right_attach">2</property>
-             <property name="top_attach">6</property>
-             <property name="bottom_attach">7</property>
+             <property name="top_attach">4</property>
+             <property name="bottom_attach">5</property>
              <property name="x_options">fill</property>
+             <property name="y_options">fill</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkEntry" id="ISReplyToEntry">
+             <property name="visible">True</property>
+             <property name="can_focus">True</property>
+             <property name="editable">True</property>
+             <property name="visibility">True</property>
+             <property name="max_length">0</property>
+             <property name="text" translatable="yes"></property>
+             <property name="has_frame">True</property>
+             <property name="invisible_char">*</property>
+             <property name="activates_default">False</property>
+           </widget>
+           <packing>
+             <property name="left_attach">1</property>
+             <property name="right_attach">2</property>
+             <property name="top_attach">3</property>
+             <property name="bottom_attach">4</property>
+             <property name="y_options"></property>
            </packing>
          </child>
        </widget>
@@ -3914,28 +3913,15 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
          <child>
-           <widget class="GtkButton" id="cancelbutton3">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label">gtk-cancel</property>
-             <property name="use_stock">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">-6</property>
-           </widget>
-         </child>
-
-         <child>
            <widget class="GtkButton" id="okbutton3">
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label">gtk-ok</property>
+             <property name="label">gtk-close</property>
              <property name="use_stock">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
-             <property name="response_id">-5</property>
+             <property name="response_id">-7</property>
            </widget>
          </child>
        </widget>
@@ -3967,8 +3953,8 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
                <widget class="GtkScrolledWindow" id="scrolledwindow12">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                  <property name="shadow_type">GTK_SHADOW_IN</property>
                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
@@ -4018,6 +4004,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
                  <child>
                    <widget class="GtkButton" id="IdentityEditButton">
                      <property name="visible">True</property>
+                     <property name="sensitive">False</property>
                      <property name="can_focus">True</property>
                      <property name="label" translatable="yes">Edit</property>
                      <property name="use_underline">True</property>
@@ -4034,6 +4021,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
                  <child>
                    <widget class="GtkButton" id="IdentityDeleteButton">
                      <property name="visible">True</property>
+                     <property name="sensitive">False</property>
                      <property name="can_focus">True</property>
                      <property name="label" translatable="yes">Delete</property>
                      <property name="use_underline">True</property>
@@ -4093,8 +4081,8 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
                <widget class="GtkScrolledWindow" id="scrolledwindow13">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+                 <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                 <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
                  <property name="shadow_type">GTK_SHADOW_IN</property>
                  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
@@ -4144,6 +4132,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
                  <child>
                    <widget class="GtkButton" id="AccountEditButton">
                      <property name="visible">True</property>
+                     <property name="sensitive">False</property>
                      <property name="can_focus">True</property>
                      <property name="label" translatable="yes">Edit</property>
                      <property name="use_underline">True</property>
@@ -4160,6 +4149,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
                  <child>
                    <widget class="GtkButton" id="AccountDeleteButton">
                      <property name="visible">True</property>
+                     <property name="sensitive">False</property>
                      <property name="can_focus">True</property>
                      <property name="label" translatable="yes">Delete</property>
                      <property name="use_underline">True</property>
@@ -4541,7 +4531,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
              <property name="visible">True</property>
              <property name="can_focus">True</property>
              <property name="editable">True</property>
-             <property name="visibility">True</property>
+             <property name="visibility">False</property>
              <property name="max_length">0</property>
              <property name="text" translatable="yes"></property>
              <property name="has_frame">True</property>

diff --git a/src/modest-identity-mgr.h b/src/modest-identity-mgr.h
index bf8111c..459a7ad 100644 (file)
--- a/src/modest-identity-mgr.h
+++ b/src/modest-identity-mgr.h
@@ -35,9 +35,9 @@ struct _ModestIdentityMgrClass {
 
 /**
  * modest_ui_get_type:
- * 
+ *
  * get the GType for ModestIdentityMgr
- *  
+ *
  * Returns: the GType
  */
 GType modest_identity_mgr_get_type (void) G_GNUC_CONST;
@@ -45,8 +45,8 @@ GType modest_identity_mgr_get_type (void) G_GNUC_CONST;
 
 /**
  * modest_identity_mgr_new:
- * @modest_conf: a ModestConf instance 
- *  
+ * @modest_conf: a ModestConf instance
+ *
  * Returns: a new ModestIdentityMgr, or NULL in case of error
  */
 GObject * modest_identity_mgr_new (ModestConf * modest_conf);
@@ -56,15 +56,16 @@ GObject * modest_identity_mgr_new (ModestConf * modest_conf);
  * modest_identity_mgr_add_identity:
  * @self: a ModestIdentityMgr instance
  * @name: the name (id) for the identity
+ * @realname: the real name of the user
  * @email: the user's email address which is used when sending email
  * @replyto: the default replyto address
  * @signature: the signature for this identity
  * @use_signature: whether to use this signature instead of the default one
  * @id_via: the transport to send emails for this identity via
  * @use_id_via: whether to use this via instead of the default one
- * 
+ *
  * add a user identity to the configuration
- * 
+ *
  * Returns: TRUE if  succeeded, FALSE otherwise,
  */
 gboolean modest_identity_mgr_add_identity (ModestIdentityMgr * self,
@@ -83,7 +84,7 @@ gboolean modest_identity_mgr_add_identity (ModestIdentityMgr * self,
  * @self: a ModestIdentityMgr instance
  * @name: the name of the identity to remove
  * @err: a GError ptr, or NULL to ignore.
- * 
+ *
  * remove identity from the configuration
  * the identity with @name should exist
  *
@@ -99,7 +100,7 @@ gboolean modest_identity_mgr_remove_identity (ModestIdentityMgr * self,
  * modest_identity_mgr_identity_names:
  * @self: a ModestIdentityMgr instance
  * @err: a GError ptr, or NULL to ignore.
- * 
+ *
  * list all identities
  *
  * Returns: a newly allocated list of identities, or NULL in case of error or
@@ -114,7 +115,7 @@ GSList *modest_identity_mgr_identity_names (ModestIdentityMgr * self,
  * modest_identity_mgr_identity_exists:
  * @self: a ModestIdentityMgr instance
  * @err: a GError ptr, or NULL to ignore.
- * 
+ *
  * check whether identity @name exists
  *
  * Returns: TRUE if the identity exists, FALSE otherwise (or in case of error)
@@ -133,7 +134,7 @@ gboolean modest_identity_mgr_identity_exists (ModestIdentityMgr * self,
  * @name: the name of the identity
  * @key: the key of the value to retrieve
  * @err: a GError ptr, or NULL to ignore.
- * 
+ *
  * get a config string from an identity
  *
  * Returns: a newly allocated string with the value for the key,
@@ -151,7 +152,7 @@ gchar *modest_identity_mgr_get_identity_string (ModestIdentityMgr * self,
  * @name: the name of the identity
  * @key: the key of the value to retrieve
  * @err: a GError ptr, or NULL to ignore.
- * 
+ *
  * get a config int from an identity
  *
  * Returns: an integer with the value for the key, or -1 in case of
@@ -170,7 +171,7 @@ gint modest_identity_mgr_get_identity_int (ModestIdentityMgr * self,
  * @name: the name of the identity
  * @key: the key of the value to retrieve
  * @err: a GError ptr, or NULL to ignore.
- * 
+ *
  * get a config boolean from an identity
  *
  * Returns: an boolean with the value for the key, or FALSE in case of
@@ -190,7 +191,7 @@ gboolean modest_identity_mgr_get_identity_bool (ModestIdentityMgr * self,
  * @key: the key of the value to set
  * @val: the value to set
  * @err: a GError ptr, or NULL to ignore.
- * 
+ *
  * set a config string for an identity
  *
  * Returns: TRUE if setting the value succeeded, or FALSE in case of error.
@@ -211,7 +212,7 @@ gboolean modest_identity_mgr_set_identity_string (ModestIdentityMgr *
  * @key: the key of the value to set
  * @val: the value to set
  * @err: a GError ptr, or NULL to ignore.
- * 
+ *
  * set a config int for an identity
  *
  * Returns: TRUE if setting the value succeeded, or FALSE in case of error.
@@ -230,7 +231,7 @@ gboolean modest_identity_mgr_set_identity_int (ModestIdentityMgr * self,
  * @key: the key of the value to set
  * @val: the value to set
  * @err: a GError ptr, or NULL to ignore.
- * 
+ *
  * set a config bool for an identity
  *
  * Returns: TRUE if setting the value succeeded, or FALSE in case of error.

diff --git a/src/modest-main.c b/src/modest-main.c
index 75854ed..bba5bcb 100644 (file)
--- a/src/modest-main.c
+++ b/src/modest-main.c
@@ -191,7 +191,8 @@ install_test_account (ModestConf *conf)
                }
        }
        if (!modest_identity_mgr_add_identity (id_mgr,
-                                              MODEST_IDENTITY_DEFAULT_IDENTITY,
+                                               MODEST_IDENTITY_DEFAULT_IDENTITY,
+                                               "Default User",
                                               "user@localhost",
                                               "", "", FALSE, NULL, FALSE ))
                g_warning ("failed to add test identity");