projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* src/maemo/modest-msg-edit-window.c:
[modest]
/
src
/
maemo
/
modest-maemo-utils.c
diff --git
a/src/maemo/modest-maemo-utils.c
b/src/maemo/modest-maemo-utils.c
index
522392b
..
d1915fd
100644
(file)
--- a/
src/maemo/modest-maemo-utils.c
+++ b/
src/maemo/modest-maemo-utils.c
@@
-45,6
+45,7
@@
#include "modest-hildon-includes.h"
#include "modest-maemo-utils.h"
#include "modest-hildon-includes.h"
#include "modest-maemo-utils.h"
+#include "modest-platform.h"
/*
* For getting and tracking the Bluetooth name
/*
* For getting and tracking the Bluetooth name
@@
-380,6
+381,10
@@
GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
{
g_return_val_if_fail (proto != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN, NULL);
{
g_return_val_if_fail (proto != MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN, NULL);
+ /* We need a connection to get the capabilities; */
+ if (!modest_platform_connect_and_wait (GTK_WINDOW (parent_window), NULL))
+ return NULL;
+
/*
result = g_list_append (result, GINT_TO_POINTER (MODEST_PROTOCOL_AUTH_CRAMMD5));
*/
/*
result = g_list_append (result, GINT_TO_POINTER (MODEST_PROTOCOL_AUTH_CRAMMD5));
*/
@@
-402,7
+407,6
@@
GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
tny_account = NULL;
}
tny_account = NULL;
}
- /* TODO: Handle connection requests. */
if (!tny_account) {
g_printerr ("%s could not create tny account.", __FUNCTION__);
if (!tny_account) {
g_printerr ("%s could not create tny account.", __FUNCTION__);
@@
-546,6
+550,7
@@
on_hide (GtkDialog *dialog, gpointer user_data)
}
#endif
}
#endif
+#if 0 /* Not used now. */
/* user_data for the idle callback: */
typedef struct
{
/* user_data for the idle callback: */
typedef struct
{
@@
-574,6
+579,7
@@
void modest_maemo_show_information_note_in_main_context_and_forget (GtkWindow *p
g_idle_add (on_idle_show_information, info);
}
g_idle_add (on_idle_show_information, info);
}
+#endif
void modest_maemo_show_dialog_and_forget (GtkWindow *parent_window, GtkDialog *dialog)
{
void modest_maemo_show_dialog_and_forget (GtkWindow *parent_window, GtkDialog *dialog)
{