/* 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 */
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)
{
}
static void
-get_default_adapter_cb (DBusMessage *message)
+get_default_adapter_cb (DBusConnection *conn,
+ DBusMessage *message)
{
DBusMessageIter iter;
gchar* path = NULL;
+ DBusError error;
+ DBusMessage *msg, *adapterMsg;
dbus_message_iter_init (message, &iter);
-
dbus_message_iter_get_basic (&iter, &path);
- if (path != NULL) {
- DBusError error;
- DBusConnection *conn;
- DBusMessage *adapterMsg = dbus_message_new_method_call ("org.bluez", path,
- "org.bluez.Adapter",
- "GetProperties");
-
- conn = dbus_bus_get (DBUS_BUS_SYSTEM, NULL);
-
- if (conn) {
- DBusMessage *msg;
-
- dbus_error_init (&error);
- msg = dbus_connection_send_with_reply_and_block (conn, adapterMsg, -1, &error);
- if (msg) {
- g_debug ("Getting the properties");
- get_properties_cb (msg);
- dbus_message_unref (msg);
- }
- dbus_connection_unref (conn);
- }
- dbus_message_unref (adapterMsg);
- } else {
- g_warning ("Failed to get the default bluetooth adapter");
+
+ if (!path)
+ return;
+
+ adapterMsg = dbus_message_new_method_call ("org.bluez", path,
+ "org.bluez.Adapter",
+ "GetProperties");
+
+ dbus_error_init (&error);
+ msg = dbus_connection_send_with_reply_and_block (conn, adapterMsg, -1, &error);
+ if (msg) {
+ g_debug ("Getting the properties");
+ get_properties_cb (msg);
+ dbus_message_unref (msg);
}
+ dbus_message_unref (adapterMsg);
}
void
msg = dbus_connection_send_with_reply_and_block (conn, request, -1, &error);
if (msg) {
g_debug ("Getting the default adapter");
- get_default_adapter_cb (msg);
+ get_default_adapter_cb (conn, msg);
dbus_message_unref (msg);
}
+
dbus_message_unref (request);
- dbus_connection_unref (conn);
+ if (dbus_error_is_set (&error))
+ dbus_error_free (&error);
}
void
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);
}
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 ++;
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