X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-utils.c;h=d1915fdfb5c483b056c3b174ec67f9dff93476fe;hp=a88cb862e1941040d5493579f3a4c635e4e9a787;hb=40a8f5cbe03bd040fe3403dbfa6806df4fb6bc8a;hpb=a7a13999485be2916dc3611ce7a2abc93de1d6fe

diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c
index a88cb86..d1915fd 100644
--- 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-platform.h"
 
 /*
  * For getting and tracking the Bluetooth name
@@ -203,6 +204,11 @@ modest_maemo_utils_get_device_name (void)
 gboolean 
 modest_maemo_utils_folder_writable (const gchar *filename)
 {
+	g_return_val_if_fail (filename, FALSE);
+
+	if (!filename)
+		return FALSE;
+	
 	if (g_strncasecmp (filename, "obex", 4) != 0) {
 		GnomeVFSFileInfo folder_info;
 		gchar *folder;
@@ -258,7 +264,6 @@ modest_maemo_utils_create_temp_stream (const gchar *extension, gchar **path)
 
 typedef struct 
 {
-	gboolean finished;
 	gboolean cancel;
 	GList *result;
 	GtkWidget* dialog;
@@ -272,6 +277,18 @@ static void on_camel_account_get_supported_secure_authentication_status (
 	/*ModestGetSupportedAuthInfo* info = (ModestGetSupportedAuthInfo*) user_data;*/
 }
 
+static gboolean
+on_idle_secure_auth_finished (gpointer user_data)
+{
+	ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data;
+	/* Operation has finished, close the dialog. Control continues after
+	 * gtk_dialog_run in modest_maemo_utils_get_supported_secure_authentication_methods() */
+	gdk_threads_enter();
+	gtk_dialog_response (GTK_DIALOG (info->dialog), GTK_RESPONSE_ACCEPT);
+	gdk_threads_leave();
+	return FALSE;
+}
+
 static void
 on_camel_account_get_supported_secure_authentication (
   TnyCamelAccount *self, gboolean cancelled,
@@ -282,61 +299,81 @@ on_camel_account_get_supported_secure_authentication (
 	ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data;
 	g_return_if_fail (info);
 
+	gdk_threads_enter();
+
 	/* Free everything if the actual action was canceled */
 	if (info->cancel)
 	{
+		/* The operation was canceled and the ownership of the info given to us
+		 * so that we could still check the cancel flag. */
 		g_slice_free (ModestGetSupportedAuthInfo, info);
 		info = NULL;
-		return;
 	}
-
-	/* TODO: Why is this a pointer to a pointer? We are not supposed to
-	 * set it, are we? */
-	if(err != NULL && *err != NULL)
+	else
 	{
-		if(info->error != NULL) g_error_free(info->error);
-		info->error = g_error_copy(*err);
-	}
-	
-	if (!auth_types) {
-		printf ("DEBUG: %s: auth_types is NULL.\n", __FUNCTION__);
-		info->finished = TRUE; /* We are blocking, waiting for this. */
-		return;
-	}
-		
-	ModestPairList* pairs = modest_protocol_info_get_auth_protocol_pair_list ();
+		/* TODO: Why is this a pointer to a pointer? We are not supposed to
+		 * set it, are we? */
+		if(err != NULL && *err != NULL)
+		{
+			if(info->error != NULL) g_error_free(info->error);
+			info->error = g_error_copy(*err);
+		}
+
+		if (!auth_types) {
+			printf ("DEBUG: %s: auth_types is NULL.\n", __FUNCTION__);
+		}
+		else
+		{
+			ModestPairList* pairs = modest_protocol_info_get_auth_protocol_pair_list ();
   
-	/* Get the enum value for the strings: */
-	GList *result = NULL;
-	TnyIterator* iter = tny_list_create_iterator(auth_types);
-	while (!tny_iterator_is_done(iter)) {
-		const gchar *auth_name = tny_pair_get_name(TNY_PAIR(tny_iterator_get_current(iter)));
-		printf("DEBUG: %s: auth_name=%s\n", __FUNCTION__, auth_name);
-		ModestPair *matching = modest_pair_list_find_by_first_as_string (pairs, 
-			auth_name);
-		if (matching)
-    {
-      result = g_list_append (result, GINT_TO_POINTER((ModestConnectionProtocol)matching->first));
-    }
-		tny_iterator_next(iter);
-	}
+			/* Get the enum value for the strings: */
+			GList *result = NULL;
+			TnyIterator* iter = tny_list_create_iterator(auth_types);
+			while (!tny_iterator_is_done(iter)) {
+				TnyPair *pair = TNY_PAIR(tny_iterator_get_current(iter));
+				const gchar *auth_name = NULL;
+				if (pair) {
+					auth_name = tny_pair_get_name(pair);
+					g_object_unref (pair);
+					pair = NULL;
+				}
+
+				printf("DEBUG: %s: auth_name=%s\n", __FUNCTION__, auth_name);
+				ModestPair *matching = modest_pair_list_find_by_first_as_string (pairs, 
+					auth_name);
+				if (matching)
+	   			{
+					result = g_list_append (result, GINT_TO_POINTER((ModestConnectionProtocol)matching->first));
+				}
+				tny_iterator_next(iter);
+			}
 	
-  g_object_unref(auth_types);
-	
-	modest_pair_list_free (pairs);
+			g_object_unref(auth_types);
+
+			modest_pair_list_free (pairs);
 	
-	info->result = result;
-  printf("DEBUG: finished\n");
-	info->finished = TRUE; /* We are blocking, waiting for this. */
+			info->result = result;
+		}
+
+		printf("DEBUG: finished\n");
+
+		/* Close the dialog in a main thread */
+		g_idle_add(on_idle_secure_auth_finished, info);
+	}
+
+	gdk_threads_leave();
 }
 
 static void on_secure_auth_cancel(GtkWidget* dialog, int response, gpointer user_data)
 {
-	ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data;
-	g_return_if_fail(info);
-	/* We are blocking */
-	info->result = NULL;
-	info->cancel = TRUE;
+	if(response == GTK_RESPONSE_REJECT || response == GTK_RESPONSE_DELETE_EVENT)
+	{
+		ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data;
+		g_return_if_fail(info);
+		/* This gives the ownership of the info to the worker thread. */
+		info->result = NULL;
+		info->cancel = TRUE;
+	}
 }
 
 GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto, 
