Merge revisions 35951:35992 from trunk.

svn path=/branches/kill-bonobo/; revision=35994

16 files changed, 26 insertions, 68 deletions

diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 48402bbab3..11642e3e47 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -37,7 +37,6 @@
 #include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
 #include "e-util/e-dialog-widgets.h"
-#include "e-util/e-icon-factory.h"
 #include "e-util/e-util-private.h"
 #include <libebook/e-destination.h>
 #include <libedataserverui/e-name-selector.h>
@@ -1142,7 +1141,6 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 {
 	Dialog dialog;
 	int response_id;
-	GList *icon_list;
 	char *gladefile;
 
 	g_return_val_if_fail (alarm != NULL, FALSE);
@@ -1178,12 +1176,8 @@ alarm_dialog_run (GtkWidget *parent, ECal *ecal, ECalComponentAlarm *alarm)
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
 
-	icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
+	gtk_window_set_icon_name (
+		GTK_WINDOW (dialog.toplevel), "x-office-calendar");
 
 	gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel),
 				      GTK_WINDOW (parent));
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 8bce8f0eaa..8066061993 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -37,7 +37,6 @@
 #include <libecal/e-cal-util.h>
 #include <libecal/e-cal-time-util.h>
 #include "e-util/e-dialog-widgets.h"
-#include "e-util/e-icon-factory.h"
 #include "e-util/e-util-private.h"
 #include "alarm-dialog.h"
 #include "alarm-list-dialog.h"
@@ -263,7 +262,6 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 {
 	Dialog dialog;
 	int response_id;
-	GList *icon_list;
 	char *gladefile;
 
 	dialog.ecal = ecal;
@@ -293,12 +291,8 @@ alarm_list_dialog_run (GtkWidget *parent, ECal *ecal, EAlarmList *list_store)
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->vbox), 0);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog.toplevel)->action_area), 12);
 
-	icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog.toplevel), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
+	gtk_window_set_icon_name (
+		GTK_WINDOW (dialog.toplevel), "x-office-calendar");
 
 	gtk_window_set_transient_for (GTK_WINDOW (dialog.toplevel),
 				      GTK_WINDOW (parent));
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 2f08acbf07..2d2acb359e 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -36,7 +36,6 @@
 #include <glib/gi18n.h>
 
 #include "cal-attachment-select-file.h"
-#include <e-util/e-icon-factory.h>
 
 enum {
 	SELECTOR_MODE_MULTI    = (1 << 0),
@@ -49,7 +48,6 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
 	GtkWidget *selection;
 	GtkWidget *showinline = NULL;
 	char *path;
-	GList *icon_list;
 
 	path = g_object_get_data ((GObject *) editor, "attach_path");
 
@@ -90,12 +88,7 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
 	gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor");
 	gtk_window_set_modal ((GtkWindow *) selection, TRUE);
 
-	icon_list = e_icon_factory_get_icon_list ("mail-message-new");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
+	gtk_window_set_icon_name (GTK_WINDOW (selection), "mail-message-new");
 
 	if (gtk_dialog_run ((GtkDialog *) selection) == GTK_RESPONSE_OK) {
 		if (showinline_p)
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index c0cd28f6c0..4e81e79f44 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -25,7 +25,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
 #include "e-util/e-error.h"
 #include "cancel-comp.h"
 
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index c994fb6303..5f62e54624 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -24,7 +24,6 @@
 
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
 #include "changed-comp.h"
 
 
@@ -48,7 +47,6 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
 	ECalComponentVType vtype;
 	char *str;
 	gint response;
-	GList *icon_list;
 
 	vtype = e_cal_component_get_vtype (comp);
 
@@ -105,12 +103,7 @@ changed_component_dialog (GtkWindow *parent, ECalComponent *comp, gboolean delet
 					 GTK_MESSAGE_QUESTION,
 					 GTK_BUTTONS_YES_NO, "%s", str);
 
-	icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
+	gtk_window_set_icon_name (GTK_WINDOW (dialog), "x-office-calendar");
 
 	response = gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 9a08009b6c..3ae846ac79 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -31,6 +31,7 @@
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
 #include <libgnome/libgnome.h>
+#include <e-util/e-util.h>
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-util-private.h>
 #include <e-util/gconf-bridge.h>
@@ -2255,16 +2256,11 @@ static void
 comp_editor_show_help (CompEditor *editor)
 {
 	CompEditorClass *class;
-	GError *error = NULL;
 
 	class = COMP_EDITOR_GET_CLASS (editor);
 	g_return_if_fail (class->help_section != NULL);
 
-	gnome_help_display ("evolution.xml", class->help_section, &error);
-	if (error != NULL) {
-		g_warning ("%s", error->message);
-		g_error_free (error);
-	}
+	e_display_help (GTK_WINDOW (editor), class->help_section);
 }
 
 
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index b87a01a58e..228e84f464 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <e-util/e-icon-factory.h>
 #include "e-util/e-error.h"
 #include "../calendar-config.h"
 #include "delete-comp.h"
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index d1280da16a..7c264d0638 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -25,7 +25,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libgnomeui/gnome-uidefs.h>
-#include <e-util/e-icon-factory.h>
 #include "delete-error.h"
 
 
@@ -39,9 +38,9 @@
 void
 delete_error_dialog (GError *error, ECalComponentVType vtype)
 {
-	GList *icon_list = NULL;
 	GtkWidget *dialog;
 	const char *str;
+	const gchar *icon_name = NULL;
 
 	if (!error)
 		return;
@@ -106,15 +105,12 @@ delete_error_dialog (GError *error, ECalComponentVType vtype)
 					 GTK_MESSAGE_ERROR,
 					 GTK_BUTTONS_OK, "%s", str);
 	if (vtype == E_CAL_COMPONENT_EVENT)
-		icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
+		icon_name = "x-office-calendar";
 	else if (vtype == E_CAL_COMPONENT_TODO)
-		icon_list = e_icon_factory_get_icon_list ("stock_todo");
+		icon_name = "stock_todo";
 
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
+	if (icon_name)
+		gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name);
 
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 1547a67f0e..ca1b581ee6 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -32,7 +32,6 @@
 #include <glib/gi18n.h>
 
 #include <misc/e-dateedit.h>
-#include <e-util/e-icon-factory.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/e-util-private.h>
 #include <evolution-shell-component-utils.h>
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index ef103ac0c0..9737d08fca 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -42,7 +42,6 @@
 #include "../e-timezone-entry.h"
 #include <e-util/e-dialog-utils.h>
 #include <e-util/e-dialog-widgets.h>
-#include <e-util/e-icon-factory.h>
 #include <e-util/e-util-private.h>
 
 #include "../e-meeting-attendee.h"
@@ -688,7 +687,7 @@ create_image_event_box (const char *image_text, const char *tip_text)
 	GtkWidget *image, *box;
 
 	box = gtk_event_box_new ();
-	image = e_icon_factory_get_image (image_text, E_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name (image_text, GTK_ICON_SIZE_MENU);
 
 	gtk_container_add ((GtkContainer *) box, image);
 	gtk_widget_show_all (box);
@@ -2544,8 +2543,8 @@ source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage)
 		return;
 
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (epage));
-	client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
 	source = e_source_combo_box_get_active (source_combo_box);
