From: Marcus Bauer Date: Thu, 7 Jun 2007 15:46:41 +0000 (+0000) Subject: 2007-06-07 Marcus Bauer X-Git-Tag: git_migration_finished~3383 X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=48d5a2f7db86924385eddd9c23c482a19b50c2bd 2007-06-07 Marcus Bauer * src/dbus_api/modest-dbus-api.h: changed MODEST_DBUS_NAME in order to get dbus auto-activation to work * src/maemo/modest-msg-edit-window.c: (modest_msg_edit_window_attach_file_noninteractive): added g_warning in case the file to be attached does not exist * tests/dbus_api/test_compose_mail.c: (main): removed obsolete comment, added generic files as test case pmo-trunk-r2110 --- diff --git a/ChangeLog2 b/ChangeLog2 index a9c0e7e..d1f44f7 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,3 +1,13 @@ +2007-06-07 Marcus Bauer + + * src/dbus_api/modest-dbus-api.h: + changed MODEST_DBUS_NAME in order to get dbus auto-activation to work + * src/maemo/modest-msg-edit-window.c: + (modest_msg_edit_window_attach_file_noninteractive): + added g_warning in case the file to be attached does not exist + * tests/dbus_api/test_compose_mail.c: (main): + removed obsolete comment, added generic files as test case + 2007-06-07 Murray Cumming * src/modest-tny-account-store.c: (get_server_accounts): diff --git a/src/dbus_api/modest-dbus-api.h b/src/dbus_api/modest-dbus-api.h index 7d8c0c5..cb6cb4d 100644 --- a/src/dbus_api/modest-dbus-api.h +++ b/src/dbus_api/modest-dbus-api.h @@ -35,7 +35,7 @@ /* Note that the com.nokia service name and /com/nokia object name * are what is assumed by the, bizarrely named, osso_rpc_run_with_defaults() function, * so they are probably a good choice. */ -#define MODEST_DBUS_NAME "modestemail" +#define MODEST_DBUS_NAME "modest" #define MODEST_DBUS_SERVICE "com.nokia."MODEST_DBUS_NAME #define MODEST_DBUS_OBJECT "/com/nokia/"MODEST_DBUS_NAME #define MODEST_DBUS_IFACE "com.nokia."MODEST_DBUS_NAME diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c index f770f7a..9811db7 100644 --- a/src/maemo/modest-msg-edit-window.c +++ b/src/maemo/modest-msg-edit-window.c @@ -1550,6 +1550,7 @@ modest_msg_edit_window_attach_file_noninteractive ( gtk_widget_show_all (priv->attachments_caption); } else if (file_id == -1) { close (file_id); + g_warning("file to be attached does not exist: %s", filename); } } } diff --git a/tests/dbus_api/test_compose_mail.c b/tests/dbus_api/test_compose_mail.c index ac6af70..bcda820 100644 --- a/tests/dbus_api/test_compose_mail.c +++ b/tests/dbus_api/test_compose_mail.c @@ -17,13 +17,12 @@ int main(int argc, char *argv[]) } /* Call the function in libmodest-dbus-client: */ - /* TODO: The Message URI system is not yet implemented. */ - attachments = g_slist_append(attachments, "/home/m/MyDocs/bar1.txt,/home/m/MyDocs/foo.txt"); + attachments = g_slist_append(attachments, "/usr/include/math.h,/usr/include/malloc.h"); const gboolean ret = libmodest_dbus_client_compose_mail ( osso_context, - "marcusb@openismus.com", /* to */ + "modesttest@openismus.com", /* to */ "cc test", /* cc */ "bcc test", /* bcc */ "test subject", /* subject */