X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.h;h=bcdd04375be4376415baeaa2fba9c56f103afa3a;hb=b574222774b0a12786d5233a885bf938875b7219;hp=d9d1175184af0094a71b1441b367eb71242b0cbf;hpb=0e353b4adf22acc768bfa62ebcba2faab0bfc3b9;p=modest

diff --git a/src/modest-ui-dimming-rules.h b/src/modest-ui-dimming-rules.h
index d9d1175..bcdd043 100644
--- a/src/modest-ui-dimming-rules.h
+++ b/src/modest-ui-dimming-rules.h
@@ -30,7 +30,6 @@
 #ifndef __MODEST_UI_DIMMING_RULES_H__
 #define __MODEST_UI_DIMMING_RULES_H__
 
-#include <widgets/modest-main-window.h>
 #include <widgets/modest-msg-edit-window.h>
 #include <widgets/modest-recpt-view.h>
 
@@ -41,27 +40,19 @@ DimmedState *modest_ui_dimming_rules_define_dimming_state (ModestWindow *window)
 
 /* 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);
 gboolean modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_sort (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_open_msg (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_contents_msg (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_always_dimmed (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_fetch_images (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_mark_as_read_msg_in_view (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_mark_as_unread_msg_in_view (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_mark_as_read_msg (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_mark_as_unread_msg (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_move_to (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_paste (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_delete_msgs (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_select_all (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_view_attachments (ModestWindow *win, gpointer user_data);
@@ -74,12 +65,11 @@ gboolean modest_ui_dimming_rules_on_cut (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_view_previous (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_view_next (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_tools_smtp_servers (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_cancel_sending (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_cancel_sending_all (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_send_receive (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_send_receive_all (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_find_msg (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_find_in_msg (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_set_style (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_zoom (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data);
@@ -88,12 +78,19 @@ gboolean modest_ui_dimming_rules_on_editor_paste (ModestWindow *win, gpointer us
 gboolean modest_ui_dimming_rules_on_editor_paste_show_menu (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_save_to_drafts (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_insert_image (ModestWindow *win, gpointer user_data);
-#ifdef MODEST_TOOLKIT_HILDON2
+gboolean modest_ui_dimming_rules_on_edit_accounts (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_folder_window_move_to (ModestWindow *win, gpointer user_data);
 gboolean modest_ui_dimming_rules_on_folder_window_delete (ModestWindow *win, gpointer user_data);
-gboolean modest_ui_dimming_rules_on_edit_accounts (ModestWindow *win, gpointer user_data);
-#endif
+gboolean modest_ui_dimming_rules_on_new_folder (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_open_msg (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_contents_msg (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_mark_as_read_msg (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_mark_as_unread_msg (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_paste (ModestWindow *win, gpointer user_data);
+gboolean modest_ui_dimming_rules_on_cancel_sending (ModestWindow *win, gpointer user_data);
 
 G_END_DECLS
-#endif 
+#endif