#define DBUS_API_SUBJECT_TO_CHANGE
#endif /*DBUS_API_SUBJECT_TO_CHANGE*/
+#include <sys/utsname.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <glib.h>
{
if (!__osso_context)
g_warning ("%s: __osso_context == NULL", __FUNCTION__);
-
+
return __osso_context;
}
__osso_context = osso_context;
}
-static void
-update_device_name_from_msg (DBusMessage *message)
+void
+modest_maemo_utils_get_device_name (void)
{
- DBusError error;
- DBusMessageIter iter;
+ struct utsname name;
- dbus_error_init (&error);
-
- if (dbus_set_error_from_message (&error, message)) {
- g_printerr ("modest: failed to get bluetooth name: %s\n", error.message);
- dbus_error_free (&error);
- } else {
- const gchar *device_name;
- if (!dbus_message_iter_init (message, &iter)) {
- g_printerr ("modest: message did not have argument\n");
- return;
- }
- dbus_message_iter_get_basic (&iter, &device_name);
+ if (uname (&name) == 0) {
modest_conf_set_string (modest_runtime_get_conf(),
- MODEST_CONF_DEVICE_NAME, device_name,
+ MODEST_CONF_DEVICE_NAME, name.nodename,
NULL);
}
}
-
-static void
-on_device_name_received (DBusPendingCall *call, void *user_data)
-{
- DBusMessage *message;
-
- g_return_if_fail (dbus_pending_call_get_completed (call));
-
- message = dbus_pending_call_steal_reply (call);
- if (!message) {
- g_printerr ("modest: no reply on device name query\n");
- return;
- }
-
- update_device_name_from_msg (message);
- dbus_message_unref (message);
-}
-
-
-static DBusHandlerResult
-handle_dbus_signal (DBusConnection *conn, DBusMessage *msg, gpointer data)
-{
- if (dbus_message_is_signal(msg, BTNAME_SIGNAL_IF, BTNAME_SIG_CHANGED))
- update_device_name_from_msg (msg);
-
- return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
-
-
-static void
-get_device_name_from_dbus ()
-{
- static DBusConnection *conn = NULL;
- DBusMessage *request;
- DBusError error;
- DBusPendingCall *call = NULL;
-
- dbus_error_init (&error);
- if (!conn) {
- conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
- if (!conn) {
- g_printerr ("modest: cannot get on the dbus: %s: %s\n",
- error.name, error.message);
- dbus_error_free (&error);
- return;
- }
- }
-
- request = dbus_message_new_method_call (BTNAME_SERVICE, BTNAME_REQUEST_PATH,
- BTNAME_REQUEST_IF, BTNAME_REQ_GET);
- if (!request) {
- /* should we free the connection? */
- g_printerr ("modest: dbus_message_new_method_call failed\n");
- return;
- }
- dbus_message_set_auto_start (request, TRUE);
- if (dbus_connection_send_with_reply (conn, request, &call, -1)) {
- dbus_pending_call_set_notify (call, on_device_name_received,
- NULL, NULL);
- dbus_pending_call_unref (call);
- }
- dbus_message_unref (request);
-
- dbus_connection_setup_with_g_main (conn, NULL);
- dbus_bus_add_match (conn, BTNAME_MATCH_RULE, &error);
- if (dbus_error_is_set(&error)) {
- g_printerr ("modest: dbus_bus_add_match failed: %s\n", error.message);
- dbus_error_free (&error);
- }
-
- if (!dbus_connection_add_filter(conn, handle_dbus_signal, NULL, NULL))
- g_printerr ("modest: dbus_connection_add_filter failed\n");
-}
-
-
-void
-modest_maemo_utils_get_device_name (void)
-{
- get_device_name_from_dbus ();
-}
-
void
modest_maemo_utils_setup_images_filechooser (GtkFileChooser *chooser)
{
- gchar *images_folder;
GtkFileFilter *file_filter;
GList *image_mimetypes_list;
GList *node;
+ gchar *conf_folder;
g_return_if_fail (GTK_IS_FILE_CHOOSER (chooser));
- /* 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);
- gtk_file_chooser_set_current_folder (chooser, images_folder);
- g_free (images_folder);
+ 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);
+ gtk_file_chooser_set_current_folder (chooser, images_folder);
+ g_free (images_folder);
+ }
+ g_free (conf_folder);
/* Set the images mime filter */
file_filter = gtk_file_filter_new ();
#endif /* MODEST_HAVE_HILDON1_WIDGETS */
}
-FILE*
-modest_maemo_open_mcc_mapping_file (void)
-{
- FILE* result;
-
- const gchar* path;
- const gchar* path1 = MODEST_OPERATOR_WIZARD_MCC_MAPPING;
- const gchar* path2 = MODEST_MCC_MAPPING;
-
- if (access(path1, R_OK) == 0)
- path = path1;
- else if (access(path2, R_OK) == 0)
- path = path2;
- else {
- g_warning ("%s: neither '%s' nor '%s' is a readable mapping file",
- __FUNCTION__, path1, path2);
- return NULL;
- }
-
- result = fopen (path, "r");
- if (!result) {
- g_warning ("%s: error opening mapping file '%s': %s",
- __FUNCTION__, path, strerror(errno));
- return NULL;
- }
- return result;
-}
-
GtkWidget *
modest_maemo_utils_get_manager_menubar_as_menu (GtkUIManager *manager,
const gchar *item_name)
title,
use_markup,
control,
- HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
+ 0);
}
/**
HildonSizeType size_type)
{
GtkWidget *label;
+ GtkWidget *align;
GtkWidget *box;
if (use_markup) {
} else {
label = gtk_label_new (title);
}
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_TRIPLE);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
hildon_gtk_widget_set_theme_size (label, HILDON_SIZE_FINGER_HEIGHT);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_widget_show (label);
- box = gtk_hbox_new (FALSE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, MODEST_MARGIN_HALF);
+ gtk_widget_show (align);
+ box = gtk_hbox_new (FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (align), label);
+ gtk_box_pack_start (GTK_BOX (box), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, 0);
if (title_size_group)
gtk_size_group_add_widget (title_size_group, label);
if (value_size_group)
}
gboolean
-modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list)
+modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *att_list, gboolean include_msgs)
{
GtkTreeModel *model;
TnyIterator *iterator;
GtkWidget *dialog;
gint response;
gboolean result = TRUE;
+ gint attachments_added = 0;
model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT));
for (iterator = tny_list_create_iterator (att_list);
tny_iterator_next (iterator)) {
GtkTreeIter iter;
TnyMimePart *part;
- gchar *label;
gchar *filename = NULL;
part = (TnyMimePart *) tny_iterator_get_current (iterator);
- if (TNY_IS_MSG (part)) {
- TnyHeader *header;
-
- header = tny_msg_get_header (TNY_MSG (part));
- if (TNY_IS_HEADER (header)) {
- filename = g_strdup (tny_mime_part_get_filename (part));
- if (!filename)
- filename = tny_header_dup_subject (header);
- if (filename == NULL || filename[0] == '\0')
+ /* Ignore purged attachments and messages if ignore is
+ set to TRUE */
+ if (!(tny_mime_part_is_purged (part) ||
+ (TNY_IS_MSG (part) && !include_msgs))) {
+
+ 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));
}
- } else {
- filename = g_strdup (tny_mime_part_get_filename (part));
+ 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 ++;
+ g_free (filename);
+ g_object_unref (part);
}
-
- label = g_strconcat (filename, NULL);
- gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, label, 1, part, -1);
- g_free (label);
- g_object_unref (part);
}
selector = GTK_WIDGET (hildon_touch_selector_new ());
HILDON_TOUCH_SELECTOR_SELECTION_MODE_MULTIPLE);
dialog = hildon_picker_dialog_new (window);
- gtk_window_set_title (GTK_WINDOW (dialog), _("mcen_ti_select_attachment_title"));
+ gtk_window_set_title (GTK_WINDOW (dialog), (attachments_added > 1)?
+ _("mcen_ti_select_attachments_title"):_("mcen_ti_select_attachment_title"));
hildon_picker_dialog_set_selector (HILDON_PICKER_DIALOG (dialog), HILDON_TOUCH_SELECTOR (selector));
hildon_picker_dialog_set_done_label (HILDON_PICKER_DIALOG (dialog), _HL("wdgt_bd_done"));
projects / modest / blobdiff