aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c22
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c7
-rw-r--r--addressbook/gui/widgets/eab-gui-util.h1
3 files changed, 12 insertions, 18 deletions
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 1369b480bf..c3d8fb7628 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -190,7 +190,7 @@ static GtkActionEntry internal_mailto_entries[] = {
};
static void
-render_address_link (GString *buffer, EContact *contact, int map_type)
+render_address_link (GString *buffer, EContact *contact, gint map_type)
{
EContactAddress *adr;
GString *link = g_string_new ("");
@@ -645,14 +645,14 @@ render_note_block (GString *buffer, EContact *contact)
}
static void
-render_address_map (GString *buffer, EContact *contact, int map_type)
+render_address_map (GString *buffer, EContact *contact, gint map_type)
{
#ifdef WITH_CONTACT_MAPS
if (map_type == E_CONTACT_ADDRESS_WORK) {
g_string_append (buffer, "<object classid=\"address-map-work\"></object>");
- } else {
+ } else {
g_string_append (buffer, "<object classid=\"address-map-home\"></object>");
- }
+ }
#endif
}
@@ -1181,11 +1181,11 @@ handle_map_scroll_event (GtkWidget *widget, GdkEvent *event)
static void
contact_display_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, EABContactDisplay *display)
{
- EContact *contact = display->priv->contact;
- const gchar *name = e_contact_get_const (contact, E_CONTACT_FILE_AS);
- const gchar *contact_uid = e_contact_get_const (contact, E_CONTACT_UID);
- gchar *full_name;
- EContactAddress *address;
+ EContact *contact = display->priv->contact;
+ const gchar *name = e_contact_get_const (contact, E_CONTACT_FILE_AS);
+ const gchar *contact_uid = e_contact_get_const (contact, E_CONTACT_UID);
+ gchar *full_name;
+ EContactAddress *address;
if (g_ascii_strcasecmp (eb->classid, "address-map-work") == 0) {
address = e_contact_get (contact, E_CONTACT_ADDRESS_WORK);
@@ -1196,7 +1196,7 @@ contact_display_object_requested (GtkHTML *html, GtkHTMLEmbedded *eb, EABContact
}
if (address) {
- GtkWidget *map = e_contact_map_new ();
+ GtkWidget *map = e_contact_map_new ();
gtk_container_add (GTK_CONTAINER (eb), map);
gtk_widget_set_size_request (map, 250, 250);
g_signal_connect (E_CONTACT_MAP (map), "contact-added",
@@ -1344,7 +1344,7 @@ eab_contact_display_init (EABContactDisplay *display)
#ifdef WITH_CONTACT_MAPS
g_signal_connect (web_view, "object-requested",
- G_CALLBACK (contact_display_object_requested), display);
+ G_CALLBACK (contact_display_object_requested), display);
#endif
action_group = gtk_action_group_new ("internal-mailto");
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index d1fc8fd254..1ade6b143a 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -82,8 +82,6 @@ typedef enum {
ADDRESS_FORMAT_BUSINESS = 1
} AddressFormat;
-
-
void
eab_error_dialog (EAlertSink *alert_sink, const gchar *msg, const GError *error)
{
@@ -584,7 +582,6 @@ eab_parse_qp_email_to_html (const gchar *string)
return value;
}
-
/*
* eab_format_address helper function
*
@@ -643,7 +640,6 @@ get_locales_str (void)
return ret;
}
-
/*
* Reads countrytransl.map file, which contains map of localized
* country names and their ISO codes and tries to find matching record
@@ -706,7 +702,6 @@ country_to_ISO (const gchar *country)
return res;
}
-
/*
* Tries to find given key in "country_LANGUAGE" group. When fails to find
* such group, then fallbacks to "country" group. When such group does not
@@ -966,7 +961,7 @@ parse_address_template_section (const gchar *format,
bpos1 = pos + 2;
bpos2 = find_balanced_bracket (bpos1);
- inner = g_strndup (bpos1 + 1, bpos2 - bpos1 - 2); /* Get inner content of the %0(...) */
+ inner = g_strndup (bpos1 + 1, bpos2 - bpos1 - 2); /* Get inner content of the %0 (...) */
replaced = parse_address_template_section (inner, realname, org_name, address, &ires);
if (replaced)
g_string_append (res, ires);
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
index a118ecf29f..b50df6de95 100644
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ b/addressbook/gui/widgets/eab-gui-util.h
@@ -58,7 +58,6 @@ gboolean eab_parse_qp_email (const gchar *string,
gchar **email);
gchar * eab_parse_qp_email_to_html (const gchar *string);
-
gchar * eab_format_address (EContact *contact,
EContactField address_type);