X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-hildon2-window.h;h=7df7e991cd20a3075d8c71534065142251ccb360;hb=38454a69440197510b16c5a5444e19f234c91690;hp=170a756d0ccda2a38f7fcff602b3643871df111c;hpb=c166d31d376325f89ba36dae8123103a946a5fae;p=modest

diff --git a/src/hildon2/modest-hildon2-window.h b/src/hildon2/modest-hildon2-window.h
index 170a756..7df7e99 100644
--- a/src/hildon2/modest-hildon2-window.h
+++ b/src/hildon2/modest-hildon2-window.h
@@ -55,15 +55,18 @@ struct _ModestHildon2Window {
 struct _ModestHildon2WindowClass {
 	ModestWindowClass parent_class;
 
-	void (*pack_toolbar_func) (ModestHildon2Window *self, GtkPackType pack_type, GtkWidget *toolbar);
+	void (*edit_mode_changed) (ModestHildon2Window *self, gint edit_mode, gboolean enabled);
+
 };
 
-typedef void (*ModestHildon2AppMenuCallback) (GObject *control, gpointer userdata);
-typedef gboolean (*ModestHildon2EditModeCallback) (ModestHildon2Window *self);
+typedef gboolean (*ModestHildon2EditModeCallback) (ModestWindow *self);
 
-#define APP_MENU_CALLBACK(x) ((ModestHildon2AppMenuCallback) (x))
 #define EDIT_MODE_CALLBACK(x) ((ModestHildon2EditModeCallback) (x))
 
+/* edit mode id for no edit mode */
+#define MODEST_HILDON2_WINDOW_EDIT_MODE_NONE -1
+
+
 /**
  * modest_hildon2_window_get_type:
  * 
@@ -73,49 +76,6 @@ typedef gboolean (*ModestHildon2EditModeCallback) (ModestHildon2Window *self);
  */
 GType modest_hildon2_window_get_type (void) G_GNUC_CONST;
 
-/**
- * modest_hildon2_window_add_to_menu:
- * @self: a #ModestHildon2Window
- * @label: the label of the button added to menu
- * @callback: a #ModestHildon2AppMenuCallback
- * @dimming_callback: a #ModestDimmingCallback or %NULL for no dimming rule
- *
- * creates a button in the window #HildonAppMenu, with label @label.
- * It will call @callback, and will configure @dimming_callback for
- * dimming.
- */
-void 
-modest_hildon2_window_add_to_menu (ModestHildon2Window *self,
-				   gchar *label,
-				   ModestHildon2AppMenuCallback callback,
-				   ModestDimmingCallback dimming_callback);
-
-/**
- * modest_hildon2_window_add_button_to_menu:
- * @self: a #ModestHildon2Window
- * @button: a #GtkButton
- * @dimming_callback: a #ModestDimmingCallback or %NULL for no dimming rule
- *
- * adds a previously configured button @button to the window #HildonAppMenu.
- * It will configure @dimming_callback for dimming. User should previously
- * attach the proper signal handler for @button.
- */
-void 
-modest_hildon2_window_add_button_to_menu (ModestHildon2Window *self,
-					  GtkButton *button,
-					  ModestDimmingCallback dimming_callback);
-
-/**
- * modest_hildon2_window_pack_toolbar:
- * @self: a #ModestHildon2Window
- * @pack_type: a #GtkPackType
- * @toolbar: a toolbar widget
- *
- * packs a toolbar (widget @toolbar) in @self with @pack_type
- */
-void modest_hildon2_window_pack_toolbar (ModestHildon2Window *self,
-					 GtkPackType pack_type,
-					 GtkWidget *toolbar);
 
 void modest_hildon2_window_register_edit_mode (ModestHildon2Window *self,
 					       gint edit_mode_id,