Move dimming callback to ModestWindow

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index 03b2b97..3d15352 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -288,8 +288,8 @@ modest_hildon2_window_add_button_to_menu (ModestHildon2Window *self,
 }
 
 static void
-modest_hildon2_window_add_to_menu (ModestHildon2Window *self,
-                                  gchar *label,
+modest_hildon2_window_add_to_menu (ModestWindow *self,
+                                  const gchar *label,
                                   const gchar *accelerator,
                                   ModestWindowMenuCallback callback,
                                   ModestDimmingCallback dimming_callback)
@@ -316,7 +316,7 @@ modest_hildon2_window_add_to_menu (ModestHildon2Window *self,
                                            accel_key, accel_mods, 0);
        }
 
-       modest_hildon2_window_add_button_to_menu (self, GTK_BUTTON (button), dimming_callback);
+       modest_hildon2_window_add_button_to_menu (MODEST_HILDON2_WINDOW (self), GTK_BUTTON (button), dimming_callback);
 }
 
 static void setup_menu (ModestHildon2Window *self)

diff --git a/src/modest-dimming-rule.h b/src/modest-dimming-rule.h
index d1f1a29..fb36fc2 100644 (file)
--- a/src/modest-dimming-rule.h
+++ b/src/modest-dimming-rule.h
@@ -47,10 +47,6 @@ G_BEGIN_DECLS
 typedef struct _ModestDimmingRule      ModestDimmingRule;
 typedef struct _ModestDimmingRuleClass ModestDimmingRuleClass;
 
-typedef gboolean (*ModestDimmingCallback) (ModestWindow *self, gpointer user_data);
-
-#define MODEST_DIMMING_CALLBACK(x) ((ModestDimmingCallback) (x))
-
 
 struct _ModestDimmingRule {
         GObject parent;

diff --git a/src/widgets/modest-msg-view-window.c b/src/widgets/modest-msg-view-window.c
index cc77b64..80d2e66 100644 (file)
--- a/src/widgets/modest-msg-view-window.c
+++ b/src/widgets/modest-msg-view-window.c
@@ -3615,51 +3615,45 @@ setup_menu (ModestMsgViewWindow *self)
 {
        g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW(self));
 
-       /****** HILDON2:START
-        * add actions to hildon window menu
-        */
-
        /* Settings menu buttons */
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_find"), NULL,
-                                          APP_MENU_CALLBACK (modest_msg_view_window_show_find_toolbar),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_find_in_msg));
-
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
-                                          dngettext(GETTEXT_PACKAGE,
-                                                    "mcen_me_move_message",
-                                                    "mcen_me_move_messages",
-                                                    1),
-                                          NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_move_to),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
-
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_mark_as_read"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_mark_as_read),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_read_msg_in_view));
-
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_mark_as_unread"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_mark_as_unread),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_unread_msg_in_view));
-
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_save_attachments"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_save_attachments),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_save_attachments));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_remove_attachments),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_remove_attachments));
-
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
-
-       modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_ti_message_properties"), NULL,
-                                          APP_MENU_CALLBACK (modest_ui_actions_on_details),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
-
-       /****** HILDON2:END */
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_find"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_msg_view_window_show_find_toolbar),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_find_in_msg));
+
+       modest_window_add_to_menu (MODEST_WINDOW (self),
+                                  dngettext(GETTEXT_PACKAGE,
+                                            "mcen_me_move_message",
+                                            "mcen_me_move_messages",
+                                            1),
+                                  NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_move_to),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
+
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_mark_as_read"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_mark_as_read),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_read_msg_in_view));
+
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_mark_as_unread"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_mark_as_unread),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_unread_msg_in_view));
+
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_save_attachments"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_save_attachments),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_save_attachments));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_remove_attachments),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_remove_attachments));
+
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_new_msg),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
+
+       modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_ti_message_properties"), NULL,
+                                  MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_details),
+                                  MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_details));
 }
 
 void

diff --git a/src/widgets/modest-window-mgr.h b/src/widgets/modest-window-mgr.h
index 52b2b12..878bafd 100644 (file)
--- a/src/widgets/modest-window-mgr.h
+++ b/src/widgets/modest-window-mgr.h
@@ -32,6 +32,7 @@
 
 #include <glib-object.h>
 #include "modest-window.h"
+#include <tny-header.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 952ac9e..e79aba0 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -441,7 +441,7 @@ modest_window_add_to_menu (ModestWindow *window,
                           const gchar *label,
                           const gchar *accelerator,
                           ModestWindowMenuCallback callback,
-                          ModestDimmingCallback dimming_callback);
+                          ModestDimmingCallback dimming_callback)
 {
        MODEST_WINDOW_GET_CLASS (window)->add_to_menu_func (window,
                                                            label,
@@ -521,7 +521,7 @@ modest_window_add_to_menu_default (ModestWindow *window,
                                   const gchar *label,
                                   const gchar *accelerator,
                                   ModestWindowMenuCallback callback,
-                                  ModestDimmingCallback dimming_callback);
+                                  ModestDimmingCallback dimming_callback)
 {
        g_warning ("modest: You should implement %s", __FUNCTION__);
 }

diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h
index 0a8185b..8d3a2c5 100644 (file)
--- a/src/widgets/modest-window.h
+++ b/src/widgets/modest-window.h
@@ -36,7 +36,6 @@
 
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <modest-dimming-rule.h>
 
 G_BEGIN_DECLS
 
@@ -92,7 +91,10 @@ typedef struct _ModestWindow      ModestWindow;
 typedef struct _ModestWindowClass ModestWindowClass;
 
 typedef void (*ModestWindowMenuCallback) (GObject *control, gpointer userdata);
+typedef gboolean (*ModestDimmingCallback) (ModestWindow *self, gpointer user_data);
+
 #define MODEST_WINDOW_MENU_CALLBACK(x) ((ModestWindowMenuCallback) (x))
+#define MODEST_DIMMING_CALLBACK(x) ((ModestDimmingCallback) (x))
  
 struct _ModestWindow {
         ModestWindowParent parent;