diff options
Diffstat (limited to 'email-ipc/email-activation/email-dbus-activation.c')
| -rwxr-xr-x | email-ipc/email-activation/email-dbus-activation.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/email-ipc/email-activation/email-dbus-activation.c b/email-ipc/email-activation/email-dbus-activation.c index e13b5f9..83569a5 100755 --- a/email-ipc/email-activation/email-dbus-activation.c +++ b/email-ipc/email-activation/email-dbus-activation.c @@ -49,11 +49,13 @@ EXPORT_API const gchar introspection_xml[] = " </method>" " <method name='GetDisplayName'>" " <arg type='s' name='email_address' direction='in' />" +" <arg type='s' name='multi_user_name' direction='in' />" " <arg type='s' name='contact_display_name' direction='out' />" " <arg type='i' name='ret' direction='out' />" " </method>" " <method name='CheckBlockingMode'>" " <arg type='s' name='sender_address' direction='in' />" +" <arg type='s' name='multi_user_name' direction='in' />" " <arg type='i' name='blocking_mode' direction='out' />" " <arg type='i' name='ret' direction='out' />" " </method>" @@ -127,7 +129,7 @@ EXPORT_API int emipc_launch_email_service() goto FINISH_OFF; } - g_variant_get (result, "(&d)", &ret); + g_variant_get (result, "(i)", &ret); FINISH_OFF: EM_DEBUG_LOG ("ret [%d]\n", ret); @@ -150,18 +152,19 @@ void cancellable_connect_cb () EXPORT_API GCancellable *cancel = NULL; - GVariant* em_gdbus_get_display_name (GVariant *parameters) { - char *email_address = NULL; - char *contact_display_name = NULL; - g_variant_get (parameters, "(s)", &email_address); + char *email_address = NULL; + char *multi_user_name = NULL; + char *contact_display_name = NULL; + + g_variant_get (parameters, "(ss)", &email_address, &multi_user_name); /* replace "" to NULL */ if (!g_strcmp0(email_address,"")) EM_SAFE_FREE (email_address); - int err = emcore_get_mail_display_name_internal (email_address, &contact_display_name); + int err = emcore_get_mail_display_name_internal (multi_user_name, email_address, &contact_display_name); /* make return_val */ if (!contact_display_name) { @@ -179,16 +182,19 @@ GVariant* em_gdbus_get_display_name (GVariant *parameters) GVariant* em_gdbus_check_blocking_mode (GVariant *parameters) { char *sender_address = NULL; + char *multi_user_name = NULL; int blocking_mode = 0; - g_variant_get (parameters, "(s)", &sender_address); - int err = emcore_check_blocking_mode_internal (sender_address, &blocking_mode); + g_variant_get (parameters, "(ss)", &sender_address, &multi_user_name); + + int err = emcore_check_blocking_mode_internal (multi_user_name, sender_address, &blocking_mode); /* make return_val */ GVariant* ret = g_variant_new ("(ii)", blocking_mode, err); /* clean-up string */ EM_SAFE_FREE (sender_address); + EM_SAFE_FREE (multi_user_name); return ret; } |