aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
authorHans Petter Jansson <hpj@ximian.com>2004-06-26 09:40:03 +0800
committerHans Petter <hansp@src.gnome.org>2004-06-26 09:40:03 +0800
commit19ed9cded5ddbf8529262c647f8688bfa4f408ef (patch)
tree9513fd92dcb279b3e5ac8ccf80770f3776e822a5 /addressbook
parent497bf574303ec35725bdd8b1d35b0ce52160f53b (diff)
downloadgsoc2013-evolution-19ed9cded5ddbf8529262c647f8688bfa4f408ef.tar
gsoc2013-evolution-19ed9cded5ddbf8529262c647f8688bfa4f408ef.tar.gz
gsoc2013-evolution-19ed9cded5ddbf8529262c647f8688bfa4f408ef.tar.bz2
gsoc2013-evolution-19ed9cded5ddbf8529262c647f8688bfa4f408ef.tar.lz
gsoc2013-evolution-19ed9cded5ddbf8529262c647f8688bfa4f408ef.tar.xz
gsoc2013-evolution-19ed9cded5ddbf8529262c647f8688bfa4f408ef.tar.zst
gsoc2013-evolution-19ed9cded5ddbf8529262c647f8688bfa4f408ef.zip
Add a newline between street line and rest of extended address.
2004-06-25 Hans Petter Jansson <hpj@ximian.com> * gui/contact-editor/e-contact-editor.c (fill_in_address_textview): Add a newline between street line and rest of extended address. (extract_address_textview): Omit the newline trailing the street line. svn path=/trunk/; revision=26526
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c5
2 files changed, 10 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index aee9e0cf42..a7b390ac49 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-25 Hans Petter Jansson <hpj@ximian.com>
+
+ * gui/contact-editor/e-contact-editor.c (fill_in_address_textview): Add
+ a newline between street line and rest of extended address.
+ (extract_address_textview): Omit the newline trailing the street line.
+
2004-06-24 Hans Petter Jansson <hpj@ximian.com>
* gui/contact-editor/e-contact-editor.c (address_labels): Add table.
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index f400af0469..6038d44775 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -1645,6 +1645,7 @@ fill_in_address_textview (EContactEditor *editor, gint record, EContactAddress *
gtk_text_buffer_set_text (text_buffer, address->street ? address->street : "", -1);
gtk_text_buffer_get_end_iter (text_buffer, &iter);
+ gtk_text_buffer_insert (text_buffer, &iter, "\n", -1);
gtk_text_buffer_insert (text_buffer, &iter, address->ext ? address->ext : "", -1);
}
@@ -1714,12 +1715,14 @@ extract_address_textview (EContactEditor *editor, gint record, EContactAddress *
return;
iter_2 = iter_1;
- gtk_text_iter_forward_line (&iter_2);
+ gtk_text_iter_forward_to_line_end (&iter_2);
/* Extract street (first line of text) */
address->street = gtk_text_iter_get_text (&iter_1, &iter_2);
iter_1 = iter_2;
+ gtk_text_iter_forward_line (&iter_1);
+
if (gtk_text_iter_is_end (&iter_1))
return;