diff options
author | Milan Crha <mcrha@redhat.com> | 2008-04-23 17:29:11 +0800 |
---|---|---|
committer | Milan Crha <mcrha@src.gnome.org> | 2008-04-23 17:29:11 +0800 |
commit | 71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8 (patch) | |
tree | 2b20aee8c3343c30a43923c8abcff8ef55996cdd /mail/mail-config.glade | |
parent | 9364fe50368e2c48b1987edd43c92c1ecd1cd8cd (diff) | |
download | gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.gz gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.tar.zst gsoc2013-evolution-71e5a4dcbb6308b5ea842e37d81ab0d5ff8b56b8.zip |
** Fix for bug #529375
2008-04-23 Milan Crha <mcrha@redhat.com>
** Fix for bug #529375
* evolution-mail.schemas.in:
* mail-config.glade:
* em-utils.h: (em_utils_in_addressbook):
* em-utils.c: (em_utils_in_addressbook):
* em-format-html.c: (emfh_gethttp):
* mail-session.c: (lookup_addressbook):
* mail-config.h: (mail_config_get_lookup_book_local_only):
* mail-config.c: (struct MailConfig), (mail_config_init),
(mail_config_get_lookup_book_local_only):
* em-mailer-prefs.h: (struct _EMMailerPrefs):
* em-mailer-prefs.c: (junk_book_lookup_button_toggled),
(em_mailer_prefs_construct): Add new option
/apps/evolution/mail/junk/lookup_addressbook_local_only
to determine whether check for address in a local address book only.
svn path=/trunk/; revision=35410
Diffstat (limited to 'mail/mail-config.glade')
-rw-r--r-- | mail/mail-config.glade | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/mail/mail-config.glade b/mail/mail-config.glade index f7a7050fa5..f73eaae09c 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -6478,7 +6478,7 @@ For example: "Work" or "Personal"</property> <widget class="GtkTable" id="table34"> <property name="border_width">12</property> <property name="visible">True</property> - <property name="n_rows">8</property> + <property name="n_rows">9</property> <property name="n_columns">1</property> <property name="homogeneous">False</property> <property name="row_spacing">3</property> @@ -6534,8 +6534,8 @@ For example: "Work" or "Personal"</property> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> <property name="x_options">fill</property> </packing> </child> @@ -6615,8 +6615,8 @@ For example: "Work" or "Personal"</property> <packing> <property name="left_attach">0</property> <property name="right_attach">1</property> - <property name="top_attach">7</property> - <property name="bottom_attach">8</property> + <property name="top_attach">8</property> + <property name="bottom_attach">9</property> <property name="x_padding">15</property> <property name="x_options">fill</property> </packing> @@ -6799,6 +6799,29 @@ For example: "Work" or "Personal"</property> </child> <child> + <widget class="GtkCheckButton" id="junk_lookup_local_only"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Lookup in local addressbook only</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="left_attach">0</property> + <property name="right_attach">1</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_padding">25</property> + <property name="x_options">fill</property> + <property name="y_options"></property> + </packing> + </child> + + <child> <widget class="GtkHBox" id="hbox244"> <property name="visible">True</property> <property name="homogeneous">False</property> @@ -6849,9 +6872,9 @@ For example: "Work" or "Personal"</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="x_padding">23</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="x_padding">0</property> <property name="x_options">fill</property> </packing> </child> |