+	client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_EVENT);
 
 	if (client) {
 		icaltimezone *zone;
diff --git a/calendar/gui/dialogs/event-page.glade b/calendar/gui/dialogs/event-page.glade
index f593357a65..f0f1d2e090 100644
--- a/calendar/gui/dialogs/event-page.glade
+++ b/calendar/gui/dialogs/event-page.glade
@@ -159,7 +159,7 @@
 	      <child>
 		<widget class="GtkLabel" id="description-label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">D_escription:</property>
+		  <property name="label" translatable="yes">_Description:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 9f3e5d85d4..b8822cee15 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -826,8 +826,8 @@ source_changed_cb (ESourceComboBox *source_combo_box,
 	editor = comp_editor_page_get_editor (COMP_EDITOR_PAGE (mpage));
 	flags = comp_editor_get_flags (editor);
 
-	client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL);
 	source = e_source_combo_box_get_active (source_combo_box);
+	client = auth_new_cal_from_source (source, E_CAL_SOURCE_TYPE_JOURNAL);
 
 	if (!client || !e_cal_open (client, FALSE, NULL)) {
 		GtkWidget *dialog;
diff --git a/calendar/gui/dialogs/memo-page.glade b/calendar/gui/dialogs/memo-page.glade
index 93bc1a9b5c..6b65a053d5 100644
--- a/calendar/gui/dialogs/memo-page.glade
+++ b/calendar/gui/dialogs/memo-page.glade
@@ -159,6 +159,7 @@
 		<widget class="GtkLabel" id="label18">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">_Description:</property>
+		  <property name="mnemonic_widget">memo_content</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index a669dfcafc..9cc6c57fe3 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <glib/gi18n.h>
-#include <e-util/e-icon-factory.h>
 #include <libedataserverui/e-source-selector-dialog.h>
 #include "select-source-dialog.h"
 
@@ -40,7 +39,7 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
 	ESource *selected_source = NULL;
 	const char *gconf_key;
 	GConfClient *conf_client;
-	GList *icon_list = NULL;
+	const gchar *icon_name = NULL;
 
 	if (obj_type == E_CAL_SOURCE_TYPE_EVENT)
 		gconf_key = "/apps/evolution/calendar/sources";
@@ -58,17 +57,14 @@ select_source_dialog (GtkWindow *parent, ECalSourceType obj_type)
 	dialog = e_source_selector_dialog_new (parent, source_list);
 
 	if (obj_type == E_CAL_SOURCE_TYPE_EVENT)
-		icon_list = e_icon_factory_get_icon_list ("x-office-calendar");
+		icon_name = "x-office-calendar";
 	else if (obj_type == E_CAL_SOURCE_TYPE_TODO)
-		icon_list = e_icon_factory_get_icon_list ("stock_todo");
+		icon_name = "stock_todo";
         else if (obj_type == E_CAL_SOURCE_TYPE_JOURNAL)
-                icon_list = e_icon_factory_get_icon_list ("stock_journal");
+                icon_name = "stock_journal";
 
-	if (icon_list) {
-		gtk_window_set_icon_list (GTK_WINDOW (dialog), icon_list);
-		g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
-		g_list_free (icon_list);
-	}
+	if (icon_name)
+		gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name);
 
 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
 		selected_source = e_source_selector_dialog_peek_primary_selection (E_SOURCE_SELECTOR_DIALOG (dialog));
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 7e2994499a..1d947ead13 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -31,7 +31,6 @@
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
-#include <e-util/e-icon-factory.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/e-util-private.h>
 #include <evolution-shell-component-utils.h>
diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade
index a5eb1e271e..d106381f8f 100644
--- a/calendar/gui/dialogs/task-page.glade
+++ b/calendar/gui/dialogs/task-page.glade
@@ -169,7 +169,7 @@
 	      <child>
 		<widget class="GtkLabel" id="due-date-label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Due date:</property>
+		  <property name="label" translatable="yes">D_ue date:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -274,7 +274,7 @@
 	      <child>
 		<widget class="GtkLabel" id="label18">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">De_scription:</property>
+		  <property name="label" translatable="yes">_Description:</property>
 		  <property name="use_underline">True</property>
 		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_CENTER</property>