Merge branch 'master' into kill-bonobo

Conflicts:
	a11y/widgets/ea-combo-button.c
	a11y/widgets/ea-combo-button.h
	addressbook/gui/component/addressbook-component.c
	addressbook/gui/component/addressbook-component.h
	addressbook/gui/component/addressbook-view.c
	addressbook/gui/component/addressbook-view.h
	addressbook/gui/component/component-factory.c
	addressbook/gui/widgets/e-addressbook-view.c
	addressbook/gui/widgets/eab-contact-display.c
	addressbook/gui/widgets/eab-gui-util.h
	addressbook/gui/widgets/eab-menu.c
	addressbook/gui/widgets/eab-menu.h
	addressbook/gui/widgets/eab-popup-control.c
	addressbook/gui/widgets/eab-popup-control.h
	addressbook/gui/widgets/eab-popup.c
	addressbook/gui/widgets/eab-popup.h
	calendar/gui/cal-search-bar.c
	calendar/gui/calendar-commands.c
	calendar/gui/calendar-component.c
	calendar/gui/comp-editor-factory.c
	calendar/gui/comp-editor-factory.h
	calendar/gui/control-factory.c
	calendar/gui/dialogs/comp-editor.c
	calendar/gui/e-cal-component-memo-preview.c
	calendar/gui/e-cal-component-memo-preview.h
	calendar/gui/e-calendar-table.c
	calendar/gui/e-memo-table.c
	calendar/gui/e-memos.c
	calendar/gui/e-tasks.c
	calendar/gui/gnome-cal.c
	calendar/gui/gnome-cal.h
	calendar/gui/itip-bonobo-control.c
	calendar/gui/itip-bonobo-control.h
	calendar/gui/main.c
	calendar/gui/memos-component.c
	calendar/gui/memos-control.c
	calendar/gui/memos-control.h
	calendar/gui/migration.c
	calendar/gui/migration.h
	calendar/gui/tasks-component.c
	calendar/gui/tasks-control.c
	calendar/importers/main.c
	composer/Makefile.am
	composer/e-composer-header-table.c
	composer/e-composer-header.c
	composer/e-composer-header.h
	composer/e-composer-name-header.c
	composer/e-composer-private.c
	composer/e-composer-text-header.c
	composer/e-msg-composer.c
	composer/e-msg-composer.h
	e-util/e-corba-utils.h
	e-util/e-logger.c
	e-util/e-logger.h
	e-util/e-util-labels.c
	e-util/e-util-labels.h
	em-format/em-format.c
	mail/Makefile.am
	mail/e-mail-shell-migrate.c
	mail/em-account-editor.c
	mail/em-account-editor.h
	mail/em-composer-prefs.c
	mail/em-composer-utils.c
	mail/em-composer-utils.h
	mail/em-folder-browser.c
	mail/em-folder-tree-model.c
	mail/em-folder-tree.c
	mail/em-folder-tree.h
	mail/em-folder-utils.c
	mail/em-folder-utils.h
	mail/em-folder-view.c
	mail/em-format-html-display.c
	mail/em-format-html.c
	mail/em-mailer-prefs.c
	mail/em-mailer-prefs.h
	mail/em-message-browser.c
	mail/em-message-browser.h
	mail/em-network-prefs.h
	mail/em-popup.c
	mail/em-utils.c
	mail/importers/Makefile.am
	mail/mail-component-factory.c
	mail/mail-component.c
	mail/mail-config-factory.c
	mail/mail-config-factory.h
	mail/mail-config.c
	mail/mail-dialogs.glade
	mail/mail-types.h
	plugins/calendar-weather/calendar-weather.c
	plugins/mail-account-disable/mail-account-disable.c
	plugins/select-one-source/select-one-source.c
	po/POTFILES.in
	shell/e-component-registry.c
	shell/e-component-registry.h
	shell/e-component-view.c
	shell/e-component-view.h
	shell/e-corba-config-page.c
	shell/e-corba-config-page.h
	shell/e-shell-constants.h
	shell/e-shell-settings-dialog.c
	shell/e-shell-settings-dialog.h
	shell/e-shell-window-commands.c
	shell/e-shell-window.c
	shell/e-shell.h
	shell/e-sidebar.c
	shell/e-sidebar.h
	shell/e-user-creatable-items-handler.c
	shell/e-user-creatable-items-handler.h
	shell/es-menu.c
	shell/es-menu.h
	shell/evolution-component.h
	shell/evolution-config-control.c
	shell/evolution-config-control.h
	shell/evolution-listener.c
	shell/evolution-listener.h
	shell/evolution-shell-component-utils.c
	shell/evolution-shell-component-utils.h
	shell/importer/evolution-importer-client.c
	shell/importer/evolution-importer-client.h
	shell/importer/evolution-importer-listener.c
	shell/importer/evolution-importer-listener.h
	shell/importer/evolution-importer.c
	shell/importer/evolution-importer.h
	shell/importer/evolution-intelligent-importer.c
	shell/importer/evolution-intelligent-importer.h
	shell/importer/intelligent.c
	shell/main.c
	shell/test/evolution-test-component.c
	shell/test/evolution-test-component.h
	widgets/menus/gal-view-instance.c
	widgets/menus/gal-view-menus.c
	widgets/menus/gal-view-menus.h
	widgets/misc/Makefile.am
	widgets/misc/e-activity-handler.c
	widgets/misc/e-activity-handler.h
	widgets/misc/e-charset-picker.c
	widgets/misc/e-combo-button.c
	widgets/misc/e-combo-button.h
	widgets/misc/e-config-page.h
	widgets/misc/e-dropdown-button.c
	widgets/misc/e-dropdown-button.h
	widgets/misc/e-filter-bar.c
	widgets/misc/e-info-label.c
	widgets/misc/e-info-label.h
	widgets/misc/e-multi-config-dialog.c
	widgets/misc/e-multi-config-dialog.h
	widgets/misc/e-search-bar.c
	widgets/misc/e-search-bar.h
	widgets/misc/e-task-bar.c
	widgets/misc/e-task-bar.h
	widgets/misc/e-task-widget.c
	widgets/misc/e-task-widget.h
	widgets/misc/test-dropdown-button.c
	widgets/misc/test-error.c
	widgets/misc/test-info-label.c
	widgets/table/e-table-example-1.c

