Replaced a couple of deprecated functions

pmo-drop-split-view-r6804

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 20f80a8..549a769 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -55,11 +55,11 @@
 #include <tny-fs-stream.h>
 
 #ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon.h>
 #include <modest-accounts-window.h>
 #include <modest-folder-window.h>
 #endif
 
-
 #include <tny-list.h>
 #include <tny-iterator.h>
 #include <tny-simple-list.h>
@@ -1155,19 +1155,19 @@ on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
 }
 
 #ifdef MODEST_TOOLKIT_HILDON2
-static gboolean 
+static gboolean
 on_idle_top_application (gpointer user_data)
 {
-       HildonProgram *program;
+       HildonWindowStack *stack;
        GtkWidget *window;
-       
+
        /* This is a GDK lock because we are an idle callback and
         * the code below is or does Gtk+ code */
 
        gdk_threads_enter (); /* CHECKED */
 
-       program = hildon_program_get_instance ();
-       window = GTK_WIDGET (hildon_program_peek_window_stack (program));
+       stack = hildon_window_stack_get_default ();
+       window = GTK_WIDGET (hildon_window_stack_peek (stack));
 
        if (window) {
                gtk_window_present (GTK_WINDOW (window));

diff --git a/src/hildon2/modest-platform.c b/src/hildon2/modest-platform.c
index fc5ab97..28e5148 100644 (file)
--- a/src/hildon2/modest-platform.c
+++ b/src/hildon2/modest-platform.c
@@ -1639,8 +1639,10 @@ modest_platform_run_certificate_confirmation_dialog (const gchar* server_name,
        GtkWidget *note;
        gint response;
        ModestWindow *win;
+       HildonWindowStack *stack;
 
-       win = MODEST_WINDOW (hildon_program_peek_window_stack (hildon_program_get_instance ()));
+       stack = hildon_window_stack_get_default ();
+       win = MODEST_WINDOW (hildon_window_stack_peek (stack));
 
        if (!win) {
          g_warning ("%s: don't show dialogs if there's no window shown; assuming 'Cancel'",