From bdca525be851015e4d29ce6e22875599aa92197b Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Fri, 21 Nov 2008 17:40:16 +0000 Subject: [PATCH] * Removed all help application support (fixes NB#93294). pmo-trunk-r6373 --- .../modest-connection-specific-smtp-edit-window.c | 4 ---- .../modest-connection-specific-smtp-window.c | 3 --- .../modest-default-account-settings-dialog.c | 2 -- src/hildon2/modest-easysetup-wizard-dialog.c | 3 --- src/hildon2/modest-maemo-global-settings-dialog.c | 3 --- src/hildon2/modest-main-window-ui.h | 1 - src/hildon2/modest-main-window.c | 2 -- src/hildon2/modest-msg-edit-window.c | 3 --- src/hildon2/modest-msg-view-window.c | 2 -- src/hildon2/modest-platform.c | 19 +------------------ src/hildon2/modest-signature-editor-dialog.c | 2 -- src/hildon2/ui/modest-main-window-ui.xml | 4 ---- src/modest-ui-actions.c | 7 +++++++ 13 files changed, 8 insertions(+), 47 deletions(-) diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c index 1949554..67aea73 100644 --- a/src/hildon2/modest-connection-specific-smtp-edit-window.c +++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c @@ -424,10 +424,6 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd modest_window_mgr_prevent_hibernation_while_window_is_shown ( modest_runtime_get_window_mgr (), GTK_WINDOW (self)); - hildon_help_dialog_help_enable (GTK_DIALOG(self), - "applications_email_connectionspecificsmtpconf", - modest_maemo_utils_get_osso_context()); - /* Refresh view with current settings */ on_auth_picker_changed (HILDON_PICKER_BUTTON (priv->outgoing_auth_picker), self); on_security_picker_changed (HILDON_PICKER_BUTTON (priv->outgoing_security_picker), self); diff --git a/src/hildon2/modest-connection-specific-smtp-window.c b/src/hildon2/modest-connection-specific-smtp-window.c index 8cfdc87..2de4896 100644 --- a/src/hildon2/modest-connection-specific-smtp-window.c +++ b/src/hildon2/modest-connection-specific-smtp-window.c @@ -398,9 +398,6 @@ modest_connection_specific_smtp_window_init (ModestConnectionSpecificSmtpWindow g_signal_connect (self, "response", G_CALLBACK (on_response), NULL); - hildon_help_dialog_help_enable (GTK_DIALOG(self), - "email_connectionsspecificsmtpconf", - modest_maemo_utils_get_osso_context()); } ModestConnectionSpecificSmtpWindow* diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c index 8b76f73..b1d40c9 100644 --- a/src/hildon2/modest-default-account-settings-dialog.c +++ b/src/hildon2/modest-default-account-settings-dialog.c @@ -1106,8 +1106,6 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog * while sending messages causes an error dialog and we have a lock */ modest_tny_account_store_set_send_mail_blocked (modest_runtime_get_account_store (), TRUE); - hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_accountsettings", - modest_maemo_utils_get_osso_context()); } ModestAccountSettingsDialog* diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c index 34070a5..3490b5f 100644 --- a/src/hildon2/modest-easysetup-wizard-dialog.c +++ b/src/hildon2/modest-easysetup-wizard-dialog.c @@ -1246,9 +1246,6 @@ modest_easysetup_wizard_dialog_init (ModestEasysetupWizardDialog *self) g_object_ref (self); g_thread_create (presets_loader, self, FALSE, NULL); - hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_wizardwelcome", - modest_maemo_utils_get_osso_context()); - priv->settings = modest_account_settings_new (); } diff --git a/src/hildon2/modest-maemo-global-settings-dialog.c b/src/hildon2/modest-maemo-global-settings-dialog.c index 1326c6c..75c45cd 100644 --- a/src/hildon2/modest-maemo-global-settings-dialog.c +++ b/src/hildon2/modest-maemo-global-settings-dialog.c @@ -161,9 +161,6 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self) /* force update of sensitiveness */ update_sensitive (MODEST_GLOBAL_SETTINGS_DIALOG (self)); - /* Set first page */ - hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_options_dialog", - modest_maemo_utils_get_osso_context()); } static void diff --git a/src/hildon2/modest-main-window-ui.h b/src/hildon2/modest-main-window-ui.h index 782d047..8ddaa22 100644 --- a/src/hildon2/modest-main-window-ui.h +++ b/src/hildon2/modest-main-window-ui.h @@ -98,7 +98,6 @@ static const GtkActionEntry modest_action_entries [] = { { "ToolsSendReceiveCancelSending", NULL, N_("mcen_me_outbox_cancelsend"), NULL, NULL, G_CALLBACK (modest_ui_actions_cancel_send) }, { "ToolsContacts", NULL, N_("mcen_me_inbox_open_addressbook"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_open_addressbook) }, { "ToolsAddToContacts", NULL, N_("mcen_me_viewer_addtocontacts"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_add_to_contacts) }, - { "ToolsHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) }, /* Close */ { "CloseWindow", NULL, N_("mcen_me_inbox_close_window"), "W", NULL, G_CALLBACK (modest_ui_actions_on_close_window) }, diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c index 2d0c8a4..e7441b3 100644 --- a/src/hildon2/modest-main-window.c +++ b/src/hildon2/modest-main-window.c @@ -265,7 +265,6 @@ static const GtkActionEntry modest_folder_view_action_entries [] = { { "FolderViewCSMRenameFolder", NULL, N_("mcen_me_user_renamefolder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_paste)}, { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) }, - { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_csm_help) }, }; static const GtkActionEntry modest_header_view_action_entries [] = { @@ -280,7 +279,6 @@ static const GtkActionEntry modest_header_view_action_entries [] = { { "HeaderViewCSMPaste", NULL, N_("mcen_me_inbox_paste"), "V", NULL, G_CALLBACK (modest_ui_actions_on_paste) }, { "HeaderViewCSMDelete", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) }, { "HeaderViewCSMCancelSending", NULL, N_("mcen_me_outbox_cancelsend"), NULL, NULL, G_CALLBACK (modest_ui_actions_cancel_send) }, - { "HeaderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) }, }; static const GtkToggleActionEntry modest_main_window_toggle_action_entries [] = { diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 1a7816b..32203bf 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -421,9 +421,6 @@ modest_msg_edit_window_init (ModestMsgEditWindow *obj) priv->font_dialog = NULL; - modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), - GTK_WINDOW(obj),"applications_email_editor"); - if (!is_wp_text_buffer_started) { is_wp_text_buffer_started = TRUE; wp_text_buffer_library_init (); diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c index b3c673d..0c3f2ad 100644 --- a/src/hildon2/modest-msg-view-window.c +++ b/src/hildon2/modest-msg-view-window.c @@ -446,8 +446,6 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj) hildon_program_add_window (hildon_program_get_instance(), HILDON_WINDOW(obj)); - modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), - GTK_WINDOW(obj),"applications_email_viewer"); } diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c index 5e1e11a..9092493 100644 --- a/src/hildon2/modest-platform.c +++ b/src/hildon2/modest-platform.c @@ -1066,10 +1066,6 @@ modest_platform_create_sort_dialog (GtkWindow *parent_window) dialog = modest_hildon2_sort_dialog_new (parent_window); - hildon_help_dialog_help_enable (GTK_DIALOG(dialog), - "applications_email_sort", - modest_maemo_utils_get_osso_context()); - return dialog; } @@ -1376,20 +1372,7 @@ void modest_platform_show_help (GtkWindow *parent_window, const gchar *help_id) { - osso_return_t result; - g_return_if_fail (help_id); - - result = hildon_help_show (modest_maemo_utils_get_osso_context(), - help_id, HILDON_HELP_SHOW_DIALOG); - - if (result != OSSO_OK) { - gchar *error_msg; - error_msg = g_strdup_printf ("FIXME The help topic %s could not be found", help_id); - hildon_banner_show_information (GTK_WIDGET (parent_window), - NULL, - error_msg); - g_free (error_msg); - } + return; } void diff --git a/src/hildon2/modest-signature-editor-dialog.c b/src/hildon2/modest-signature-editor-dialog.c index ad655e0..83ea8b3 100644 --- a/src/hildon2/modest-signature-editor-dialog.c +++ b/src/hildon2/modest-signature-editor-dialog.c @@ -170,8 +170,6 @@ modest_signature_editor_dialog_init (ModestSignatureEditorDialog *self) modest_window_mgr_prevent_hibernation_while_window_is_shown ( modest_runtime_get_window_mgr (), GTK_WINDOW (self)); - hildon_help_dialog_help_enable (GTK_DIALOG(self), "applications_email_signatureeditor", - modest_maemo_utils_get_osso_context()); } ModestSignatureEditorDialog* diff --git a/src/hildon2/ui/modest-main-window-ui.xml b/src/hildon2/ui/modest-main-window-ui.xml index c650fd2..6d5e5d1 100644 --- a/src/hildon2/ui/modest-main-window-ui.xml +++ b/src/hildon2/ui/modest-main-window-ui.xml @@ -71,8 +71,6 @@ - - @@ -99,7 +97,6 @@ - @@ -110,7 +107,6 @@ - diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 237cea2..6052016 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -5671,6 +5671,8 @@ void modest_ui_actions_on_help (GtkAction *action, GtkWindow *win) { + /* Help app is not available at all in fremantle */ +#ifndef MODEST_TOOLKIT_HILDON2 const gchar *help_id; g_return_if_fail (win && GTK_IS_WINDOW(win)); @@ -5679,12 +5681,16 @@ modest_ui_actions_on_help (GtkAction *action, if (help_id) modest_platform_show_help (GTK_WINDOW (win), help_id); +#endif } void modest_ui_actions_on_csm_help (GtkAction *action, GtkWindow *win) { + /* Help app is not available at all in fremantle */ +#ifndef MODEST_TOOLKIT_HILDON2 + const gchar* help_id = NULL; GtkWidget *folder_view; TnyFolderStore *folder_store; @@ -5707,6 +5713,7 @@ modest_ui_actions_on_csm_help (GtkAction *action, modest_platform_show_help (GTK_WINDOW (win), help_id); else modest_ui_actions_on_help (action, win); +#endif } static void -- 1.7.9.5