@@ -344,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);
 	
+	/* 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));
 	*/
@@ -365,6 +406,7 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
 	default:
 		tny_account = NULL;
 	}
+
 	
 	if (!tny_account) {
 		g_printerr ("%s could not create tny account.", __FUNCTION__);
@@ -394,25 +436,24 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
 
 	/* Ask camel to ask the server, asynchronously: */
 	ModestGetSupportedAuthInfo *info = g_slice_new (ModestGetSupportedAuthInfo);
-	info->finished = FALSE;
 	info->result = NULL;
 	info->cancel = FALSE;
 	info->error = NULL;
 	info->progress = gtk_progress_bar_new();
-  info->dialog = gtk_dialog_new_with_buttons(_("Authentication"),
-																parent_window, GTK_DIALOG_MODAL,
-																GTK_STOCK_CANCEL,
-																GTK_RESPONSE_REJECT,
-																NULL);
+	info->dialog = gtk_dialog_new_with_buttons(_("Authentication"),
+	                                           parent_window, GTK_DIALOG_MODAL,
+	                                           GTK_STOCK_CANCEL,
+	                                           GTK_RESPONSE_REJECT,
+	                                           NULL);
 	//gtk_window_set_default_size(GTK_WINDOW(info->dialog), 300, 100);
 	
 	g_signal_connect(G_OBJECT(info->dialog), "response", G_CALLBACK(on_secure_auth_cancel), info);
 	
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(info->dialog)->vbox),
-										gtk_label_new("Checking for supported authentication types..."));
+	                  gtk_label_new("Checking for supported authentication types..."));
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(info->dialog)->vbox), info->progress);
 	gtk_widget_show_all(info->dialog);
-  gtk_progress_bar_pulse(GTK_PROGRESS_BAR(info->progress));
+	gtk_progress_bar_pulse(GTK_PROGRESS_BAR(info->progress));
 	
 	printf ("DEBUG: %s: STARTING.\n", __FUNCTION__);
 	tny_camel_account_get_supported_secure_authentication (
@@ -420,15 +461,10 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra
 		on_camel_account_get_supported_secure_authentication,
 		on_camel_account_get_supported_secure_authentication_status,
 		info);
