}
gint
-modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
+modest_platform_run_rename_folder_dialog (ModestWindow *parent_window,
TnyFolderStore *parent_folder,
const gchar *suggested_name,
gchar **folder_name)
{
g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent_folder), GTK_RESPONSE_REJECT);
- return modest_platform_run_folder_common_dialog (parent_window,
+ return modest_platform_run_folder_common_dialog (modest_toolkit_utils_parent_window (GTK_WIDGET (parent_window)),
parent_folder,
_HL("ckdg_ti_rename_folder"),
_HL("ckdg_fi_rename_name"),
}
gint
-modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
+modest_platform_run_rename_folder_dialog (ModestWindow *parent_window,
TnyFolderStore *parent_folder,
const gchar *suggested_name,
gchar **folder_name)
{
g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent_folder), GTK_RESPONSE_REJECT);
- return modest_platform_run_folder_common_dialog (parent_window,
+ return modest_platform_run_folder_common_dialog (modest_toolkit_utils_parent_window (GTK_WIDGET (parent_window)),
parent_folder,
_HL("ckdg_ti_rename_folder"),
_HL("ckdg_fi_rename_name"),
*
* Returns: the #GtkResponseType returned by the dialog
**/
-gint modest_platform_run_rename_folder_dialog (GtkWindow *parent_window,
+gint modest_platform_run_rename_folder_dialog (ModestWindow *parent_window,
TnyFolderStore *parent,
const gchar *current_name,
gchar **folder_name);
/* The accounts dialog must be modal */
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (account_win), (GtkWindow *) win);
- modest_utils_show_dialog_and_forget (GTK_WIDGET (win), GTK_DIALOG (account_win));
+ modest_utils_show_dialog_and_forget (modest_toolkit_utils_parent_window (GTK_WIDGET (win)), GTK_DIALOG (account_win));
}
}
}
/* Show sorting dialog */
- modest_utils_run_sort_dialog (GTK_WINDOW (window), MODEST_SORT_HEADERS);
+ modest_utils_run_sort_dialog (MODEST_WINDOW (window), MODEST_SORT_HEADERS);
}
static void
full memory condition */
modest_platform_information_banner ((GtkWidget *) source_win, NULL,
_("mail_in_ui_folder_create_error"));
- do_create_folder (source_win, parent_folder, (const gchar *) suggested_name);
+ do_create_folder (modest_toolkit_utils_parent_window (GTK_WIDGET (source_win)),
+ parent_folder, (const gchar *) suggested_name);
}
} else {
helper->folder_name = g_strdup (folder_name);
helper->parent = g_object_ref (parent_folder);
- modest_platform_connect_if_remote_and_perform (GTK_WINDOW (parent_window),
+ modest_platform_connect_if_remote_and_perform (parent_window,
TRUE,
parent_folder,
do_create_folder_performer,
}
static void
-modest_ui_actions_create_folder(GtkWidget *parent_window,
+modest_ui_actions_create_folder(GtkWindow *parent_window,
GtkWidget *folder_view,
TnyFolderStore *parent_folder)
{
current_name = tny_folder_get_name (TNY_FOLDER (folder));
parent = tny_folder_get_folder_store (TNY_FOLDER (folder));
- response = modest_platform_run_rename_folder_dialog (GTK_WINDOW (window),
+ response = modest_platform_run_rename_folder_dialog (MODEST_WINDOW (window),
parent, current_name,
&folder_name);
g_object_unref (parent);
}
void
-modest_utils_show_dialog_and_forget (GtkWidget *parent_window,
+modest_utils_show_dialog_and_forget (GtkWindow *parent_window,
GtkDialog *dialog)
{
g_return_if_fail (GTK_IS_DIALOG(dialog));
-#ifdef MODEST_TOOLKIT_GTK
- if (GTK_IS_WINDOW (parent_window)) {
- gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
- } else {
- ModestWindowMgr *window_mgr;
- GtkWidget *shell;
-
- window_mgr = modest_runtime_get_window_mgr ();
- shell = modest_gtk_window_mgr_get_shell (MODEST_GTK_WINDOW_MGR (window_mgr));
- gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (shell));
- }
-#else
g_return_if_fail (GTK_IS_WINDOW(parent_window));
gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
-#endif
/* Destroy the dialog when it is closed: */
g_signal_connect_swapped (dialog,
}
static void
-launch_sort_headers_dialog (GtkWindow *parent_window,
+launch_sort_headers_dialog (ModestWindow *parent_window,
GtkDialog *dialog)
{
ModestHeaderView *header_view = NULL;
}
void
-modest_utils_run_sort_dialog (GtkWindow *parent_window,
+modest_utils_run_sort_dialog (ModestWindow *parent_window,
ModestSortDialogType type)
{
GtkWidget *dialog = NULL;
/* Build dialog */
- dialog = modest_platform_create_sort_dialog (parent_window);
+ dialog = modest_platform_create_sort_dialog (modest_toolkit_utils_parent_window (GTK_WIDGET (parent_window)));
if (dialog == NULL)
return;
modest_window_mgr_set_modal (modest_runtime_get_window_mgr (),
#include <tny-fs-stream.h>
#include <modest-protocol.h>
#include "widgets/modest-validating-entry.h"
+#include <widgets/modest-window.h>
typedef enum {
MODEST_UTILS_GET_SUPPORTED_SECURE_AUTHENTICATION_ERROR_CANCELED
* blocking. Use this when you don't want to use gtk_dialog_run(), which might lead
* to hangs.
*/
-void modest_utils_show_dialog_and_forget (GtkWidget *parent_window, GtkDialog *dialog);
+void modest_utils_show_dialog_and_forget (GtkWindow *parent_window, GtkDialog *dialog);
/**
* modest_toggle_action_set_active_block_notify:
*
* raises a sort dialog for this window
*/
-void modest_utils_run_sort_dialog (GtkWindow *parent_window, ModestSortDialogType type);
+void modest_utils_run_sort_dialog (ModestWindow *parent_window, ModestSortDialogType type);
/**
#ifdef MODEST_TOOLKIT_HILDON2
#include <hildon/hildon.h>
#endif
+#ifdef MODEST_TOOLKIT_GTK
+#include <modest-gtk-window-mgr.h>
+#endif
/* Label child of a captioned */
#define CAPTIONED_LABEL_CHILD "captioned-label"
#endif
}
+GtkWindow *
+modest_toolkit_utils_parent_window (GtkWidget *window)
+{
+#ifdef MODEST_TOOLKIT_GTK
+ if (MODEST_IS_WINDOW (window)) {
+ ModestWindowMgr *mgr;
+
+ mgr = modest_runtime_get_window_mgr ();
+ return GTK_WINDOW (modest_gtk_window_mgr_get_shell (MODEST_GTK_WINDOW_MGR (mgr)));
+ } else {
+ return GTK_WINDOW (window);
+ }
+#else
+ return GTK_WINDOW (window);
+#endif
+}
gboolean modest_toolkit_utils_select_attachments (GtkWindow *window, TnyList *att_list, gboolean include_msgs);
+GtkWindow *modest_toolkit_utils_parent_window (GtkWidget *window);
+
#endif /*__MODEST_TOOLKIT_UTILS_H__*/