Whitespace cleanup.

14 files changed, 61 insertions, 61 deletions

diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
index e06e98f887..0cfcb95b56 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/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index 8017e8979f..8ba997cd3e 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-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/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 379660c993..3ce0a855b9 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -262,7 +262,7 @@ copy_all_contacts_to_cb (BonoboUIComponent *uih, gpointer user_data, const gchar
 	AddressbookView *view = (AddressbookView *) user_data;
 	EABView *v = get_current_view (view);
 
-       	if (v)
+	if (v)
 		eab_view_copy_to_folder (v, TRUE);
 }
 
@@ -419,7 +419,7 @@ rename_addressbook_folder (AddressbookView *view)
 
 	source = e_source_selector_peek_primary_selection (E_SOURCE_SELECTOR (priv->selector));
 	old_name = e_source_peek_name(source);
-     	prompt = g_strdup_printf (_("Rename the \"%s\" folder to:"), old_name);
+	prompt = g_strdup_printf (_("Rename the \"%s\" folder to:"), old_name);
 
 	while (!done) {
 		new_name = e_request_string (NULL, _("Rename Folder"), prompt, old_name);
@@ -923,7 +923,7 @@ save_addressbook_cb(EPopup *ep, EPopupItem *pitem, gpointer data)
 {
 	AddressbookView *view = data;
 	EABView *v = get_current_view (view);
-       	if (v)
+	if (v)
 		eab_view_save_as (v, TRUE);
 }
 
@@ -947,7 +947,7 @@ primary_source_selection_changed_callback (ESourceSelector *selector,
 
 static EPopupItem abv_source_popups[] = {
 	{ E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Address Book"), new_addressbook_cb, NULL, (gchar *) "address-book-new", 0, 0 },
- 	{ E_POPUP_ITEM, (gchar *) "20.saveasvcard", (gchar *) N_("Save As vCard..."), save_addressbook_cb, NULL, (gchar *) "document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "20.saveasvcard", (gchar *) N_("Save As vCard..."), save_addressbook_cb, NULL, (gchar *) "document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY },
 	{ E_POPUP_ITEM, (gchar *) "25.rename", (gchar *) N_("_Rename..."), rename_addressbook_cb, NULL, NULL, 0, EAB_POPUP_SOURCE_PRIMARY },
 
 	{ E_POPUP_BAR,  (gchar *) "30.bar" },
@@ -1241,7 +1241,7 @@ addressbook_view_init (AddressbookView *view)
 				 G_CALLBACK (primary_source_selection_changed_callback),
 				 G_OBJECT (view), 0);
 	g_signal_connect_after (priv->selector, "key_press_event",
-		       		G_CALLBACK (source_selector_key_press_event_callback),
+				G_CALLBACK (source_selector_key_press_event_callback),
 				G_OBJECT (view));
 	g_signal_connect_object (priv->selector, "popup_event",
 				 G_CALLBACK (popup_event_callback),
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 305511d5d5..0ba954320f 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -82,10 +82,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);
@@ -402,20 +402,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;
@@ -3836,7 +3836,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 6959d25801..c658b1070b 100644
--- a/addressbook/gui/contact-editor/eab-editor.h
+++ b/addressbook/gui/contact-editor/eab-editor.h
@@ -65,8 +65,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);
@@ -94,10 +94,10 @@ gboolean        eab_editor_prompt_to_save_changes (EABEditor *editor, GtkWindow
 gboolean	eab_editor_confirm_delete    (GtkWindow *parent, gboolean plural, gboolean is_list, gchar *name);
 
 /* 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 0805ca3110..983de5dab6 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/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index cda5c5f27c..ed726db613 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -1737,10 +1737,10 @@ static void delete_contacts_cb (EBook *book,  EBookStatus status,  gpointer clos
 		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;
@@ -1955,7 +1955,7 @@ eab_view_save_as (EABView *view, gboolean all)
 	if (all) {
 		EBookQuery *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 = get_selected_contacts(view);
@@ -2082,7 +2082,7 @@ view_transfer_contacts (EABView *view, gboolean delete_from_source, gboolean all
 	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 = get_selected_contacts (view);
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index 29b8904797..37bef22900 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 2e9ef12507..8cb68bb504 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -625,8 +625,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 4bda766254..a548c9bf11 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 da85e5fd83..30f326402a 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -770,7 +770,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 197a91e89c..1e39b10cf0 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -105,7 +105,7 @@ eab_uri_popup_email_address_copy(EPopup *ep, EPopupItem *item, gpointer data)
 	i++;
         }
 
-       	g_free(p->selection_uri);
+	g_free(p->selection_uri);
 	p->selection_uri = g_strdup(html);
 	g_free (html);
 
@@ -132,7 +132,7 @@ eab_uri_popup_address_send(EPopup *ep, EPopupItem *item, gpointer data)
          EABPopupTargetURI *t = (EABPopupTargetURI *)ep->target;
          const gchar *url = t->uri;
          EABContactDisplay *display = data;
-  	 struct _EABContactDisplayPrivate *p = display->priv;
+	 struct _EABContactDisplayPrivate *p = display->priv;
 
 	 gint mail_num = atoi (url + strlen ("internal-mailto:"));
 
@@ -185,7 +185,7 @@ eab_uri_popup_free(EPopup *ep, GSList *list, gpointer data)
 		g_slist_free_1(list);
 
 		list = n;
-         	}
+		}
 }
 
 static int
@@ -695,7 +695,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)
@@ -862,7 +862,7 @@ eab_contact_display_render_compact (EABContactDisplay *display, EContact *contac
 				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);								\
@@ -933,10 +933,10 @@ eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *disp
 	if (event->button.button!= 3 )
 		return FALSE;
 
-       	uri = gtk_html_get_url_at (GTK_HTML (widget), event->button.x, event->button.y);
+	uri = gtk_html_get_url_at (GTK_HTML (widget), event->button.x, event->button.y);
 	if (uri){
 		eab_uri_popup_event(display,event,uri);
-               	}
+		}
 
          g_free(uri);
 
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 9b3b0c7730..77481ad2c8 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -55,19 +55,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"),