-		
-	/* Block until the callback has been called,
-	 * driving the main context, so that the (idle handler) callback can be 
-	 * called, and so that our dialog is clickable: */
-	while (!(info->finished) && !(info->cancel)) {
-    gtk_main_iteration_do(FALSE); 
-	}
+
+	gtk_dialog_run (GTK_DIALOG (info->dialog));
 	
-  gtk_widget_destroy(info->dialog);
+	gtk_widget_destroy(info->dialog);
 		
 	GList *result = info->result;
 	if (!info->cancel)
@@ -487,3 +523,103 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
 #endif
 
 }
+
+static void
+on_response (GtkDialog *dialog, gint response, gpointer user_data)
+{
+	/* Just destroy the dialog: */
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+
+void
+modest_maemo_show_information_note_and_forget (GtkWindow *parent_window, const gchar* message)
+{
+	GtkDialog *dialog = GTK_DIALOG (hildon_note_new_information (parent_window, message));
+	
+	/* Destroy the dialog when it is closed: */
+	g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (on_response), NULL);
+	gtk_widget_show (GTK_WIDGET (dialog));
+}
+
+#if 0
+static void
+on_hide (GtkDialog *dialog, gpointer user_data)
+{
+	/* Just destroy the dialog: */
+	gtk_widget_destroy (GTK_WIDGET (dialog));
+}
+#endif
+
+#if 0 /* Not used now. */
+/* user_data for the idle callback: */
+typedef struct 
+{
+	GtkWindow *parent_window;
+	gchar *message;
+} ModestIdleNoteInfo;
+
+static gboolean
+on_idle_show_information(gpointer user_data)
+{
+	ModestIdleNoteInfo *info = (ModestIdleNoteInfo*)user_data;
+	
+	modest_maemo_show_information_note_and_forget (info->parent_window, info->message);
+	
+	g_free (info->message);
+	g_slice_free (ModestIdleNoteInfo, info);
+	
+	return FALSE; /* Don't call this again. */
+}
+
+void modest_maemo_show_information_note_in_main_context_and_forget (GtkWindow *parent_window, const gchar* message)
+{
+	ModestIdleNoteInfo *info = g_slice_new (ModestIdleNoteInfo);
+	info->parent_window = parent_window;
+	info->message = g_strdup (message);
+	
+	g_idle_add (on_idle_show_information, info);
+}
+#endif
+
+void modest_maemo_show_dialog_and_forget (GtkWindow *parent_window, GtkDialog *dialog)
+{
+	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent_window);
+	
+	/* Destroy the dialog when it is closed: */
+	g_signal_connect (G_OBJECT (dialog), "response", G_CALLBACK (on_response), NULL);
+	gtk_widget_show (GTK_WIDGET (dialog));
+}
+
+
+
+void
+modest_maemo_set_thumbable_scrollbar (GtkScrolledWindow *win, gboolean thumbable)
+{
+	g_return_if_fail (GTK_IS_SCROLLED_WINDOW(win));
+#ifdef MODEST_HAVE_HILDON1_WIDGETS		
+	hildon_helper_set_thumb_scrollbar (win, thumbable);
+#endif /* MODEST_HAVE_HILDON1_WIDGETS */
+}
+
+void
+modest_maemo_toggle_action_set_active_block_notify (GtkToggleAction *action, gboolean value)
+{
+	GSList *proxies = NULL;
+
+	g_return_if_fail (GTK_IS_TOGGLE_ACTION (action));
+
+	for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
+	     proxies != NULL; proxies = g_slist_next (proxies)) {
+		GtkWidget *widget = (GtkWidget *) proxies->data;
+		gtk_action_block_activate_from (GTK_ACTION (action), widget);
+	}
+
+	gtk_toggle_action_set_active (action, value);
+
+	for (proxies = gtk_action_get_proxies (GTK_ACTION (action));
+	     proxies != NULL; proxies = g_slist_next (proxies)) {
+		GtkWidget *widget = (GtkWidget *) proxies->data;
+		gtk_action_unblock_activate_from (GTK_ACTION (action), widget);
+	}
+
+}