1 files changed, 20 insertions, 20 deletions

diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 75a3764183..7e0043d12a 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -711,8 +711,8 @@ struct _date_query_msg {
 	GnomeCalendar *gcal;
 };
 
-static void 
-update_query_async (struct _date_query_msg *msg) 
+static void
+update_query_async (struct _date_query_msg *msg)
 {
 	GnomeCalendar *gcal = msg->gcal;
 	GnomeCalendarPrivate *priv;
@@ -721,7 +721,7 @@ update_query_async (struct _date_query_msg *msg)
 	GList *l;
 
 	priv = gcal->priv;
-	
+
 	/* free the previous queries */
 	for (l = priv->dn_queries; l != NULL; l = l->next) {
 		old_query = l->data;
@@ -744,7 +744,7 @@ update_query_async (struct _date_query_msg *msg)
 		g_slice_free (struct _date_query_msg, msg);
 		return; /* No time range is set, so don't start a query */
 	}
-	
+
 	/* create queries for each loaded client */
 	for (l = priv->clients_list; l != NULL; l = l->next) {
 		GError *error = NULL;
@@ -754,7 +754,7 @@ update_query_async (struct _date_query_msg *msg)
 		if (e_cal_get_load_state ((ECal *) l->data) != E_CAL_LOAD_LOADED)
 			continue;
 
-try_again:		
+try_again:
 		old_query = NULL;
 		if (!e_cal_get_query ((ECal *) l->data, real_sexp, &old_query, &error)) {
 			/* If calendar is busy try again for 3 times. */
@@ -762,11 +762,11 @@ try_again:
 				tries++;
 				/*TODO chose an optimal value */
 				g_usleep (500);
-				
+
 				g_clear_error (&error);
-				goto try_again;	
-			}	
-			
+				goto try_again;
+			}
+
 			g_warning (G_STRLOC ": Could not create the query: %s ", error->message);
 			g_clear_error (&error);
 
@@ -798,7 +798,7 @@ try_again:
 /* Restarts a query for the date navigator in the calendar */
 static void
 update_query (GnomeCalendar *gcal)
-{	
+{
 	struct _date_query_msg *msg;
 
 	e_calendar_item_clear_marks (gcal->priv->date_navigator->calitem);
@@ -1612,7 +1612,7 @@ gnome_calendar_destroy (GtkObject *object)
 		priv->default_client = NULL;
 
 		for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-			if (priv->configs[i]) 
+			if (priv->configs[i])
 				g_object_unref (priv->configs[i]);
 			priv->configs[i] = NULL;
 		}
@@ -2028,7 +2028,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra
 			continue;
 		E_CALENDAR_VIEW (priv->views [i])->in_focus = FALSE;
 	}
-	
+
 	if (grab_focus)
 		focus_current_view (gcal);
 
@@ -2080,7 +2080,7 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data)
 
 
 	display_view (gcal, view_type, TRUE);
-	
+
 	if (!priv->base_view_time)
 		update_view_times (gcal, time (NULL));
 	else
@@ -2136,7 +2136,7 @@ add_mclient (ECalModel *model, ECal *client)
 	message_push ((Message *) msg);
 }
 
-static void 
+static void
 non_intrusive_error_remove(GtkWidget *w, void *data)
 {
 	g_hash_table_remove(non_intrusive_error_table, data);
@@ -2171,7 +2171,7 @@ add_mclient (ECalModel *model, ECal *client)
 	message_push ((Message *) msg);
 }
 
-static void 
+static void
 non_intrusive_error_remove(GtkWidget *w, void *data)
 {
 	g_hash_table_remove(non_intrusive_error_table, data);
@@ -2205,7 +2205,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 		return;
 	case E_CALENDAR_STATUS_INVALID_SERVER_VERSION:
 		id = g_strdup ("calendar:server-version");
-             
+
 		if (g_hash_table_lookup(non_intrusive_error_table, id)) {
 			/* We already have it */
 			g_message("Error occurred while existing dialog active:\n");
@@ -2307,7 +2307,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 		g_hash_table_remove (priv->clients, e_source_peek_uid (source));
 
 		/* FIXME Is there a better way to handle this? */
-		if (priv->default_client) 
+		if (priv->default_client)
 			g_object_unref (priv->default_client);
 		priv->default_client = NULL;
 
@@ -2377,7 +2377,7 @@ backend_error_cb (ECal *client, const char *message, gpointer data)
 
 	g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(dialog));
 	g_signal_connect(GTK_WIDGET (dialog), "destroy", G_CALLBACK(non_intrusive_error_remove), id);
-	
+
 	g_free (uristr);
 }
 
@@ -2909,7 +2909,7 @@ gnome_calendar_on_date_navigator_selection_changed (ECalendarItem *calitem, Gnom
 	/* Make the views display things properly */
 	update_view_times (gcal, new_time);
 	set_view (gcal, view_type, TRUE);
-	
+
 	gnome_calendar_notify_dates_shown_changed (gcal);
 }