aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/gui')
-rw-r--r--addressbook/gui/component/addressbook-config.h2
-rw-r--r--addressbook/gui/component/e-book-shell-migrate.c2
-rw-r--r--addressbook/gui/component/openldap-extract.h10
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c18
-rw-r--r--addressbook/gui/contact-editor/eab-editor.h12
-rw-r--r--addressbook/gui/merging/eab-contact-merging.c4
-rw-r--r--addressbook/gui/widgets/a11y/ea-minicard-view.c6
-rw-r--r--addressbook/gui/widgets/e-addressbook-model.c6
-rw-r--r--addressbook/gui/widgets/e-addressbook-view.c10
-rw-r--r--addressbook/gui/widgets/e-minicard-view-widget.h4
-rw-r--r--addressbook/gui/widgets/e-minicard-view.c4
-rw-r--r--addressbook/gui/widgets/e-minicard-view.h4
-rw-r--r--addressbook/gui/widgets/e-minicard.c2
-rw-r--r--addressbook/gui/widgets/eab-contact-display.c6
-rw-r--r--addressbook/gui/widgets/eab-gui-util.c26
15 files changed, 58 insertions, 58 deletions
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
index 2814e8c839..26c1788e51 100644
--- a/addressbook/gui/component/addressbook-config.h
+++ b/addressbook/gui/component/addressbook-config.h
@@ -15,7 +15,7 @@
*
* Authors:
* Chris Toshok <toshok@ximian.com>
- * Chris Lahey <clahey@ximian.com>
+ * Chris Lahey <clahey@ximian.com>
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*
diff --git a/addressbook/gui/component/e-book-shell-migrate.c b/addressbook/gui/component/e-book-shell-migrate.c
index 4ac70309e7..4b0b61d186 100644
--- a/addressbook/gui/component/e-book-shell-migrate.c
+++ b/addressbook/gui/component/e-book-shell-migrate.c
@@ -660,7 +660,7 @@ migrate_ldap_servers (MigrationContext *context, ESourceGroup *on_ldap_servers)
port = get_string_child (child, "port");
host = get_string_child (child, "host");
rootdn = get_string_child (child, "rootdn");
- scope = get_string_child (child, "scope");
+ scope = get_string_child (child, "scope");
authmethod = get_string_child (child, "authmethod");
ssl = get_string_child (child, "ssl");
emailaddr = get_string_child (child, "emailaddr");
diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h
index 083fc0d162..630e12e4f6 100644
--- a/addressbook/gui/component/openldap-extract.h
+++ b/addressbook/gui/component/openldap-extract.h
@@ -214,8 +214,8 @@ get_token( const gchar ** sp, gchar ** token_val )
*token_val = res;
}
break;
-/* kind = TK_UNEXPCHAR; */
-/* break; */
+/* kind = TK_UNEXPCHAR; */
+/* break; */
}
return kind;
@@ -863,9 +863,9 @@ skip_url_prefix(
const gchar **scheme )
{
/*
- * return non-zero if this looks like a LDAP URL; zero if not
- * if non-zero returned, *urlp will be moved past "ldap://" part of URL
- */
+ * return non-zero if this looks like a LDAP URL; zero if not
+ * if non-zero returned, *urlp will be moved past "ldap://" part of URL
+ */
const gchar *p;
if ( url == NULL ) {
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index fd00b1e733..7f3699f834 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -81,10 +81,10 @@ static void e_contact_editor_set_property (GObject *object, guint prop_id, const
static void e_contact_editor_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
static void e_contact_editor_dispose (GObject *object);
-static void e_contact_editor_raise (EABEditor *editor);
-static void e_contact_editor_show (EABEditor *editor);
+static void e_contact_editor_raise (EABEditor *editor);
+static void e_contact_editor_show (EABEditor *editor);
static void e_contact_editor_save_contact (EABEditor *editor, gboolean should_close);
-static void e_contact_editor_close (EABEditor *editor);
+static void e_contact_editor_close (EABEditor *editor);
static gboolean e_contact_editor_is_valid (EABEditor *editor);
static gboolean e_contact_editor_is_changed (EABEditor *editor);
static GtkWindow* e_contact_editor_get_window (EABEditor *editor);
@@ -453,20 +453,20 @@ name_to_style (const EContactName *name, const gchar *company, gint style)
midstrptr=midstring;
if(name){
if (name->family && *name->family)
- *(midstrptr++) = name->family;
+ *(midstrptr++) = name->family;
if (name->given && *name->given)
- *(midstrptr++) = name->given;
+ *(midstrptr++) = name->given;
}
*midstrptr = NULL;
stringptr = strings;
*(stringptr++) = g_strjoinv(", ", midstring);
- if (name) {
+ if (name) {
if (name->additional && *name->additional)
*(stringptr++) = name->additional;
}
*stringptr = NULL;
- string = g_strjoinv(" ", strings);
- break;
+ string = g_strjoinv(" ", strings);
+ break;
case 3:
string = g_strdup(company);
break;
@@ -3892,7 +3892,7 @@ e_contact_editor_create_source_combo_box (gchar *name,
GtkWidget *
e_contact_editor_create_source_combo_box (gchar *name,
- gchar *string1, gchar *string2,
+ gchar *string1, gchar *string2,
gint int1, gint int2)
{
GtkWidget *combo_box;
diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h
index 9dcb5e19d0..1b3de4b28a 100644
--- a/addressbook/gui/contact-editor/eab-editor.h
+++ b/addressbook/gui/contact-editor/eab-editor.h
@@ -64,8 +64,8 @@ struct _EABEditorClass
/* virtual functions */
void (* show) (EABEditor *editor);
- void (* close) (EABEditor *editor);
- void (* raise) (EABEditor *editor);
+ void (* close) (EABEditor *editor);
+ void (* raise) (EABEditor *editor);
void (* save_contact) (EABEditor *editor, gboolean should_close);
gboolean (* is_valid) (EABEditor *editor);
gboolean (* is_changed) (EABEditor *editor);
@@ -92,10 +92,10 @@ GtkWindow* eab_editor_get_window (EABEditor *editor);
gboolean eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow *window);
/* these four generate EABEditor signals */
-void eab_editor_contact_added (EABEditor *editor, EBookStatus status, EContact *contact);
-void eab_editor_contact_modified (EABEditor *editor, EBookStatus status, EContact *contact);
-void eab_editor_contact_deleted (EABEditor *editor, EBookStatus status, EContact *contact);
-void eab_editor_closed (EABEditor *editor);
+void eab_editor_contact_added (EABEditor *editor, EBookStatus status, EContact *contact);
+void eab_editor_contact_modified (EABEditor *editor, EBookStatus status, EContact *contact);
+void eab_editor_contact_deleted (EABEditor *editor, EBookStatus status, EContact *contact);
+void eab_editor_closed (EABEditor *editor);
/* these maintain the global list of editors so we can prompt the user
if there are unsaved changes when they exit. */
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 0bcee0be38..c8d795b2e8 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -346,14 +346,14 @@ mergeit (EContactMergingLookup *lookup)
switch (result)
{
case GTK_RESPONSE_OK:
- lookup->contact = lookup->match;
+ lookup->contact = lookup->match;
e_book_async_remove_contact (lookup->book, lookup->match, NULL, lookup);
e_book_async_add_contact (lookup->book, lookup->contact, final_id_cb, lookup);
value = 1;
break;
case GTK_RESPONSE_CANCEL:
default:
- value = 0;
+ value = 0;
break;
}
gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/addressbook/gui/widgets/a11y/ea-minicard-view.c b/addressbook/gui/widgets/a11y/ea-minicard-view.c
index 09eef66ad2..b35f64ae5e 100644
--- a/addressbook/gui/widgets/a11y/ea-minicard-view.c
+++ b/addressbook/gui/widgets/a11y/ea-minicard-view.c
@@ -160,8 +160,8 @@ ea_minicard_view_get_name (AtkObject *accessible)
source_name="";
string = g_strdup_printf (ngettext ("current address book folder %s has %d card",
- "current address book folder %s has %d cards",
- reflow->count), source_name, reflow->count);
+ "current address book folder %s has %d cards",
+ reflow->count), source_name, reflow->count);
ATK_OBJECT_CLASS (parent_class)->set_name (accessible, string);
g_free (string);
@@ -384,7 +384,7 @@ static gboolean atk_action_interface_do_action (AtkAction *action, gint i)
e_minicard_view_create_contact_list (card_view);
break;
default:
- return_value = FALSE;
+ return_value = FALSE;
break;
}
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 79d11627aa..b68763c805 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -155,8 +155,8 @@ update_folder_bar_message (EAddressbookModel *model)
static void
create_contact (EBookView *book_view,
- const GList *contact_list,
- EAddressbookModel *model)
+ const GList *contact_list,
+ EAddressbookModel *model)
{
GPtrArray *array;
guint count;
@@ -681,7 +681,7 @@ e_addressbook_model_new (void)
EContact *
e_addressbook_model_get_contact (EAddressbookModel *model,
- gint row)
+ gint row)
{
GPtrArray *array;
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index fe46882b2e..657d04a895 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1099,10 +1099,10 @@ delete_contacts_cb (EBook *book, EBookStatus status, gpointer closure)
case E_BOOK_ERROR_OK :
case E_BOOK_ERROR_CANCELLED :
break;
- case E_BOOK_ERROR_PERMISSION_DENIED :
- e_error_run (NULL, "addressbook:contact-delete-error-perm", NULL);
+ case E_BOOK_ERROR_PERMISSION_DENIED :
+ e_error_run (NULL, "addressbook:contact-delete-error-perm", NULL);
break;
- default :
+ default :
/* Unknown error */
eab_error_dialog (_("Failed to delete contact"), status);
break;
@@ -1295,7 +1295,7 @@ e_addressbook_view_save_as (EAddressbookView *view,
query = e_book_query_any_field_contains ("");
e_book_get_contacts (book, query, &list, NULL);
- e_book_query_unref (query);
+ e_book_query_unref (query);
} else
list = e_addressbook_view_get_selected (view);
@@ -1426,7 +1426,7 @@ view_transfer_contacts (EAddressbookView *view, gboolean delete_from_source, gbo
if (all) {
EBookQuery *query = e_book_query_any_field_contains("");
e_book_get_contacts(book, query, &contacts, NULL);
- e_book_query_unref(query);
+ e_book_query_unref(query);
}
else {
contacts = e_addressbook_view_get_selected (view);
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index 8af99aa20a..b9dcaecbf1 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -32,8 +32,8 @@ G_BEGIN_DECLS
#define E_TYPE_MINICARD_VIEW_WIDGET (e_minicard_view_widget_get_type ())
#define E_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidget))
#define E_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW_WIDGET, EMinicardViewWidgetClass))
-#define E_IS_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
-#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
+#define E_IS_MINICARD_VIEW_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
+#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
typedef struct _EMinicardViewWidget EMinicardViewWidget;
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index c62a33463b..e8b9c5db5a 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -639,8 +639,8 @@ e_minicard_view_jump_to_letter (EMinicardView *view,
utf_str [g_unichar_to_utf8 (letter, utf_str)] = '\0';
e_reflow_sorted_jump (E_REFLOW_SORTED (view),
- (GCompareFunc) compare_to_utf_str,
- utf_str);
+ (GCompareFunc) compare_to_utf_str,
+ utf_str);
#endif
}
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 7a21914e86..db8815e3a2 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -55,8 +55,8 @@ G_BEGIN_DECLS
#define E_TYPE_MINICARD_VIEW (e_minicard_view_get_type ())
#define E_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_MINICARD_VIEW, EMinicardView))
#define E_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_MINICARD_VIEW, EMinicardViewClass))
-#define E_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW))
-#define E_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW))
+#define E_IS_MINICARD_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW))
+#define E_IS_MINICARD_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW))
typedef struct _EMinicardView EMinicardView;
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index fe907d583d..c446e1affa 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -742,7 +742,7 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
EMinicardField *minicard_field;
gchar *name;
gchar *string;
- gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
+ gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
group = GNOME_CANVAS_GROUP( e_minicard );
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 292edd4e18..0b3e122846 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -682,7 +682,7 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
e_contact_photo_free (photo);
}
- gtk_html_stream_printf (html_stream, "</td><td %s valign=\"top\">\n", is_rtl ? " align=\"right\" " : "");
+ gtk_html_stream_printf (html_stream, "</td><td %s valign=\"top\">\n", is_rtl ? " align=\"right\" " : "");
str = e_contact_get_const (contact, E_CONTACT_FILE_AS);
if (!str)
@@ -844,7 +844,7 @@ eab_contact_display_render_compact (EABContactDisplay *display,
html = eab_parse_qp_email_to_html (str); \
\
if (!html) \
- html = e_text_to_html (str, 0); \
+ html = e_text_to_html (str, 0); \
\
gtk_html_stream_printf (html_stream, "%s%s", comma ? ", " : "", html); \
g_free (html); \
@@ -905,7 +905,7 @@ contact_display_button_press_event (GtkWidget *widget,
if (event->button.button != 3)
return FALSE;
- uri = gtk_html_get_url_at (
+ uri = gtk_html_get_url_at (
GTK_HTML (widget),
event->button.x, event->button.y);
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index e8269100b7..58dc60083d 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -49,19 +49,19 @@
/* the NULL's in this table correspond to the status codes
that should *never* be generated by a backend */
static const gchar *status_to_string[] = {
- /* E_BOOK_ERROR_OK */ N_("Success"),
- /* E_BOOK_ERROR_INVALID_ARG */ NULL,
- /* E_BOOK_ERROR_BUSY */ N_("Backend busy"),
- /* E_BOOK_ERROR_REPOSITORY_OFFLINE */ N_("Repository offline"),
- /* E_BOOK_ERROR_NO_SUCH_BOOK */ N_("Address Book does not exist"),
- /* E_BOOK_ERROR_NO_SELF_CONTACT */ N_("No Self Contact defined"),
- /* E_BOOK_ERROR_URI_NOT_LOADED */ NULL,
- /* E_BOOK_ERROR_URI_ALREADY_LOADED */ NULL,
- /* E_BOOK_ERROR_PERMISSION_DENIED */ N_("Permission denied"),
- /* E_BOOK_ERROR_CONTACT_NOT_FOUND */ N_("Contact not found"),
- /* E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS */ N_("Contact ID already exists"),
- /* E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED */ N_("Protocol not supported"),
- /* E_BOOK_ERROR_CANCELLED */ N_("Canceled"),
+ /* E_BOOK_ERROR_OK */ N_("Success"),
+ /* E_BOOK_ERROR_INVALID_ARG */ NULL,
+ /* E_BOOK_ERROR_BUSY */ N_("Backend busy"),
+ /* E_BOOK_ERROR_REPOSITORY_OFFLINE */ N_("Repository offline"),
+ /* E_BOOK_ERROR_NO_SUCH_BOOK */ N_("Address Book does not exist"),
+ /* E_BOOK_ERROR_NO_SELF_CONTACT */ N_("No Self Contact defined"),
+ /* E_BOOK_ERROR_URI_NOT_LOADED */ NULL,
+ /* E_BOOK_ERROR_URI_ALREADY_LOADED */ NULL,
+ /* E_BOOK_ERROR_PERMISSION_DENIED */ N_("Permission denied"),
+ /* E_BOOK_ERROR_CONTACT_NOT_FOUND */ N_("Contact not found"),
+ /* E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS */ N_("Contact ID already exists"),
+ /* E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED */ N_("Protocol not supported"),
+ /* E_BOOK_ERROR_CANCELLED */ N_("Canceled"),
/* E_BOOK_ERROR_COULD_NOT_CANCEL */ N_("Could not cancel"),
/* E_BOOK_ERROR_AUTHENTICATION_FAILED */ N_("Authentication Failed"),
/* E_BOOK_ERROR_AUTHENTICATION_REQUIRED */ N_("Authentication Required"),