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, 46 insertions, 46 deletions

diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 1e88303e50..31039bcf44 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -10,7 +10,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:
@@ -92,7 +92,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
         return 0;
 }
 
-static void 
+static void
 epech_get_widgets_data (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -115,8 +115,8 @@ epech_get_widgets_data (CustomHeaderOptionsDialog *mch)
 	return;
 }
 
-static gboolean 
-epech_get_widgets (CustomHeaderOptionsDialog *mch) 
+static gboolean
+epech_get_widgets (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	priv = mch->priv;
@@ -127,39 +127,39 @@ epech_get_widgets (CustomHeaderOptionsDialog *mch)
 	if (!priv->main)
 		return FALSE;
 
-	priv->page  = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");	
-	priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");	
+	priv->page  = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");
+	priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");
 #undef EMAIL_CUSTOM_HEADER
 
 	return (priv->page
 		&&priv->header_table);
 }
 
-static void 
+static void
 epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	HeaderValueComboBox *sub_combo_box_fill;
-	gint set_index_row,set_index_column;	
+	gint set_index_row,set_index_column;
 
 	priv = mch->priv;
 	priv->help_section = g_strdup ("usage-mail");
 
-	for (set_index_row = 0,set_index_column = 0; 
+	for (set_index_row = 0,set_index_column = 0;
 		set_index_column < priv->email_custom_header_details->len;set_index_column++) {
 		sub_combo_box_fill = &g_array_index(priv->combo_box_header_value, HeaderValueComboBox,set_index_column);
 
 		if (priv->flag == 0) {
 			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0);
 		} else {
-			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box, 
+			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,
                         	g_array_index(priv->header_index_type, gint, set_index_column));
 		}
 	}
 }
 
 CustomHeaderOptionsDialog *
-epech_dialog_new (void) 
+epech_dialog_new (void)
 {
 	CustomHeaderOptionsDialog *mch;
 
@@ -168,7 +168,7 @@ epech_dialog_new (void)
 	return mch;
 }
 
-GType 
+GType
 epech_dialog_get_type (void)
 {
 	static GType type = 0;
@@ -189,12 +189,12 @@ epech_dialog_get_type (void)
 		type = g_type_register_static (G_TYPE_OBJECT,
 				"CustomHeaderOptionsDialogType",
 				&info, 0);
-	} 
+	}
 
 	return type;
 }
 
-static void 
+static void
 epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -203,14 +203,14 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 	mch = func_data;
 	priv = mch->priv;
 
-	switch (state) {			
+	switch (state) {
 		case GTK_RESPONSE_OK:
-			epech_get_widgets_data (mch); 
+			epech_get_widgets_data (mch);
 		case GTK_RESPONSE_CANCEL:
 			gtk_widget_hide (priv->main);
 			gtk_widget_destroy (priv->main);
 			g_object_unref (priv->xml);
-			break;	     
+			break;
 		case GTK_RESPONSE_HELP:
 			e_display_help (
 				GTK_WINDOW (priv->main),
@@ -221,9 +221,9 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 	g_signal_emit (G_OBJECT (func_data), signals[MCH_RESPONSE], 0, state);
 }
 
-static gboolean 
+static gboolean
 epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent)
-{	
+{
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	GtkWidget *toplevel;
 	gchar *filename;
@@ -260,12 +260,12 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent)
 	return TRUE;
 }
 
-static void 
+static void
 epech_get_header_list (CustomHeaderOptionsDialog *mch)
 {
 	GConfClient *client;
 
-	client = gconf_client_get_default (); 
+	client = gconf_client_get_default ();
 	g_return_if_fail (GCONF_IS_CLIENT (client));
 	gconf_client_add_dir (client, GCONF_KEY_CUSTOM_HEADER, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	epech_load_from_gconf (client, "/apps/evolution/eplugin/email_custom_header/customHeader", mch);
@@ -273,7 +273,7 @@ epech_get_header_list (CustomHeaderOptionsDialog *mch)
 	return;
 }
 
-static void 
+static void
 epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -319,7 +319,7 @@ epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsD
 	temp_header_details.number_of_header = pos;
 }
 
-static void 
+static void
 epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -331,9 +331,9 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	gint header_section_id,sub_type_index,row,column,label_row;
 	gint i;
 	gchar *str;
-	static gchar *security_field = N_("Security:");
+	static const gchar *security_field = N_("Security:");
 	static struct _security_values {
-		char *value, *str;
+		const gchar *value, *str;
 	} security_values[] = {
 		{ "Personal", N_("Personal") } ,
 		{ "Unclassified", N_("Unclassified") },
@@ -345,9 +345,9 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	};
 
 	priv = mch->priv;
-	priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox)); 
+	priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox));
 
