X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-maemo-utils.c;h=50edb3cbc4d335a5d92b953f6029514be10f95bc;hb=d723e312ee1d3edf9933b528444f9efb69cdffe2;hp=2ca89a502cef465d0a9643e785062e8c80ca5e06;hpb=769c7cc12951e870167120391aa2980ac47b2d8c;p=modest

diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c
index 2ca89a5..50edb3c 100644
--- a/src/hildon2/modest-maemo-utils.c
+++ b/src/hildon2/modest-maemo-utils.c
@@ -57,6 +57,9 @@
 /* Label child of a captioned */
 #define CAPTIONED_LABEL_CHILD "captioned-label"
 
+#ifdef MODEST_PLATFORM_MAEMO
+#define INTERNAL_MMC_USB_MODE  "/system/osso/af/internal-mmc-used-over-usb"
+#endif
 
 static osso_context_t *__osso_context = NULL; /* urgh global */
 
@@ -193,7 +196,10 @@ modest_maemo_utils_get_device_name (void)
 		get_default_adapter_cb (conn, msg);
 		dbus_message_unref (msg);
 	}
+
 	dbus_message_unref (request);
+	if (dbus_error_is_set (&error))
+		dbus_error_free (&error);
 }
 
 void
@@ -206,14 +212,19 @@ modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
 
 	g_return_if_fail (GTK_IS_FILE_CHOOSER (chooser));
 
-	conf_folder = modest_conf_get_string (modest_runtime_get_conf (), MODEST_CONF_LATEST_INSERT_IMAGE_PATH, NULL);
+	conf_folder = modest_conf_get_string (modest_runtime_get_conf (),
+					      MODEST_CONF_LATEST_INSERT_IMAGE_PATH, NULL);
 	if (conf_folder && conf_folder[0] != '\0') {
 		gtk_file_chooser_set_current_folder_uri (chooser, conf_folder);
 	} else {
 		gchar *images_folder;
 		/* Set the default folder to images folder */
-		images_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
-						  MODEST_MAEMO_UTILS_DEFAULT_IMAGE_FOLDER, NULL);
+		images_folder = (gchar *) g_strdup(g_get_user_special_dir (G_USER_DIRECTORY_PICTURES));
+		if (!images_folder) {
+			/* fallback */
+			images_folder = g_build_filename (g_getenv (MODEST_MAEMO_UTILS_MYDOCS_ENV),
+							  MODEST_MAEMO_UTILS_DEFAULT_IMAGE_FOLDER, NULL);
+		}
 		gtk_file_chooser_set_current_folder (chooser, images_folder);
 		g_free (images_folder);
 	}
@@ -564,3 +575,11 @@ modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list, gbo
 
 	return result;
 }
+
+#ifdef MODEST_PLATFORM_MAEMO
+gboolean
+modest_maemo_utils_in_usb_mode ()
+{
+	return modest_conf_get_bool (modest_runtime_get_conf (), INTERNAL_MMC_USB_MODE, NULL);
+}
+#endif