Don't "find" the current folder in dbus callback (it's slow and uses network)

[modest] / src / hildon2 / modest-maemo-utils.c

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index b9f89d7..2ca89a5 100644 (file)
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -64,18 +64,12 @@ osso_context_t *
 modest_maemo_utils_get_osso_context (void)
 {
        if (!__osso_context) 
-               g_warning ("%s: __osso_context == NULL", __FUNCTION__);
+               __osso_context = osso_initialize(PACKAGE,PACKAGE_VERSION,
+                                                FALSE, NULL);
 
        return __osso_context;
 }
 
-void
-modest_maemo_utils_set_osso_context (osso_context_t *osso_context)
-{
-       g_return_if_fail (osso_context);
-       __osso_context = osso_context;
-}
-
 static void
 get_properties_cb (DBusMessage *message)
 {
@@ -508,14 +502,14 @@ modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list, gbo
                        if (TNY_IS_MSG (part)) {
                                TnyHeader *header = tny_msg_get_header (TNY_MSG (part));
                                filename = tny_header_dup_subject (header);
-                               if ((filename == NULL) || (filename[0] == '\0')) {
-                                       g_free (filename);
-                                       filename = g_strdup (_("mail_va_no_subject"));
-                               }
                                g_object_unref (header);
                        } else {
                                filename = g_strdup (tny_mime_part_get_filename (part));
                        }
+                       if ((filename == NULL) || (filename[0] == '\0')) {
+                               g_free (filename);
+                               filename = g_strdup (_("mail_va_no_subject"));
+                       }
                        gtk_list_store_append (GTK_LIST_STORE (model), &iter);
                        gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, filename, 1, part, -1);
                        attachments_added ++;