Aggiunta la possibilità di richiedere la ricevuta

di ritorno in SolipaMailUI (closes #234).

diff --git a/data/libsolipa/gui/libsolipa.ui b/data/libsolipa/gui/libsolipa.ui
index d62653435c0ae9380379824ba2e253c03cc5d4d1..8ef1daec0430a0a74b6693340282dcc5ea85025b 100644 (file)
--- a/data/libsolipa/gui/libsolipa.ui
+++ b/data/libsolipa/gui/libsolipa.ui
@@ -468,7 +468,7 @@
           <object class="GtkTable" id="table2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="n_rows">8</property>
+            <property name="n_rows">10</property>
             <property name="n_columns">2</property>
             <property name="column_spacing">5</property>
             <property name="row_spacing">5</property>
@@ -657,8 +657,8 @@
               </object>
               <packing>
                 <property name="right_attach">2</property>
-                <property name="top_attach">6</property>
-                <property name="bottom_attach">7</property>
+                <property name="top_attach">8</property>
+                <property name="bottom_attach">9</property>
               </packing>
             </child>
             <child>
@@ -750,6 +750,18 @@
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">9</property>
+                <property name="bottom_attach">10</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkHSeparator" id="hseparator2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
               <packing>
                 <property name="right_attach">2</property>
                 <property name="top_attach">7</property>
@@ -757,6 +769,46 @@
                 <property name="y_options">GTK_FILL</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkHBox" id="hbox3">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="spacing">5</property>
+                <child>
+                  <object class="GtkLabel" id="label15">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Richiedere ricevuta di ritorno</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="checkbutton4">
+                    <property name="use_action_appearance">False</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="right_attach">2</property>
+                <property name="top_attach">6</property>
+                <property name="bottom_attach">7</property>
+                <property name="y_options">GTK_FILL</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="expand">True</property>

diff --git a/src/mail.c b/src/mail.c
index 913714ca7e9f7559e71132b3ffad8787d147c9fc..d544d91a36d6fd37fc8f76d1bb11d833c72d4229 100644 (file)
--- a/src/mail.c
+++ b/src/mail.c
@@ -551,8 +551,8 @@ solipa_mail_send (SolipaMail *mail, const gchar *url)
 
        if (priv->with_notification)
                {
-                       gchar *namep;
-                       gchar *addressp;
+                       const gchar *namep;
+                       const gchar *addressp;
 
                        if (camel_internet_address_get (from, 0, &namep, &addressp))
                                {

diff --git a/src/mailui.c b/src/mailui.c
index 4138b3e388cfda67b9543fca76b089513c49521d..1a35986e533df31d1da83d00862bf7351d1f8f80 100644 (file)
--- a/src/mailui.c
+++ b/src/mailui.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Andrea Zagli <azagli@libero.it>
+ * Copyright (C) 2011-2012 Andrea Zagli <azagli@libero.it>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -40,6 +40,8 @@ enum
        PROP_BCC_VISIBLE,
        PROP_SUBJECT,
        PROP_SUBJECT_EDITABLE,
+       PROP_WITH_NOTIFICATION,
+       PROP_WITH_NOTIFICATION_VISIBLE,
        PROP_BODY,
        PROP_BODY_EDITABLE,
        PROP_WITH_ATTACHMENTS
@@ -101,6 +103,9 @@ struct _SolipaMailUIPrivate
                GtkWidget *bcc;
                GtkWidget *bcc_lbl;
                GtkWidget *subject;
+               GtkWidget *with_notification;
+               GtkWidget *with_notification_lbl;
+               GtkWidget *hseparator2;
                GtkWidget *body;
                GtkWidget *iv_attachments;
                GtkWidget *btn_attachment_remove;
@@ -209,6 +214,20 @@ solipa_mail_ui_class_init (SolipaMailUIClass *klass)
                                                               TRUE,
                                                               G_PARAM_READWRITE));
 
+       g_object_class_install_property (object_class, PROP_WITH_NOTIFICATION,
+                                        g_param_spec_boolean ("with-notification",
+                                                              "With notification",
+                                                              "With notification",
+                                                              FALSE,
+                                                              G_PARAM_READWRITE));
+
+       g_object_class_install_property (object_class, PROP_WITH_NOTIFICATION_VISIBLE,
+                                        g_param_spec_boolean ("with-notification-visible",
+                                                              "With notification visible",
+                                                              "With notification visible",
+                                                              FALSE,
+                                                              G_PARAM_READWRITE));
+
        g_object_class_install_property (object_class, PROP_BODY,
                                         g_param_spec_string ("body",
                                                              "Body",
@@ -325,6 +344,9 @@ SolipaMailUI
        priv->bcc = GTK_WIDGET (gtk_builder_get_object (builder, "entry7"));
        priv->bcc_lbl = GTK_WIDGET (gtk_builder_get_object (builder, "label12"));
        priv->subject = GTK_WIDGET (gtk_builder_get_object (builder, "entry5"));
+       priv->with_notification = GTK_WIDGET (gtk_builder_get_object (builder, "checkbutton4"));
+       priv->with_notification_lbl = GTK_WIDGET (gtk_builder_get_object (builder, "label15"));
+       priv->hseparator2 = GTK_WIDGET (gtk_builder_get_object (builder, "hseparator2"));
        priv->body = GTK_WIDGET (gtk_builder_get_object (builder, "textview1"));
 
        priv->lstore_attachments = GTK_LIST_STORE (gtk_builder_get_object (builder, "lstore_mail_attachments"));
@@ -406,6 +428,7 @@ solipa_mail_ui_send (SolipaMailUI *mailui)
        gchar *cc;
        gchar *bcc;
        gchar *subject;
+       gboolean with_notification;
        gchar *body;
 
        gchar *email;
@@ -449,11 +472,14 @@ solipa_mail_ui_send (SolipaMailUI *mailui)
                      "cc", &cc,
                      "bcc", &bcc,
                      "subject", &subject,
+                     "with-notification", &with_notification,
                      "body", &body,
                      NULL);
 
        solipa_mail_set_subject (smail, subject);
 
+       solipa_mail_set_notification (smail, with_notification);
+
        if (g_strcmp0 (g_strstrip (from), "") != 0)
                {
                        lst_addrs = solipa_mail_get_addresses_from_string (from);
@@ -740,6 +766,16 @@ solipa_mail_ui_set_property (GObject *object,
                                gtk_entry_set_editable (GTK_ENTRY (priv->subject), g_value_get_boolean (value));
                                break;
 
+                       case PROP_WITH_NOTIFICATION:
+                               gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->with_notification), g_value_get_boolean (value));
+                               break;
+
+                       case PROP_WITH_NOTIFICATION_VISIBLE:
+                               gtk_widget_set_visible (priv->with_notification,  g_value_get_boolean (value));
+                               gtk_widget_set_visible (priv->with_notification_lbl,  g_value_get_boolean (value));
+                               gtk_widget_set_visible (priv->hseparator2,  g_value_get_boolean (value));
+                               break;
+
                        case PROP_BODY:
                                {
                                        GtkTextBuffer *buffer;
@@ -827,6 +863,14 @@ solipa_mail_ui_get_property (GObject *object,
                                g_value_set_boolean (value, gtk_editable_get_editable (GTK_EDITABLE (priv->subject)));
                                break;
 
+                       case PROP_WITH_NOTIFICATION:
+                               g_value_set_boolean (value, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->with_notification)));
+                               break;
+
+                       case PROP_WITH_NOTIFICATION_VISIBLE:
+                               g_value_set_boolean (value, gtk_widget_get_visible (priv->with_notification));
+                               break;
+
                        case PROP_BODY:
                                {
                                        GtkTextBuffer *buffer;

diff --git a/tests/mailui.c b/tests/mailui.c
index 1f03545a50331c9f0b5a1e5b465a052f3c78bced..10936ca0e5c2e835030fa48d36af985f8fd26c7c 100644 (file)
--- a/tests/mailui.c
+++ b/tests/mailui.c
@@ -125,6 +125,7 @@ main (int argc, char *argv[])
                      "from-editable", FALSE,
                      "to", "azagli@libero.it",
                      "bcc-visible", FALSE,
+                     "with-notification", TRUE,
                      "subject", "Da SolipaMailUI",
                      "body", "Il body della mail\n"
                              " con a capo\t\te tab\n\nprova prova",