Use pack_toolbar to pack edit toolbar in folder window

[modest] / src / hildon2 / modest-hildon2-window.c

diff --git a/src/hildon2/modest-hildon2-window.c b/src/hildon2/modest-hildon2-window.c
index dc0d17b..2ec8f1e 100644 (file)
--- a/src/hildon2/modest-hildon2-window.c
+++ b/src/hildon2/modest-hildon2-window.c
@@ -34,7 +34,6 @@
 #include <modest-defs.h>
 #include <modest-ui-dimming-rules.h>
 #include <modest-ui-dimming-manager.h>
-#include <modest-dimming-rule.h>
 #include <modest-window-priv.h>
 #include <modest-hildon2-window.h>
 #include <modest-ui-actions.h>
@@ -52,6 +51,9 @@ static void modest_hildon2_window_show_toolbar (ModestWindow *self,
 static gboolean modest_hildon2_window_toggle_menu (HildonWindow *window,
                                                    guint button,
                                                    guint32 time);
+static void modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self,
+                                                               GtkPackType pack_type,
+                                                               GtkWidget *toolbar);
 
 typedef struct _ModestHildon2WindowPrivate ModestHildon2WindowPrivate;
 struct _ModestHildon2WindowPrivate {
@@ -100,6 +102,7 @@ modest_hildon2_window_class_init (gpointer klass, gpointer class_data)
        gobject_class = (GObjectClass*) klass;
        ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
        HildonWindowClass *hildon_window_class = (HildonWindowClass *) klass;
+       ModestHildon2WindowClass *modest_hildon2_window_class = (ModestHildon2WindowClass *) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_hildon2_window_finalize;
@@ -111,6 +114,8 @@ 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_hildon2_window_class->pack_toolbar_func = modest_hildon2_window_pack_toolbar_not_implemented;
 }
 
 static void
@@ -162,6 +167,26 @@ on_zoom_minus_plus_not_implemented (ModestWindow *window)
 
 }
 
+static void 
+modest_hildon2_window_pack_toolbar_not_implemented (ModestHildon2Window *self,
+                                                   GtkPackType pack_type,
+                                                   GtkWidget *toolbar)
+{
+       g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
+
+       g_warning ("%s not implemented", __FUNCTION__);
+}
+
+void
+modest_hildon2_window_pack_toolbar (ModestHildon2Window *self,
+                                   GtkPackType pack_type,
+                                   GtkWidget *toolbar)
+{
+       g_return_if_fail (MODEST_IS_HILDON2_WINDOW (self));
+
+       MODEST_HILDON2_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar);
+}
+
 void 
 modest_hildon2_window_add_button_to_menu (ModestHildon2Window *self,
                                          GtkButton *button,