static const ModestDimmingEntry modest_main_window_toolbar_dimming_entries [] = {
/* Toolbar */
- { "/ToolBar/ToolbarMessageNew", G_CALLBACK(modest_ui_dimming_rules_on_new_msg) },
+ { "/ToolBar/ToolbarMessageNew", G_CALLBACK(modest_ui_dimming_rules_on_new_msg_or_folder) },
{ "/ToolBar/ToolbarMessageReply", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
{ "/ToolBar/ToolbarDeleteMessage", G_CALLBACK(modest_ui_dimming_rules_on_delete) },
{ "/ToolBar/ToolbarToggleView", NULL },
#include <modest-maemo-utils.h>
#include <modest-tny-msg.h>
#include <modest-msg-view-window.h>
-#include <modest-attachments-view.h>
#include <modest-main-window-ui.h>
#include "modest-msg-view-window-ui-dimming.h"
#include <modest-widget-memory.h>
return state;
}
+gboolean
+modest_ui_dimming_rules_on_new_msg_or_folder (ModestWindow *win,
+ gpointer user_data)
+{
+ GtkWidget *folder_view;
+
+ g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (win), FALSE);
+
+ /* Check first if the folder view has the focus */
+ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+ if (gtk_widget_is_focus (folder_view)) {
+ return modest_ui_dimming_rules_on_new_folder (win, user_data);
+ } else {
+ return modest_ui_dimming_rules_on_new_msg (win, user_data);
+ }
+}
gboolean
modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data)
/* Menu & toolbar dimming rules */
gboolean modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data);
gboolean modest_ui_dimming_rules_on_new_folder (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_new_msg_or_folder (ModestWindow *win, gpointer user_data);
gboolean modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data);
gboolean modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data);
gboolean modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data);
{
remove_attachment (MODEST_GTKHTML_MSG_VIEW (self), attachment);
}
-