** Fixes bug #386503

2007-05-25  Matthew Barnes  <mbarnes@redhat.com>

        ** Fixes bug #386503

	* addressbook/gui/contact-editor/e-contact-editor.c (show_help_cb):
	* calendar/gui/dialogs/comp-editor.c (comp_editor_show_help):
	* composer/e-msg-compoer.c (e_msg_composer_show_help):
	* plugins/exchange-operations/exchange-send-options.c
	* widgets/misc/e-multi-config-dialog.c (impl_response):
	* widgets/misc/e-send-options.c (e_send_options_cb):
        (exchange_send_options_cb):
	Call gnome_help_display() instead of gnome_help_display_desktop(),
	and remove BASE_VERSION from the filename.

	* shell/e-shell-window.c (e_shell_window_new):
	Remove BASE_VERSION from help argument in call to
	bonobo_ui_util_set_ui().

	* shell/main.c (main):
	Remove BASE_VERSION from call to gnome_program_init().


svn path=/branches/gnome-2-18/; revision=33578

14 files changed, 98 insertions, 65 deletions

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 0db53a0a87..1dae1d5dc5 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/contact-editor/e-contact-editor.c (show_help_cb):
+	Call gnome_help_display() instead of gnome_help_display_desktop(),
+	and remove BASE_VERSION from the filename.  (#386503)
+
 2007-04-09  simon.zheng  <simon.zheng@sun.com>
 
         ** Fix for bug #426487
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 9926bfc40c..de48561f2e 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -3228,13 +3228,12 @@ show_help_cb (GtkWidget *widget, gpointer data)
 {
 	GError *error = NULL;
 
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    "usage-contact-cards",
-				    &error);
-	if (error != NULL)
+	gnome_help_display (
+		"evolution.xml", "usage-contact-cards", &error);
+	if (error != NULL) {
 		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
 }
 
 static GList *
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 147ffad2ad..651a0e7393 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
+
+	* gui/dialogs/comp-editor.c (comp_editor_show_help):
+	Call gnome_help_display() instead of gnome_help_display_desktop(),
+	and remove BASE_VERSION from the filename.  (#386503)
+
 2007-05-12  simon.zheng  <simon.zheng@sun.com>
 
 	* gui/e-calendar-view.c: (e_calendar_view_copy_clipboard):
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 71678b3dc3..6b50dd0722 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -1693,13 +1693,12 @@ comp_editor_show_help (CompEditor *editor)
 
 	priv = editor->priv;
 
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    priv->help_section,
-				    &error);
-	if (error != NULL)
+	gnome_help_display (
+		"evolution.xml", priv->help_section, &error);
+	if (error != NULL) {
 		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
 }
 
 
diff --git a/composer/ChangeLog b/composer/ChangeLog
index c6914ab604..cb78a46655 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-msg-compoer.c (e_msg_composer_show_help):
+	Call gnome_help_display() instead of gnome_help_display_desktop(),
+	and remove BASE_VERSION from the filename.  (#386503)
+
 2007-04-09  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #356523 from Martin Olsson
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 5b8f81ba48..29283c4cf7 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2886,13 +2886,12 @@ e_msg_composer_show_help (EMsgComposer *composer)
 	GError *error = NULL;
 	EMsgComposerPrivate *p = composer->priv;
 
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    "usage-composer",
-				    &error);
-	if (error != NULL)
+	gnome_help_display (
+		"evolution.xml", "usage-composer", &error);
+	if (error != NULL) {
 		g_warning ("%s", error->message);
+		g_error_free (error);
+	}
 }
 
 
