Added AUTOCAP to the entry
[modest] / src / hildon2 / modest-maemo-utils.c
index 4d2a495..c2248af 100644 (file)
@@ -31,6 +31,7 @@
 #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>
@@ -80,7 +81,7 @@ modest_maemo_utils_get_osso_context (void)
 {
        if (!__osso_context) 
                g_warning ("%s: __osso_context == NULL", __FUNCTION__);
-       
+
        return __osso_context;
 }
 
@@ -91,111 +92,18 @@ modest_maemo_utils_set_osso_context (osso_context_t *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;
-
-       dbus_error_init (&error);
+       struct utsname name;
 
-       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)
 {
@@ -242,30 +150,38 @@ modest_maemo_set_thumbable_scrollbar (GtkScrolledWindow *win,
 }
 
 FILE*
-modest_maemo_open_mcc_mapping_file (void)
+modest_maemo_open_mcc_mapping_file (gboolean *translated)
 {
-       FILE* result;
-       
+       FILE* result = NULL;
        const gchar* path;
-       const gchar* path1 = MODEST_OPERATOR_WIZARD_MCC_MAPPING;
+       gchar *path1 = g_strdup_printf ("%s.%s", MODEST_OPERATOR_WIZARD_MCC_MAPPING, getenv("LANG"));
        const gchar* path2 = MODEST_MCC_MAPPING;
-       
-       if (access(path1, R_OK) == 0) 
+
+       if (translated)
+               *translated = TRUE;
+
+       if (access (path1, R_OK) == 0) {
                path = path1;
-       else if (access(path2, R_OK) == 0)
+       } else if (access (MODEST_OPERATOR_WIZARD_MCC_MAPPING, R_OK) == 0) {
+               path = MODEST_OPERATOR_WIZARD_MCC_MAPPING;
+               if (translated)
+                       *translated = FALSE;
+       } else if (access (path2, R_OK) == 0) {
                path = path2;
-       else {
+       } else {
                g_warning ("%s: neither '%s' nor '%s' is a readable mapping file",
                           __FUNCTION__, path1, path2);
-               return NULL;
+               goto end;
        }
-       
+
        result = fopen (path, "r");
        if (!result) {
                g_warning ("%s: error opening mapping file '%s': %s",
                           __FUNCTION__, path, strerror(errno));
-               return NULL;
+               goto end;
        }
+ end:
+       g_free (path1);
        return result;
 }
 
@@ -483,31 +399,21 @@ modest_maemo_utils_select_attachments (GtkWindow *window, TnyList *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')
-                                       filename = g_strdup (_("mail_va_no_subject"));
-                       }
-               } else {
+               /* Embbeded messages are not offered to be saved */
+               if (!TNY_IS_MSG (part)) {
+                       gchar *label;
+                       gchar *filename = NULL;
+
                        filename = g_strdup (tny_mime_part_get_filename (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);
                }
-
-               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 ());