156 lines
6.3 KiB
Diff
156 lines
6.3 KiB
Diff
diff -up evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c
|
|
--- evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-01-13 08:31:03.314822806 +0100
|
|
+++ evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c 2014-01-13 08:32:38.787818761 +0100
|
|
@@ -4282,6 +4282,11 @@ e_contact_editor_init (EContactEditor *e
|
|
g_signal_connect (
|
|
widget, "clicked",
|
|
G_CALLBACK (show_help_cb), e_contact_editor);
|
|
+ if (!e_misc_utils_is_help_package_installed ()) {
|
|
+ gtk_widget_set_sensitive (widget, FALSE);
|
|
+ gtk_widget_hide (widget);
|
|
+ }
|
|
+
|
|
widget = e_builder_get_widget (
|
|
e_contact_editor->priv->builder, "button-web-expand");
|
|
g_signal_connect_swapped (
|
|
diff -up evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.4/calendar/gui/dialogs/comp-editor.c
|
|
--- evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents 2014-01-13 00:02:51.000000000 +0100
|
|
+++ evolution-3.11.4/calendar/gui/dialogs/comp-editor.c 2014-01-13 08:31:03.315822806 +0100
|
|
@@ -2169,6 +2169,12 @@ comp_editor_init (CompEditor *editor)
|
|
G_BINDING_SYNC_CREATE);
|
|
}
|
|
|
|
+ action = gtk_action_group_get_action (action_group, "help");
|
|
+ if (action && !e_misc_utils_is_help_package_installed ()) {
|
|
+ gtk_action_set_visible (action, FALSE);
|
|
+ gtk_action_set_sensitive (action, FALSE);
|
|
+ }
|
|
+
|
|
action_group = gtk_action_group_new ("individual");
|
|
gtk_action_group_set_translation_domain (
|
|
action_group, GETTEXT_PACKAGE);
|
|
diff -up evolution-3.11.4/e-util/e-misc-utils.c.help-contents evolution-3.11.4/e-util/e-misc-utils.c
|
|
--- evolution-3.11.4/e-util/e-misc-utils.c.help-contents 2014-01-07 22:05:51.000000000 +0100
|
|
+++ evolution-3.11.4/e-util/e-misc-utils.c 2014-01-13 08:31:03.315822806 +0100
|
|
@@ -2098,3 +2098,20 @@ e_binding_transform_uid_to_source (GBind
|
|
|
|
return success;
|
|
}
|
|
+
|
|
+gboolean
|
|
+e_misc_utils_is_help_package_installed (void)
|
|
+{
|
|
+ gboolean is_installed;
|
|
+ gchar *path;
|
|
+
|
|
+ /* Viewing user documentation requires the evolution-help
|
|
+ * package. Look for one of the files it installs. */
|
|
+ path = g_build_filename (EVOLUTION_DATADIR, "help", "C", PACKAGE, "index.page", NULL);
|
|
+
|
|
+ is_installed = g_file_test (path, G_FILE_TEST_IS_REGULAR);
|
|
+
|
|
+ g_free (path);
|
|
+
|
|
+ return is_installed;
|
|
+}
|
|
diff -up evolution-3.11.4/e-util/e-misc-utils.h.help-contents evolution-3.11.4/e-util/e-misc-utils.h
|
|
--- evolution-3.11.4/e-util/e-misc-utils.h.help-contents 2014-01-07 22:05:51.000000000 +0100
|
|
+++ evolution-3.11.4/e-util/e-misc-utils.h 2014-01-13 08:31:03.316822806 +0100
|
|
@@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour
|
|
GValue *target_value,
|
|
ESourceRegistry *registry);
|
|
|
|
+gboolean e_misc_utils_is_help_package_installed (void);
|
|
+
|
|
G_END_DECLS
|
|
|
|
#endif /* E_MISC_UTILS_H */
|
|
diff -up evolution-3.11.4/e-util/e-preferences-window.c.help-contents evolution-3.11.4/e-util/e-preferences-window.c
|
|
--- evolution-3.11.4/e-util/e-preferences-window.c.help-contents 2014-01-07 22:05:51.000000000 +0100
|
|
+++ evolution-3.11.4/e-util/e-preferences-window.c 2014-01-13 08:31:03.316822806 +0100
|
|
@@ -384,6 +384,11 @@ e_preferences_window_init (EPreferencesW
|
|
GTK_BUTTON_BOX (container), widget, TRUE);
|
|
gtk_widget_show (widget);
|
|
|
|
+ if (!e_misc_utils_is_help_package_installed ()) {
|
|
+ gtk_widget_set_sensitive (widget, FALSE);
|
|
+ gtk_widget_hide (widget);
|
|
+ }
|
|
+
|
|
widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
|
|
g_signal_connect_swapped (
|
|
widget, "clicked",
|
|
diff -up evolution-3.11.4/e-util/e-send-options.c.help-contents evolution-3.11.4/e-util/e-send-options.c
|
|
--- evolution-3.11.4/e-util/e-send-options.c.help-contents 2014-01-07 22:05:51.000000000 +0100
|
|
+++ evolution-3.11.4/e-util/e-send-options.c 2014-01-13 08:31:03.316822806 +0100
|
|
@@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod)
|
|
{
|
|
ESendOptionsDialogPrivate *priv;
|
|
GtkBuilder *builder;
|
|
+ GtkWidget *helpbutton;
|
|
|
|
priv = sod->priv;
|
|
builder = sod->priv->builder;
|
|
@@ -478,6 +479,12 @@ get_widgets (ESendOptionsDialog *sod)
|
|
priv->accepted_label = e_builder_get_widget (builder, "accepted-label");
|
|
priv->completed_label = e_builder_get_widget (builder, "completed-label");
|
|
|
|
+ helpbutton = e_builder_get_widget (builder, "helpbutton1");
|
|
+ if (helpbutton && !e_misc_utils_is_help_package_installed ()) {
|
|
+ gtk_widget_set_sensitive (helpbutton, FALSE);
|
|
+ gtk_widget_hide (helpbutton);
|
|
+ }
|
|
+
|
|
return (priv->priority
|
|
&& priv->security
|
|
&& priv->status
|
|
diff -up evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.4/plugins/email-custom-header/email-custom-header.c
|
|
--- evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents 2014-01-07 22:05:51.000000000 +0100
|
|
+++ evolution-3.11.4/plugins/email-custom-header/email-custom-header.c 2014-01-13 08:31:03.316822806 +0100
|
|
@@ -26,6 +26,7 @@
|
|
#include <string.h>
|
|
#include <glib/gi18n.h>
|
|
|
|
+#include "e-util/e-util.h"
|
|
#include "mail/em-utils.h"
|
|
#include "mail/em-event.h"
|
|
#include "composer/e-msg-composer.h"
|
|
@@ -116,6 +117,8 @@ static gboolean
|
|
epech_get_widgets (CustomHeaderOptionsDialog *mch)
|
|
{
|
|
CustomHeaderOptionsDialogPrivate *priv;
|
|
+ GtkWidget *helpbutton;
|
|
+
|
|
priv = mch->priv;
|
|
|
|
#define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name)
|
|
@@ -126,6 +129,13 @@ epech_get_widgets (CustomHeaderOptionsDi
|
|
|
|
priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");
|
|
priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");
|
|
+
|
|
+ helpbutton = EMAIL_CUSTOM_HEADER ("helpbutton1");
|
|
+ if (helpbutton && !e_misc_utils_is_help_package_installed ()) {
|
|
+ gtk_widget_set_sensitive (helpbutton, FALSE);
|
|
+ gtk_widget_hide (helpbutton);
|
|
+ }
|
|
+
|
|
#undef EMAIL_CUSTOM_HEADER
|
|
|
|
return (priv->page
|
|
diff -up evolution-3.11.4/shell/e-shell-window-actions.c.help-contents evolution-3.11.4/shell/e-shell-window-actions.c
|
|
--- evolution-3.11.4/shell/e-shell-window-actions.c.help-contents 2014-01-07 23:08:55.000000000 +0100
|
|
+++ evolution-3.11.4/shell/e-shell-window-actions.c 2014-01-13 08:31:03.317822806 +0100
|
|
@@ -1413,6 +1413,11 @@ e_shell_window_actions_init (EShellWindo
|
|
if (path == NULL)
|
|
gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);
|
|
g_free (path);
|
|
+
|
|
+ if (!e_misc_utils_is_help_package_installed ()) {
|
|
+ gtk_action_set_visible (ACTION (CONTENTS), FALSE);
|
|
+ gtk_action_set_sensitive (ACTION (CONTENTS), FALSE);
|
|
+ }
|
|
}
|
|
|
|
GtkWidget *
|