diff --git a/plugins/exchange-operations/ChangeLog b/plugins/exchange-operations/ChangeLog
index a059af0d7a..dcd1d3d59e 100644
--- a/plugins/exchange-operations/ChangeLog
+++ b/plugins/exchange-operations/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
+
+	* exchange-send-options.c (exchange_send_options_cb):
+	Call gnome_help_display() instead of gnome_help_display_desktop(),
+	and remove BASE_VERSION from the filename.  (#386503)
+
 2007-05-12  Sankar P  <psankar@novell.com>
 
 	Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index 9215c42e8c..3df7baa47b 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -191,21 +191,20 @@ static void exchange_send_options_cb (GtkDialog *dialog, gint state, gpointer fu
 	
 	switch (state) {
 		case GTK_RESPONSE_OK:
-		     exchange_send_options_get_widgets_data (sod);	
+			exchange_send_options_get_widgets_data (sod);	
 		case GTK_RESPONSE_CANCEL:
-		     gtk_widget_hide (priv->main);
-	    	     gtk_widget_destroy (priv->main);
-	             g_object_unref (priv->xml);
-	             break;	     
+			gtk_widget_hide (priv->main);
+			gtk_widget_destroy (priv->main);
+			g_object_unref (priv->xml);
+			break;	     
 		case GTK_RESPONSE_HELP:
-		     gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    priv->help_section,
-				    &error); 	
-		     if (error != NULL)
-			g_warning ("%s", error->message);
-	    	     break;
+			gnome_help_display (
+				"evolution.xml", priv->help_section, &error);
+			if (error != NULL) {
+				g_warning ("%s", error->message);
+				g_error_free (error);
+			}
+			break;
 	}
 	g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
 
diff --git a/shell/ChangeLog b/shell/ChangeLog
index bef1ab8704..aa6b46df57 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-shell-window.c (e_shell_window_new):
+	Remove BASE_VERSION from help argument in call to
+	bonobo_ui_util_set_ui().  (#386503)
+
+	* main.c (main):
+	Remove BASE_VERSION from call to gnome_program_init().
+
 2007-05-08  Parthasarathi Susarla <ajaysusarla@gmail.com>
 	
 	* e-shell-importer.c : remove the removed included file e-gtk-utils.h
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index f8ecc993e9..3e245ef4b6 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -1042,7 +1042,7 @@ e_shell_window_new (EShell *shell,
 	bonobo_ui_util_set_ui (priv->ui_component,
 			       PREFIX,
 			       xmlfile,
-			       "evolution-" BASE_VERSION, NULL);
+			       "evolution", NULL);
 	g_free (xmlfile);
 
 	e_shell_window_commands_setup (window);
diff --git a/shell/main.c b/shell/main.c
index b0c393b778..d59b2f83cb 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -517,7 +517,7 @@ main (int argc, char **argv)
 
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
 
-	program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
+	program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
 				      GNOME_PROGRAM_STANDARD_PROPERTIES,
 				      GNOME_PARAM_GOPTION_CONTEXT, context,
 				      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index addfddf4e7..9e9339171a 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-25  Matthew Barnes  <mbarnes@redhat.com>
+
+	* e-multi-config-dialog.c (impl_response):
+	* e-send-options.c (e_send_options_cb):
+	Call gnome_help_display() instead of gnome_help_display_desktop(),
+	and remove BASE_VERSION from the filename.  (#386503)
+
 2007-05-21  Wang Xin  <jedy.wang@sun.com>
 
 	* e-dateedit.c: Fixes #439049.
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index 60f9256705..55d8d7d394 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -192,13 +192,12 @@ impl_response (GtkDialog *dialog, int response_id)
 
 	switch (response_id) {
 	case GTK_RESPONSE_HELP:
-		gnome_help_display_desktop (NULL,
-					    "evolution-" BASE_VERSION,
-					    "evolution-" BASE_VERSION ".xml", 
-					    "config-prefs",
-					    &error);
-		if (error != NULL)
+		gnome_help_display (
+			"evolution.xml", "config-prefs", &error);
+		if (error != NULL) {
 			g_warning ("%s", error->message);
+			g_error_free (error);
+		}
 		break;
 	case GTK_RESPONSE_CLOSE:
 	default:
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 644d054905..472b631e80 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -588,34 +588,32 @@ e_sendoptions_set_global (ESendOptionsDialog *sod, gboolean set)
 
 static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 {
+	ESendOptionsDialogPrivate *priv;
+	ESendOptionsDialog *sod;
+	GError *error = NULL;     
+
+	sod = func_data;
+	priv = sod->priv;
 
-    ESendOptionsDialogPrivate *priv;
-    ESendOptionsDialog *sod;
-    GError *error = NULL;     
-
-    sod = func_data;
-    priv = sod->priv;
-	
-    switch (state) {
-	case GTK_RESPONSE_OK:
-	    e_send_options_get_widgets_data (sod);
-	case GTK_RESPONSE_CANCEL:
-	    gtk_widget_hide (priv->main);
-	    gtk_widget_destroy (priv->main);
-	    g_object_unref (priv->xml);
-	    break;
-	case GTK_RESPONSE_HELP:
-	gnome_help_display_desktop (NULL,
-				    "evolution-" BASE_VERSION,
-				    "evolution-" BASE_VERSION ".xml",
-				    priv->help_section,
-				    &error);
-	    if (error != NULL)
-		g_warning ("%s", error->message);
-	    break;
-    }
-    g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
+	switch (state) {
+		case GTK_RESPONSE_OK:
+			e_send_options_get_widgets_data (sod);
+		case GTK_RESPONSE_CANCEL:
+			gtk_widget_hide (priv->main);
+			gtk_widget_destroy (priv->main);
+			g_object_unref (priv->xml);
+			break;
+		case GTK_RESPONSE_HELP:
+			gnome_help_display (
+				"evolution.xml", priv->help_section, &error);
+			if (error != NULL) {
+				g_warning ("%s", error->message);
+				g_error_free (error);
+			}
+    			break;
+	}
 
+	g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state);
 }
 
 gboolean