*/
#include <string.h>
-#include <hildon/hildon-program.h>
+#include <hildon/hildon.h>
#include "modest-hildon2-window-mgr.h"
#include "modest-msg-edit-window.h"
#include "modest-main-window.h"
{
ModestHildon2WindowMgrPrivate *priv = NULL;
gboolean ret_value = FALSE;
- HildonStackableWindow *window;
- HildonProgram *program;
+ GtkWidget *window;
+ HildonWindowStack *stack;
gboolean failed = FALSE;
-
+
g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE);
priv = MODEST_HILDON2_WINDOW_MGR_GET_PRIVATE (self);
-
- program = hildon_program_get_instance ();
- while ((window = hildon_program_peek_window_stack (program)) != NULL) {
+ stack = hildon_window_stack_get_default ();
+
+ while ((window = hildon_window_stack_peek (stack)) != NULL) {
g_signal_emit_by_name (G_OBJECT (window), "delete-event", NULL, &ret_value);
if (ret_value == TRUE) {
failed = TRUE;
gint *handler_id;
HildonProgram *program;
GtkWidget *current_top;
+ HildonWindowStack *stack;
g_return_val_if_fail (MODEST_IS_HILDON2_WINDOW_MGR (self), FALSE);
g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
g_object_ref (window);
priv->window_list = g_list_prepend (priv->window_list, window);
- current_top = GTK_WIDGET (hildon_program_peek_window_stack (program));
+ stack = hildon_window_stack_get_default ();
+ current_top = hildon_window_stack_peek (stack);
/* policy is: if no parent, then we close all up message views, but no account/folder/header window */
goto fail;
}
while (current_top && !close_canceled) {
- current_top = GTK_WIDGET (hildon_program_peek_window_stack (program));
+ current_top = hildon_window_stack_peek (stack);
if (MODEST_IS_MSG_VIEW_WINDOW (current_top) || MODEST_IS_MSG_EDIT_WINDOW (current_top)) {
g_signal_emit_by_name (G_OBJECT (current_top), "delete-event", NULL, &close_canceled);
} else {
/* Add to list. Keep a reference to the window */
priv->window_list = g_list_remove (priv->window_list, window);
g_object_unref (window);
- current_top = GTK_WIDGET (hildon_program_peek_window_stack (program));
+ current_top = hildon_window_stack_peek (stack);
if (current_top)
gtk_window_present (GTK_WINDOW (current_top));
return FALSE;