-	for (header_section_id = 0,label_row = 0,row = 0,column = 1; 
+	for (header_section_id = 0,label_row = 0,row = 0,column = 1;
 		header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) {
 
 		/* To create an empty label widget. Text will be added dynamically. */
@@ -369,7 +369,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 		g_array_append_val(priv->combo_box_header_value, sub_combo_box);
 	}
 
-	for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; 
+	for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len;
                 sub_index++,row_combo++,column_combo++) {
 		temp = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,sub_index);
 
@@ -380,7 +380,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 			(GtkAttachOptions) (GTK_FILL), 0, 0);
 
 		for (sub_type_index = 0; sub_type_index < temp->number_of_subtype_header; sub_type_index++) {
-			temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index); 
+			temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index);
 			str = (temp_header_value_ptr->sub_header_string_value)->str;
 			for (i = 0; security_values[i].value != NULL; i++) {
 				if (strcmp (str, security_values[i].value) == 0) {
@@ -397,7 +397,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	}
 }
 
-static void 
+static void
 epech_dialog_class_init (GObjectClass *object)
 {
 	CustomHeaderOptionsDialogClass *klass;
@@ -420,7 +420,7 @@ epech_dialog_class_init (GObjectClass *object)
 			G_TYPE_INT);
 }
 
-static void 
+static void
 epech_dialog_init (GObject *object)
 {
 	CustomHeaderOptionsDialog *mch;
@@ -435,7 +435,7 @@ epech_dialog_init (GObject *object)
 	priv->header_table = NULL;
 }
 
-static void 
+static void
 epech_dialog_finalize (GObject *object)
 {
 	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *)object;
@@ -450,11 +450,11 @@ epech_dialog_finalize (GObject *object)
 		mch->priv = NULL;
 	}
 
-	if (parent_class->finalize) 
+	if (parent_class->finalize)
 		(* parent_class->finalize) (object);
 }
 
-static void 
+static void
 epech_dialog_dispose (GObject *object)
 {
 	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *) object;
@@ -463,9 +463,9 @@ epech_dialog_dispose (GObject *object)
 
 	if (parent_class->dispose)
 		(* parent_class->dispose) (object);
-}	
+}
 
-static void 
+static void
 epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gpointer data)
 {
 	EMsgComposer *composer;
@@ -487,15 +487,15 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp
 				temp_header_value_ptr = &g_array_index(temp_header_ptr->sub_header_type_value, CustomSubHeader,sub_type_index);
 
 				if (sub_type_index == g_array_index(priv->header_index_type, gint, index_subtype)){
-					e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str, 
-						(temp_header_value_ptr->sub_header_string_value)->str);		             
+					e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str,
+						(temp_header_value_ptr->sub_header_string_value)->str);
 				}
 			}
 		}
 	}
 }
 
-static void 
+static void
 epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
 {
         EMsgComposer *composer;
@@ -503,7 +503,7 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
         CustomHeaderOptionsDialog *current_dialog = NULL;
 
         composer = (EMsgComposer *) user_data;
-        
+
         if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data))
 		return;
 
@@ -515,16 +515,16 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
 
         if (current_dialog) {
 		g_free (current_dialog);
-		current_dialog = NULL;	
+		current_dialog = NULL;
         }
 
 	if (new_email_custom_header_window) {
 		g_free (new_email_custom_header_window);
-		new_email_custom_header_window = NULL;           
+		new_email_custom_header_window = NULL;
 	}
 }
 
-static gint 
+static gint
 epech_check_existing_composer_window(gconstpointer compowindow, gconstpointer other_compowindow)
 {
 	if ((compowindow) && (other_compowindow)){
@@ -570,7 +570,7 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp
                         new_email_custom_header_window->epech_window =  menuitem->window;
                         new_email_custom_header_window->epech_dialog = dialog;
                         g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data);
-		}        
+		}
 	}
 
 	epech_dialog_run (dialog, GTK_WIDGET (composer));
@@ -944,7 +944,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(header_isempty), cd);
 
 	/* Populate tree view with values from gconf */
-	header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);	
+	header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);
 
 	for (list = header_list; list; list = g_slist_next (list)) {
 		gchar **parse_header_list;
@@ -954,7 +954,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
                 parse_header_list = g_strsplit_set (buffer, "=,", -1);
                 str_colon = g_strconcat (parse_header_list[0], "", NULL);
                 gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, str_colon, -1);
-		
+
 		for (index = 0; parse_header_list[index+1] ; ++index) {
                         str1_colon = g_strconcat (parse_header_list[index+1], "", NULL);
                         gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, str1_colon, -1);