From 74f98253848a3f5a28a444d2357788ffa46aaa87 Mon Sep 17 00:00:00 2001 From: Junghwan Song Date: Tue, 28 Aug 2012 15:52:54 +0900 Subject: [PATCH] sync with private git --- packaging/tel-plugin-dbus_tapi.spec | 2 +- src/call.c | 2 +- src/desc-dbus.c | 14 ++++++++++++++ src/sat.c | 6 +++--- src/sat_manager.c | 9 ++------- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec index bcbe659..42614c3 100644 --- a/packaging/tel-plugin-dbus_tapi.spec +++ b/packaging/tel-plugin-dbus_tapi.spec @@ -1,6 +1,6 @@ Name: tel-plugin-dbus_tapi Summary: dbus-tapi plugin for telephony -Version: 0.1.45 +Version: 0.1.49 Release: 1 Group: System/Libraries License: Apache diff --git a/src/call.c b/src/call.c index 68b474f..4187dc7 100644 --- a/src/call.c +++ b/src/call.c @@ -767,7 +767,7 @@ static gboolean on_call_set_sound_equalization(TelephonyCall *call, GDBusMethodI req.mode = (gboolean)eq_mode; req.direction = (enum telephony_call_sound_direction)eq_direction; - memcpy( (char*)req.parameter, (const char*)eq_parameter, (MAX_SOUND_EQ_PARAMETER_SIZE*2) ); + memcpy( (char*)req.parameter, (const char*)eq_parameter, (MAX_CALL_EQ_PARAMETER_SIZE*2) ); tcore_user_request_set_data( ur, sizeof( struct treq_call_sound_set_equalization ), &req ); tcore_user_request_set_command( ur, TREQ_CALL_SET_SOUND_EQUALIZATION ); diff --git a/src/desc-dbus.c b/src/desc-dbus.c index be9f100..2dcb31a 100644 --- a/src/desc-dbus.c +++ b/src/desc-dbus.c @@ -370,6 +370,9 @@ on_manager_getmodems (TelephonyManager *mgr, static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer user_data) { + gboolean rv = FALSE; + gpointer handle = NULL; + static Storage *strg; struct custom_data *ctx = user_data; TelephonyManager *mgr; @@ -387,6 +390,17 @@ static void on_bus_acquired(GDBusConnection *conn, const gchar *name, gpointer u g_dbus_interface_skeleton_export(G_DBUS_INTERFACE_SKELETON(mgr), conn, MY_DBUS_PATH, NULL); g_dbus_object_manager_server_set_connection (ctx->manager, conn); + + //set telephony ready registry + strg = tcore_server_find_storage(ctx->server, "vconf"); + handle = tcore_storage_create_handle(strg, "vconf"); + + rv = tcore_storage_set_bool(strg, STORAGE_KEY_TELEPHONY_READY, TRUE); + if(!rv){ + dbg("fail to set the telephony status to registry"); + } + + dbg("done to acquire the dbus"); } struct tcore_communitor_operations ops = { diff --git a/src/sat.c b/src/sat.c index 8c9b37f..02b6ed3 100644 --- a/src/sat.c +++ b/src/sat.c @@ -334,7 +334,7 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, const char *plugi gchar *title; gint command_id, menu_cnt; gboolean b_present, b_helpinfo, b_updated; - GVariant *items, *icon, *icon_list; + GVariant *items; menu_info = sat_manager_caching_setup_menu_info(ctx, plugin_name, (struct tel_sat_setup_menu_tlv*) &p_ind->proactive_ind_data.setup_menu); ctx->cached_sat_main_menu = menu_info; @@ -346,8 +346,8 @@ gboolean dbus_plugin_sat_notification(struct custom_data *ctx, const char *plugi } dbg("menu_info type_format(%s)", g_variant_get_type_string(menu_info)); - g_variant_get(menu_info, "(ibs@vibb@v@v)", &command_id, &b_present, &title, &items, - &menu_cnt, &b_helpinfo, &b_updated, &icon, &icon_list); + g_variant_get(menu_info, "(ibs@vibb)", &command_id, &b_present, &title, &items, + &menu_cnt, &b_helpinfo, &b_updated); rv = sat_ui_support_create_desktop_file(title); rv = TRUE; diff --git a/src/sat_manager.c b/src/sat_manager.c index 9459104..12b607c 100755 --- a/src/sat_manager.c +++ b/src/sat_manager.c @@ -206,8 +206,6 @@ GVariant* sat_manager_caching_setup_menu_info(struct custom_data *ctx, const cha gchar main_title[SAT_ALPHA_ID_LEN_MAX]; GVariantBuilder *v_builder = NULL; GVariant *menu_items = NULL; - GVariant *icon_id = NULL; - GVariant *icon_list = NULL; dbg("interpreting setup menu notification"); memset(&main_title, 0 , SAT_ALPHA_ID_LEN_MAX); @@ -366,11 +364,8 @@ GVariant* sat_manager_caching_setup_menu_info(struct custom_data *ctx, const cha sat_manager_enqueue_cmd(ctx, &q_data); command_id = q_data.cmd_id; - icon_id = g_variant_new_variant(menu_items); - icon_list = g_variant_new_variant(menu_items); - - setup_menu_info = g_variant_new("(ibsvibbvv)", command_id, menu_present, main_title, menu_items, - menu_cnt, help_info, updated, icon_id, icon_list); + setup_menu_info = g_variant_new("(ibsvibb)", command_id, menu_present, main_title, menu_items, + menu_cnt, help_info, updated); return setup_menu_info; } -- 2.7.4