X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-utils.c;h=6d50ee181155e65adb2eab198927c0d1b0769cd4;hp=1e00c5ab476072f30c4b3a6486546b1e65bf13ee;hb=6fb1323bf79f5fe514da3bbb44130fdfdbd8e46f;hpb=d1760b0aced656ccf2c841bead303fb2706af884 diff --git a/src/maemo/modest-maemo-utils.c b/src/maemo/modest-maemo-utils.c index 1e00c5a..6d50ee1 100644 --- a/src/maemo/modest-maemo-utils.c +++ b/src/maemo/modest-maemo-utils.c @@ -34,6 +34,9 @@ #include #include #include +#include +#include +#include /* for strlen */ #include #include #include @@ -45,6 +48,7 @@ #include "modest-hildon-includes.h" #include "modest-maemo-utils.h" +#include "modest-platform.h" /* * For getting and tracking the Bluetooth name @@ -71,7 +75,7 @@ modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager) { GtkWidget *main_menu; GtkWidget *menubar; - GList *iter; + GList *children, *iter; g_return_val_if_fail (ui_manager, NULL); @@ -81,7 +85,7 @@ modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager) /* Get the menubar from the UI manager */ menubar = gtk_ui_manager_get_widget (ui_manager, "/MenuBar"); - iter = gtk_container_get_children (GTK_CONTAINER (menubar)); + iter = children = gtk_container_get_children (GTK_CONTAINER (menubar)); while (iter) { GtkWidget *menu; @@ -90,6 +94,7 @@ modest_maemo_utils_menubar_to_menu (GtkUIManager *ui_manager) iter = g_list_next (iter); } + g_list_free (children); return main_menu; } @@ -112,7 +117,6 @@ update_device_name_from_msg (DBusMessage *message) return; } dbus_message_iter_get_basic (&iter, &device_name); - g_warning ("update device name: %s", device_name); modest_conf_set_string (modest_runtime_get_conf(), MODEST_CONF_DEVICE_NAME, device_name, NULL); @@ -203,6 +207,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; @@ -233,27 +242,58 @@ modest_maemo_utils_file_exists (const gchar *filename) } TnyFsStream * -modest_maemo_utils_create_temp_stream (const gchar *extension, gchar **path) +modest_maemo_utils_create_temp_stream (const gchar *orig_name, const gchar *hash_base, gchar **path) { - TnyStream *tmp_fs_stream = NULL; gint fd; gchar *filepath = NULL; - gchar *template = NULL; - - if (extension != NULL) - template = g_strdup_printf ("XXXXXX.%s", extension); + gchar *tmpdir; + guint hash_number; + + /* hmmm... maybe we need a modest_text_utils_validate_file_name? */ + g_return_val_if_fail (orig_name || strlen(orig_name) == 0, NULL); + if (strlen(orig_name) > 200) { + g_warning ("%s: filename too long ('%s')", + __FUNCTION__, orig_name); + return NULL; + } + + if (g_strstr_len (orig_name, strlen(orig_name), "/") != NULL) { + g_warning ("%s: filename contains '/' character(s) (%s)", + __FUNCTION__, orig_name); + return NULL; + } + + /* make a random subdir under /tmp or /var/tmp */ + if (hash_base != NULL) { + hash_number = g_str_hash (hash_base); + } else { + hash_number = (guint) random (); + } + tmpdir = g_strdup_printf ("%s/%u", g_get_tmp_dir (), hash_number); + if ((g_access (tmpdir, R_OK) == -1) && (g_mkdir (tmpdir, 0755) == -1)) { + g_warning ("%s: failed to create dir '%s': %s", + __FUNCTION__, tmpdir, g_strerror(errno)); + g_free (tmpdir); + return NULL; + } - fd = g_file_open_tmp (template, &filepath, NULL); - g_free (template); - if (path != NULL) - *path = filepath; + /* try to write the file there */ + filepath = g_strconcat (tmpdir, "/", orig_name, NULL); + fd = g_open (filepath, O_CREAT|O_WRONLY|O_TRUNC, 0644); if (fd == -1) { - g_message ("TODO BANNER: Error saving stream"); + g_warning ("%s: failed to create '%s': %s", + __FUNCTION__, filepath, g_strerror(errno)); + g_free (tmpdir); + g_free (filepath); return NULL; } - tmp_fs_stream = tny_fs_stream_new (fd); - - return TNY_FS_STREAM (tmp_fs_stream); + + g_free (tmpdir); + + if (path) + *path = filepath; + + return TNY_FS_STREAM (tny_fs_stream_new (fd)); } typedef struct @@ -272,28 +312,31 @@ static void on_camel_account_get_supported_secure_authentication_status ( } static gboolean -on_secure_auth_finished (gpointer user_data) +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(); + + /* This is a GDK lock because we are an idle callback and + * the code below is or does Gtk+ code */ + + gdk_threads_enter(); /* CHECKED */ gtk_dialog_response (GTK_DIALOG (info->dialog), GTK_RESPONSE_ACCEPT); - gdk_threads_leave(); + gdk_threads_leave(); /* CHECKED */ + return FALSE; } static void on_camel_account_get_supported_secure_authentication ( TnyCamelAccount *self, gboolean cancelled, - TnyList *auth_types, GError **err, + TnyList *auth_types, GError *err, gpointer user_data) { - ModestGetSupportedAuthInfo *info = (ModestGetSupportedAuthInfo*)user_data; g_return_if_fail (info); - - gdk_threads_enter(); + /* Free everything if the actual action was canceled */ if (info->cancel) @@ -305,18 +348,22 @@ on_camel_account_get_supported_secure_authentication ( } else { - /* TODO: Why is this a pointer to a pointer? We are not supposed to - * set it, are we? */ - if(err != NULL && *err != NULL) + if (err) { - if(info->error != NULL) g_error_free(info->error); - info->error = g_error_copy(*err); + if (info->error) { + g_error_free (info->error); + info->error = NULL; + } + + info->error = g_error_copy (err); } if (!auth_types) { - printf ("DEBUG: %s: auth_types is NULL.\n", __FUNCTION__); + g_warning ("DEBUG: %s: auth_types is NULL.\n", __FUNCTION__); } - else + else if (tny_list_get_length(auth_types) == 0) { + g_warning ("DEBUG: %s: auth_types is an empty TnyList.\n", __FUNCTION__); + } else { ModestPairList* pairs = modest_protocol_info_get_auth_protocol_pair_list (); @@ -324,18 +371,23 @@ on_camel_account_get_supported_secure_authentication ( 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)); + 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); + + ModestAuthProtocol proto = modest_protocol_info_get_auth_protocol (auth_name); + if(proto != MODEST_PROTOCOL_AUTH_NONE) + result = g_list_prepend(result, GINT_TO_POINTER(proto)); + tny_iterator_next(iter); } - - g_object_unref(auth_types); + g_object_unref (iter); modest_pair_list_free (pairs); @@ -343,12 +395,10 @@ on_camel_account_get_supported_secure_authentication ( } printf("DEBUG: finished\n"); - + /* Close the dialog in a main thread */ - g_idle_add(on_secure_auth_finished, info); + 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) @@ -363,11 +413,16 @@ static void on_secure_auth_cancel(GtkWidget* dialog, int response, gpointer user } } -GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto, +GList* +modest_maemo_utils_get_supported_secure_authentication_methods (ModestTransportStoreProtocol proto, const gchar* hostname, gint port, const gchar* username, GtkWindow *parent_window, GError** error) { 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)); */ @@ -389,6 +444,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__); @@ -405,6 +461,9 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra /* Required for POP, at least */ tny_account_set_user (tny_account, username); + if(port > 0) + tny_account_set_port (tny_account, port); + /* Set the session for the account, so we can use it: */ ModestTnyAccountStore *account_store = modest_runtime_get_account_store (); TnySessionCamel *session = @@ -412,19 +471,17 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra g_return_val_if_fail (session, NULL); tny_camel_account_set_session (TNY_CAMEL_ACCOUNT(tny_account), session); - if(port > 0) - tny_account_set_port (tny_account, port); - - + /* Ask camel to ask the server, asynchronously: */ ModestGetSupportedAuthInfo *info = g_slice_new (ModestGetSupportedAuthInfo); info->result = NULL; info->cancel = FALSE; info->error = NULL; info->progress = gtk_progress_bar_new(); + /* TODO: Need logical_ID for the title: */ info->dialog = gtk_dialog_new_with_buttons(_("Authentication"), parent_window, GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, + _("mcen_bd_dialog_cancel"), GTK_RESPONSE_REJECT, NULL); //gtk_window_set_default_size(GTK_WINDOW(info->dialog), 300, 100); @@ -447,12 +504,19 @@ GList* modest_maemo_utils_get_supported_secure_authentication_methods (ModestTra gtk_dialog_run (GTK_DIALOG (info->dialog)); gtk_widget_destroy(info->dialog); - + GList *result = info->result; if (!info->cancel) { - if(info->error != NULL) + if (info->error) { + gchar * debug_url_string = tny_account_get_url_string (tny_account); + g_warning ("DEBUG: %s:\n error: %s\n account url: %s", __FUNCTION__, info->error->message, + debug_url_string); + g_free (debug_url_string); + g_propagate_error(error, info->error); + info->error = NULL; + } g_slice_free (ModestGetSupportedAuthInfo, info); info = NULL; @@ -505,3 +569,118 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser) #endif } + +#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_swapped (dialog, + "response", + G_CALLBACK (gtk_widget_destroy), + dialog); + + 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); + } + +} + + + +FILE* +modest_maemo_open_mcc_mapping_file (void) +{ + FILE* result; + + /* Load the file one line at a time: */ +#ifdef MODEST_HILDON_VERSION_0 + const gchar* filepath = PROVIDER_DATA_DIR "/mcc_mapping"; +#else + const gchar* filepath = "/usr/share/operator-wizard/mcc_mapping"; +#endif /*MODEST_HILDON_VERSION_0*/ + + result = fopen (filepath, "r"); + if (!result) + g_printerr ("modest: failed to open mcc mapping file"); + + return result; +} + +