From d65fb37051402d1df0d125540546f63cc6b46ea6 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Mon, 11 Sep 2000 09:59:30 +0000 Subject: Removed a bunch of redundant code. Made it so that when you set an address 2000-09-11 Christopher James Lahey * backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h: Removed a bunch of redundant code. Made it so that when you set an address label, it sets the delivery address as well. Added functions to set and get the delivery address. * backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to convert and address label to a delivery address. * contact-editor/Makefile.am: Added e-contact-editor-address.[ch], fulladdr.glade, fulladdr.glade.h. * contact-editor/contact-editor.glade, contact-editor/e-contact-editor-strings.h: Switched from a label to a button to show the parsed address. * contact-editor/e-contact-editor-address.c, contact-editor/e-contact-editor-address.h: New class to implement the parsed address dialog. * contact-editor/e-contact-editor-fullname.c, contact-editor/e-contact-editor-fullname.h: Added const to the _new function. * contact-editor/e-contact-editor.c: Implemented clicking on the address button. * contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h: New glade files for the parsed address dialog. * contact-editor/fullname-strings.h, fullname.glade: Changed these accellabels to labels. * ename/Makefile.am: Added e-address-western.c. * ename/e-address-western.c: Fixed some warnings. svn path=/trunk/; revision=5317 --- addressbook/ename/e-address-western.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'addressbook/ename/e-address-western.c') diff --git a/addressbook/ename/e-address-western.c b/addressbook/ename/e-address-western.c index b6ced3bebf..3e5d491b90 100644 --- a/addressbook/ename/e-address-western.c +++ b/addressbook/ename/e-address-western.c @@ -45,7 +45,7 @@ e_address_western_is_line_blank (gchar *line) /* In the array of lines, `lines', we will erase the line at line_num, and shift the remaining lines, up to line number num_lines, up one position. */ -void +static void e_address_western_shift_line (gchar *lines[], gint line_num, gint num_lines) { gint cntr; @@ -83,10 +83,10 @@ e_address_western_remove_blank_lines (gchar *lines[], gint *linecntr) } -gboolean +static gboolean e_address_western_is_po_box (gchar *line) { - gboolean retval; + gboolean retval = FALSE; /* In which phase of processing are we? */ enum State { FIRSTCHAR, SECONDCHAR, WHITESPACE } state; @@ -138,7 +138,7 @@ e_address_western_is_po_box (gchar *line) /* A line that contains a comma followed eventually by a number is deemed to be the line in the form of . */ -gboolean +static gboolean e_address_western_is_postal (gchar *line) { gboolean retval; @@ -182,13 +182,13 @@ e_address_western_is_postal (gchar *line) return retval; } -gchar * +static gchar * e_address_western_extract_po_box (gchar *line) { return g_strdup (line); } -gchar * +static gchar * e_address_western_extract_locality (gchar *line) { gint index; @@ -206,7 +206,7 @@ e_address_western_extract_locality (gchar *line) /* Whatever resides between the comma and the start of the postal code is deemed to be the region. */ -gchar * +static gchar * e_address_western_extract_region (gchar *line) { gint start, end; @@ -231,7 +231,7 @@ e_address_western_extract_region (gchar *line) return g_strndup ( (line+start), end-start); } -gchar * +static gchar * e_address_western_extract_postal_code (gchar *line) { int start, end; @@ -261,7 +261,9 @@ e_address_western_parse (const gchar *in_address) gboolean found_po_box, found_postal; EAddressWestern *eaw; +#ifndef NO_WARNINGS gint start, end; /* To be used to classify address lines. */ +#endif if (in_address == NULL) return NULL; -- cgit v1.2.3