X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-window.c;h=9e179412ebee0c6169e3e30ae211b243ffa2d1f8;hb=9da610e098595e62de5d0085b3c4fe53ba135dff;hp=952ac9e6bbf75c715c1fffffabf9da5dc1a58bde;hpb=c9ebde2e9ed7427556fc91072302ed138b9c000a;p=modest

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 952ac9e..9e17941 100644
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -74,6 +74,10 @@ static void     modest_window_add_to_menu_default       (ModestWindow *self,
 							 ModestWindowMenuCallback callback,
 							 ModestDimmingCallback dimming_callback);
 
+static void     modest_window_add_item_to_menu_default  (ModestWindow *self,
+							 GtkWidget *item,
+							 ModestDimmingCallback dimming_callback);
+
 static void     modest_window_set_title_default       (ModestWindow *window,
 						       const gchar *title);
 
@@ -85,6 +89,10 @@ static void _make_zoom_buttons_grabeable (GtkWidget* widget);
 static gboolean _modest_window_map_event (GtkWidget *widget,
 					  GdkEvent *event,
 					  gpointer userdata);
+static void modest_window_pack_toolbar_not_implemented (ModestWindow *self,
+							GtkPackType pack_type,
+							GtkWidget *toolbar);
+
 
 /* list my signals  */
 enum {
@@ -122,7 +130,7 @@ modest_window_get_type (void)
 		parent_type = HILDON_TYPE_WINDOW;
 #endif
 #else
-		parent_type = GTK_TYPE_WINDOW;
+		parent_type = GTK_TYPE_VBOX;
 #endif 
 		my_type = g_type_register_static (parent_type,
 		                                  "ModestWindow",
@@ -149,9 +157,11 @@ modest_window_class_init (ModestWindowClass *klass)
 	klass->show_toolbar_func = modest_window_show_toolbar_default;
 	klass->add_toolbar_func = modest_window_add_toolbar_default;
 	klass->add_to_menu_func = modest_window_add_to_menu_default;
+	klass->add_item_to_menu_func = modest_window_add_item_to_menu_default;
 	klass->set_title_func = modest_window_set_title_default;
 	klass->disconnect_signals_func = modest_window_disconnect_signals_default;
 	klass->show_progress_func = modest_window_show_progress_default;
+	klass->pack_toolbar_func = modest_window_pack_toolbar_not_implemented;
 
 	g_type_class_add_private (gobject_class, sizeof(ModestWindowPrivate));
 }
@@ -164,7 +174,7 @@ modest_window_init (ModestWindow *obj)
 	priv = MODEST_WINDOW_GET_PRIVATE(obj);
 
 	priv->ui_manager     = NULL;
-	priv->ui_dimming_manager     = NULL;
+	priv->ui_dimming_manager     = modest_ui_dimming_manager_new ();
 	priv->toolbar        = NULL;
 	priv->menubar        = NULL;
 
@@ -441,7 +451,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,
@@ -451,6 +461,16 @@ modest_window_add_to_menu (ModestWindow *window,
 }
 
 void 
+modest_window_add_item_to_menu (ModestWindow *window,
+				GtkWidget *item,
+				ModestDimmingCallback dimming_callback)
+{
+	MODEST_WINDOW_GET_CLASS (window)->add_item_to_menu_func (window,
+								 item,
+								 dimming_callback);
+}
+
+void 
 modest_window_set_title (ModestWindow *window,
 			 const gchar *title)
 {
@@ -521,7 +541,15 @@ 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__);
+}
+
+static void 
+modest_window_add_item_to_menu_default (ModestWindow *window,
+					GtkWidget *item,
+					ModestDimmingCallback dimming_callback)
 {
 	g_warning ("modest: You should implement %s", __FUNCTION__);
 }
@@ -615,3 +643,24 @@ _make_zoom_buttons_grabeable (GtkWidget* widget)
                      XA_INTEGER, 32, PropModeReplace,
                      (unsigned char *) &val, 1);
 }
+
+static void 
+modest_window_pack_toolbar_not_implemented (ModestWindow *self,
+					    GtkPackType pack_type,
+					    GtkWidget *toolbar)
+{
+	g_return_if_fail (MODEST_IS_WINDOW (self));
+
+	g_debug ("%s not implemented", __FUNCTION__);
+}
+
+void
+modest_window_pack_toolbar (ModestWindow *self,
+			    GtkPackType pack_type,
+			    GtkWidget *toolbar)
+{
+	g_return_if_fail (MODEST_IS_WINDOW (self));
+
+	MODEST_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar);
+}
+