diff options
| -rw-r--r-- | composer/ChangeLog | 7 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 1 | ||||
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/em-composer-prefs.c | 4 | ||||
| -rw-r--r-- | mail/em-composer-prefs.h | 1 | ||||
| -rw-r--r-- | mail/evolution-mail.schemas.in | 14 | ||||
| -rw-r--r-- | mail/mail-config.glade | 19 |
7 files changed, 57 insertions, 0 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog index 96984e9059..df338f848b 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,10 @@ +2008-01-02 Milan Crha <mcrha@redhat.com> + + ** Part of fix for bug #364642 + + * e-msg-composer.c: (create_composer): Preset "Request Read Receipt" + based on gconf key "/apps/evolution/mail/composer/request_receipt". + 2007-12-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #495123 diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 8c47ceaaec..a2a4973d0d 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -3833,6 +3833,7 @@ create_composer (int visible_mask) gconf = gconf_client_get_default (); composer_settings_update (gconf, 0, NULL, composer); + e_msg_composer_set_request_receipt (composer, gconf_client_get_bool (gconf, "/apps/evolution/mail/composer/request_receipt", NULL)); gconf_client_add_dir (gconf, "/apps/evolution/mail/composer", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); p->notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/composer", composer_settings_update, composer, NULL, NULL); diff --git a/mail/ChangeLog b/mail/ChangeLog index feb7084a65..904c9edead 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,14 @@ +2008-01-02 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #364642 + + * em-composer-prefs.h: (struct _EMComposerPrefs): + * em-composer-prefs.c: (em_composer_prefs_construct): + * mail-config.glade: + * evolution-mail.schemas.in: + (/apps/evolution/mail/composer/request_receipt): + New option in Composer tab to preset Request Read Receipt in composer. + 2008-01-02 Andre Klapper <a9016009@gmx.de> * mail-config.glade: diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c index 4839e4e1f6..11857c14ba 100644 --- a/mail/em-composer-prefs.c +++ b/mail/em-composer-prefs.c @@ -918,6 +918,10 @@ em_composer_prefs_construct (EMComposerPrefs *prefs) toggle_button_init (prefs, prefs->auto_smileys, FALSE, "/apps/evolution/mail/composer/magic_smileys"); + prefs->auto_request_receipt = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkRequestReceipt")); + toggle_button_init (prefs, prefs->auto_request_receipt, FALSE, + "/apps/evolution/mail/composer/request_receipt"); + prefs->top_signature = GTK_TOGGLE_BUTTON (glade_xml_get_widget (gui, "chkTopSignature")); toggle_button_init (prefs, prefs->top_signature, FALSE, "/apps/evolution/mail/composer/top_signature"); diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h index 9a34dcda0a..47e4a95e10 100644 --- a/mail/em-composer-prefs.h +++ b/mail/em-composer-prefs.h @@ -65,6 +65,7 @@ struct _EMComposerPrefs { /* Default Behavior */ struct _GtkToggleButton *send_html; struct _GtkToggleButton *auto_smileys; + struct _GtkToggleButton *auto_request_receipt; struct _GtkToggleButton *prompt_empty_subject; struct _GtkToggleButton *prompt_bcc_only; struct _GtkOptionMenu *charset; diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in index d4fc65a618..381fdd5a71 100644 --- a/mail/evolution-mail.schemas.in +++ b/mail/evolution-mail.schemas.in @@ -60,6 +60,20 @@ </schema> <schema> + <key>/schemas/apps/evolution/mail/composer/request_receipt</key> + <applyto>/apps/evolution/mail/composer/request_receipt</applyto> + <owner>evolution-mail</owner> + <type>bool</type> + <default>false</default> + <locale name="C"> + <short>Always request read receipt</short> + <long> + Whether a read receipt request gets added to every message by default. + </long> + </locale> + </schema> + + <schema> <key>/schemas/apps/evolution/mail/composer/inline_spelling</key> <applyto>/apps/evolution/mail/composer/inline_spelling</applyto> <owner>evolution-mail</owner> diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 7793bf5077..be14dc151f 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -6882,6 +6882,25 @@ For example: "Work" or "Personal"</property> </child> <child> + <widget class="GtkCheckButton" id="chkRequestReceipt"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Always request rea_d receipt</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> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <widget class="GtkTable" id="tableForwardsReplies"> <property name="visible">True</property> <property name="n_rows">3</property> |