Refactor hildon_window_add_toolbar to have implementation through Modest API

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index c45bf85..e561d02 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -61,6 +61,8 @@ static void setup_menu (ModestHildon2Window *self);
 
 static void modest_hildon2_window_show_toolbar (ModestWindow *self,
                                                 gboolean show_toolbar);
+static void modest_hildon2_window_add_toolbar (ModestWindow *self,
+                                              GtkToolbar *toolbar);
 static gboolean modest_hildon2_window_toggle_menu (HildonWindow *window,
                                                    guint button,
                                                    guint32 time);
@@ -162,6 +164,7 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data)
        modest_window_class->zoom_minus_func = on_zoom_minus_plus_not_implemented;
        modest_window_class->zoom_plus_func = on_zoom_minus_plus_not_implemented;
        modest_window_class->show_toolbar_func = modest_hildon2_window_show_toolbar;
+       modest_window_class->add_toolbar_func = modest_hildon2_window_add_toolbar;
        modest_window_class->show_progress_func = modest_hildon2_window_show_progress;
 
        modest_hildon2_window_class->pack_toolbar_func = modest_hildon2_window_pack_toolbar_not_implemented;
@@ -349,6 +352,14 @@ modest_hildon2_window_show_toolbar (ModestWindow *self,
 }
 
 static void
+modest_hildon2_window_add_toolbar (ModestWindow *self,
+                                  GtkToolbar *toolbar)
+{
+       hildon_window_add_toolbar (HILDON_WINDOW (self),
+                                  toolbar);
+}
+
+static void
 modest_hildon2_window_show_progress (ModestWindow *self,
                                     gboolean show)
 {

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 95108e6..dd30edb 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -65,6 +65,9 @@ static void     modest_window_show_progress_default      (ModestWindow *self,
 static void     modest_window_show_toolbar_default       (ModestWindow *window,
                                                          gboolean show_toolbar);
 
+static void     modest_window_add_toolbar_default       (ModestWindow *window,
+                                                        GtkToolbar *toolbar);
+
 static void     modest_window_set_zoom_default           (ModestWindow *window,
                                                          gdouble zoom);
 
@@ -135,6 +138,7 @@ modest_window_class_init (ModestWindowClass *klass)
        klass->zoom_plus_func = modest_window_zoom_plus_default;
        klass->zoom_minus_func = modest_window_zoom_minus_default;
        klass->show_toolbar_func = modest_window_show_toolbar_default;
+       klass->add_toolbar_func = modest_window_add_toolbar_default;
        klass->disconnect_signals_func = modest_window_disconnect_signals_default;
        klass->show_progress_func = modest_window_show_progress_default;
 
@@ -414,6 +418,14 @@ modest_window_show_toolbar (ModestWindow *window,
 }
 
 void 
+modest_window_add_toolbar (ModestWindow *window,
+                          GtkToolbar *toolbar)
+{
+       MODEST_WINDOW_GET_CLASS (window)->add_toolbar_func (window,
+                                                           toolbar);
+}
+
+void 
 modest_window_disconnect_signals (ModestWindow *window)
 {
        MODEST_WINDOW_GET_CLASS (window)->disconnect_signals_func (window);
@@ -465,6 +477,13 @@ modest_window_show_toolbar_default (ModestWindow *window,
 }
 
 static void 
+modest_window_add_toolbar_default (ModestWindow *window,
+                                  GtkToolbar *toolbar)
+{
+       g_warning ("modest: You should implement %s", __FUNCTION__);
+}
+
+static void 
 modest_window_disconnect_signals_default (ModestWindow *self)
 {
        g_warning ("modest: You should implement %s", __FUNCTION__);

diff --git a/src/widgets/modest-window.h b/src/widgets/modest-window.h
index cb61b69..c3d4440 100644 (file)
--- a/src/widgets/modest-window.h
+++ b/src/widgets/modest-window.h
@@ -108,6 +108,7 @@ struct _ModestWindowClass {
        void (*save_state_func) (ModestWindow *self);
        void (*disconnect_signals_func) (ModestWindow *self);
        void (*show_progress_func) (ModestWindow *self, gboolean show);
+       void (*add_toolbar_func) (ModestWindow *self, GtkToolbar *toolbar);
 };
 
 /**
@@ -321,6 +322,8 @@ void modest_window_disconnect_signals (ModestWindow *self);
 
 void modest_window_show_progress (ModestWindow *self, gboolean show_progress);
 
+void modest_window_add_toolbar (ModestWindow *self, GtkToolbar *toolbar);
+
 
 G_END_DECLS