4 files changed, 25 insertions, 27 deletions
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index 1f53007b33..be078c210d 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -1055,9 +1055,9 @@ mail_account_view_construct (MailAccountView *view,
 
 	shell = e_shell_get_default ();
 	if (!shell || e_shell_get_express_mode (shell)) {
-		GtkWidget *table = em_account_editor_get_widget (view->edit, "identity_required_table");
+		GtkWidget *table = em_account_editor_get_widget (view->edit, "identity-required-table");
 		GtkWidget *label, *pwd;
-		gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity_optional_frame"));
+		gtk_widget_hide (em_account_editor_get_widget (view->edit, "identity-optional-section"));
 
 		if (!view->original) {
 			label = gtk_label_new (_("Password:"));
diff --git a/doc/reference/shell/tmpl/e-shell.sgml b/doc/reference/shell/tmpl/e-shell.sgml
index 14eb06e40e..0afd89d53b 100644
--- a/doc/reference/shell/tmpl/e-shell.sgml
+++ b/doc/reference/shell/tmpl/e-shell.sgml
@@ -75,14 +75,6 @@ EShell
 @eshell: the object which received the signal.
 @Param2: 
 
-<!-- ##### SIGNAL EShell::send-receive ##### -->
-<para>
-
-</para>
-
-@eshell: the object which received the signal.
-@arg1: 
-
 <!-- ##### SIGNAL EShell::window-created ##### -->
 <para>
 
@@ -260,15 +252,6 @@ EShell
 @Returns: 
 
 
-<!-- ##### FUNCTION e_shell_send_receive ##### -->
-<para>
-
-</para>
-
-@shell: 
-@parent: 
-
-
 <!-- ##### FUNCTION e_shell_get_meego_mode ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/eshell-unused.sgml b/doc/reference/shell/tmpl/eshell-unused.sgml
index 0ce25a6249..9ca9911e36 100644
--- a/doc/reference/shell/tmpl/eshell-unused.sgml
+++ b/doc/reference/shell/tmpl/eshell-unused.sgml
@@ -189,6 +189,14 @@ e-shell-window.sgml
 </para>
 
 
+<!-- ##### SIGNAL EShell::send-receive ##### -->
+<para>
+
+</para>
+
+@eshell: the object which received the signal.
+@arg1: 
+
 <!-- ##### ARG EShellSearchbar:label-visible ##### -->
 <para>
 
@@ -231,6 +239,13 @@ e-shell-window.sgml
 </para>
 
 
+<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEND_RECEIVE ##### -->
+<para>
+
+</para>
+
+@window: 
+
 <!-- ##### MACRO E_SHELL_WINDOW_ACTION_SYNC_OPTIONS ##### -->
 <para>
 
@@ -534,6 +549,14 @@ e-shell-window.sgml
 @searchbar: 
 @label_visible: 
 
+<!-- ##### FUNCTION e_shell_send_receive ##### -->
+<para>
+
+</para>
+
+@shell: 
+@parent: 
+
 <!-- ##### FUNCTION e_signature_list_find ##### -->
 <para>
 
diff --git a/doc/reference/shell/tmpl/shell-actions.sgml b/doc/reference/shell/tmpl/shell-actions.sgml
index 9a0878e5eb..8c8e839f1d 100644
--- a/doc/reference/shell/tmpl/shell-actions.sgml
+++ b/doc/reference/shell/tmpl/shell-actions.sgml
@@ -180,14 +180,6 @@ Shell Actions
 @window: 
 
 
-<!-- ##### MACRO E_SHELL_WINDOW_ACTION_SEND_RECEIVE ##### -->
-<para>
-
-</para>
-
-@window: 
-
-
 <!-- ##### MACRO E_SHELL_WINDOW_ACTION_SHOW_SIDEBAR ##### -->
 <para>