From: SooChan Lim Date: Sat, 20 Jun 2015 06:48:31 +0000 (+0900) Subject: replace the deprecated type and functions X-Git-Tag: submit/tizen/20150629.072152~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F42428%2F1;p=platform%2Fcore%2Fuifw%2Flibeom.git replace the deprecated type and functions Change-Id: I328d2b19129354c68430ab19838ee43d36b12176 --- diff --git a/src/dbus/eom-dbus.c b/src/dbus/eom-dbus.c index 1b5afd9..f5dc38a 100755 --- a/src/dbus/eom-dbus.c +++ b/src/dbus/eom-dbus.c @@ -86,24 +86,26 @@ _eom_dbus_need_private_conn(void) } static int -_eom_dbus_convert_gvalue_to_message(GValueArray *array, DBusMessage *msg) +_eom_dbus_convert_gvalue_to_message(GArray *array, DBusMessage *msg) { DBusMessageIter iter; + GValue *v = NULL; + GType type; int i; if (!array) return 1; - if (array->n_values <= 0) + if (array->len <= 0) return 1; dbus_message_iter_init_append(msg, &iter); - INFO("[EOM_CLIENT:%s] n_values(%d)", client_info.name, array->n_values); + INFO("[EOM_CLIENT:%s] len(%d)", client_info.name, array->len); - for (i = 0; i < array->n_values; i++) { - GValue *v = g_value_array_get_nth(array, i); - GType type = v->g_type; + for (i = 0; i < array->len; i++) { + v = &g_array_index(array, GValue, i); + type = v->g_type; INFO("[EOM_CLIENT:%s] type(%d)", client_info.name, (int)type); @@ -164,16 +166,16 @@ _eom_dbus_convert_gvalue_to_message(GValueArray *array, DBusMessage *msg) return 1; } -static GValueArray* +static GArray* _eom_dbus_convert_message_to_gvalue(DBusMessage *msg) { - GValueArray *array; + GArray *array; DBusMessageIter iter; if (!dbus_message_iter_init(msg, &iter)) return NULL; - array = g_value_array_new(0); + array = g_array_new(FALSE, FALSE, sizeof(GValue)); do { int type = dbus_message_iter_get_arg_type(&iter); @@ -188,7 +190,7 @@ _eom_dbus_convert_message_to_gvalue(DBusMessage *msg) dbus_message_iter_get_basic(&iter, &integer); g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, integer); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); } break; @@ -198,7 +200,7 @@ _eom_dbus_convert_message_to_gvalue(DBusMessage *msg) dbus_message_iter_get_basic(&iter, &uinteger); g_value_init(&v, G_TYPE_UINT); g_value_set_uint(&v, uinteger); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); } break; @@ -208,13 +210,13 @@ _eom_dbus_convert_message_to_gvalue(DBusMessage *msg) dbus_message_iter_get_basic(&iter, &string); g_value_init(&v, G_TYPE_STRING); g_value_set_string(&v, string); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); } break; default: NEVER_GET_HERE(); - g_value_array_free(array); + g_array_free(array, FALSE); return NULL; } } while (dbus_message_iter_has_next(&iter) && dbus_message_iter_next(&iter)); @@ -239,13 +241,13 @@ _eom_dbus_client_process_message(EomDBusClientInfo *info, DBusMessage *msg) EomDBusClientMethod *method = *prev; if (!strcmp(dbus_message_get_member(msg), method->name)) { - GValueArray *array = _eom_dbus_convert_message_to_gvalue(msg); + GArray *array = _eom_dbus_convert_message_to_gvalue(msg); if (method->func) method->func(method->data, array); if (array) - g_value_array_free(array); + g_array_free(array, FALSE); dbus_error_free(&err); @@ -521,12 +523,12 @@ eom_dbus_client_deinit(GList *cb_info_list) dbus_initialized = false; } -GValueArray* -eom_dbus_client_send_message(char *method, GValueArray *array) +GArray* +eom_dbus_client_send_message(char *method, GArray *array) { DBusMessage *msg = NULL; DBusMessage *reply_msg = NULL; - GValueArray *ret_array = NULL; + GArray *ret_array = NULL; DBusError err; RETV_IF_FAIL(client_info.conn != NULL, NULL); @@ -571,10 +573,10 @@ err_send: } -GValueArray * +GArray * eom_dbus_client_get_output_ids(void) { - GValueArray *array = NULL; + GArray *array = NULL; array = eom_dbus_client_send_message("GetOutputIDs", NULL); RETV_IF_FAIL(array != NULL, NULL); @@ -582,36 +584,36 @@ eom_dbus_client_get_output_ids(void) return array; } -GValueArray * +GArray * eom_dbus_client_get_output_info(eom_output_id output_id) { - GValueArray *array = NULL; - GValueArray *msg_array; + GArray *array = NULL; + GArray *msg_array; GValue v = G_VALUE_INIT; - msg_array = g_value_array_new(0); + msg_array = g_array_new(FALSE, FALSE, sizeof(GValue)); g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, output_id); - msg_array = g_value_array_append(msg_array, &v); + msg_array = g_array_append_val(msg_array, v); array = eom_dbus_client_send_message("GetOutputInfo", msg_array); GOTO_IF_FAIL(array != NULL, fail); - g_value_array_free(msg_array); + g_array_free(msg_array, FALSE); return array; fail: - g_value_array_free(msg_array); + g_array_free(msg_array, FALSE); return NULL; } -GValueArray * +GArray * eom_dbus_client_set_attribute(eom_output_id output_id, eom_output_attribute_e attr) { - GValueArray *array = NULL; - GValueArray *msg_array; + GArray *array = NULL; + GArray *msg_array; GValue v = G_VALUE_INIT; int pid = 0; @@ -619,34 +621,34 @@ eom_dbus_client_set_attribute(eom_output_id output_id, eom_output_attribute_e at INFO("output_id: %d, pid: %d, attr: %d\n", output_id, pid, attr); - msg_array = g_value_array_new(0); + msg_array = g_array_new(FALSE, FALSE, sizeof(GValue)); /* 0:output_id, 1:pid, 2:eom_attribuete_e */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, output_id); - msg_array = g_value_array_append(msg_array, &v); + msg_array = g_array_append_val(msg_array, v); g_value_set_int(&v, pid); - msg_array = g_value_array_append(msg_array, &v); + msg_array = g_array_append_val(msg_array, v); g_value_set_int(&v, attr); - msg_array = g_value_array_append(msg_array, &v); + msg_array = g_array_append_val(msg_array, v); array = eom_dbus_client_send_message("SetOutputAttribute", msg_array); GOTO_IF_FAIL(array != NULL, fail); - g_value_array_free(msg_array); + g_array_free(msg_array, FALSE); return array; fail: - g_value_array_free(msg_array); + g_array_free(msg_array, FALSE); return NULL; } -GValueArray * +GArray * eom_dbus_client_set_window(eom_output_id output_id, Evas_Object *win) { - GValueArray *array = NULL; - GValueArray *msg_array; + GArray *array = NULL; + GArray *msg_array; GValue v = G_VALUE_INIT; int pid = 0; Ecore_X_Window xwin; @@ -657,23 +659,23 @@ eom_dbus_client_set_window(eom_output_id output_id, Evas_Object *win) INFO("output_id: %d, pid: %d, xwin: %d\n", output_id, pid, xwin); - msg_array = g_value_array_new(0); + msg_array = g_array_new(FALSE, FALSE, sizeof(GValue)); /* 0:output_id, 1:pid, 2:eom_attribuete_e */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, output_id); - msg_array = g_value_array_append(msg_array, &v); + msg_array = g_array_append_val(msg_array, v); g_value_set_int(&v, pid); - msg_array = g_value_array_append(msg_array, &v); + msg_array = g_array_append_val(msg_array, v); g_value_set_int(&v, xwin); - msg_array = g_value_array_append(msg_array, &v); + msg_array = g_array_append_val(msg_array, v); array = eom_dbus_client_send_message("SetWindow", msg_array); RETV_IF_FAIL(array != NULL, NULL); - g_value_array_free(msg_array); + g_array_free(msg_array, FALSE); - ret = g_value_get_int(g_value_array_get_nth(array, 0)); + ret = g_value_get_int(&g_array_index(array, GValue, 0)); GOTO_IF_FAIL(ret != 0, fail); #ifdef HAVE_TIZEN_2_X @@ -684,7 +686,7 @@ eom_dbus_client_set_window(eom_output_id output_id, Evas_Object *win) return array; fail: - g_value_array_free(msg_array); + g_array_free(msg_array, FALSE); return NULL; } diff --git a/src/dbus/eom-dbus.h b/src/dbus/eom-dbus.h index 083d7a8..6f4697c 100755 --- a/src/dbus/eom-dbus.h +++ b/src/dbus/eom-dbus.h @@ -43,11 +43,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. bool eom_dbus_client_init(notify_func func); void eom_dbus_client_deinit(GList *cb_info_list); -GValueArray *eom_dbus_client_get_output_ids(void); -GValueArray *eom_dbus_client_get_output_info(eom_output_id output_id); -GValueArray *eom_dbus_client_set_attribute(eom_output_id output_id, eom_output_attribute_e attry); -GValueArray *eom_dbus_client_set_window(eom_output_id output_id, Evas_Object *win); +GArray *eom_dbus_client_get_output_ids(void); +GArray *eom_dbus_client_get_output_info(eom_output_id output_id); +GArray *eom_dbus_client_set_attribute(eom_output_id output_id, eom_output_attribute_e attry); +GArray *eom_dbus_client_set_window(eom_output_id output_id, Evas_Object *win); -GValueArray *eom_dbus_client_send_message(char *method, GValueArray *array); +GArray *eom_dbus_client_send_message(char *method, GArray *array); #endif /* __EOM_DBUS_H__ */ diff --git a/src/eom-private.h b/src/eom-private.h index a8465fb..64cae84 100755 --- a/src/eom-private.h +++ b/src/eom-private.h @@ -50,7 +50,7 @@ typedef struct { } eom_output_info; /* notify callback function prototype */ -typedef void (*notify_func) (void *data, GValueArray *array); +typedef void (*notify_func) (void *data, GArray *array); void _eom_mutex_lock(void); void _eom_mutex_unlock(void); diff --git a/src/eom.c b/src/eom.c index 1d6d903..f628d83 100755 --- a/src/eom.c +++ b/src/eom.c @@ -101,7 +101,7 @@ static pthread_mutex_t eom_lock; static GList *cb_info_list; static GList *output_info_list; -static void _eom_output_process_notify_cb(void *data, GValueArray *array); +static void _eom_output_process_notify_cb(void *data, GArray *array); static eom_output_info *_eom_find_output_info(eom_output_id output_id); static eom_output_info *_eom_alloc_output_info(int output_id, int output_type); static const char* @@ -299,7 +299,7 @@ _eom_output_call_notify_cb(eom_output_notify_s *notify) } static void -_eom_output_process_notify_cb(void *data, GValueArray *array) +_eom_output_process_notify_cb(void *data, GArray *array) { eom_output_notify_s notify; eom_output_info *output_info; @@ -307,30 +307,30 @@ _eom_output_process_notify_cb(void *data, GValueArray *array) GValue *v; RET_IF_FAIL(array != NULL); - RET_IF_FAIL(array->n_values == 11); + RET_IF_FAIL(array->len == 11); /* 11 args 0: notify_type 1:output_id, 2:output_type, 3:output_mode, 4:w, 5:h, 6:w_mm, 7:h_mm, 8:pid, 9:attri, 10:state */ - v = g_value_array_get_nth(array, 0); + v = &g_array_index(array, GValue, 0); notify_type = g_value_get_int(v); - v = g_value_array_get_nth(array, 1); + v = &g_array_index(array, GValue, 1); output_id = g_value_get_int(v); - v = g_value_array_get_nth(array, 2); + v = &g_array_index(array, GValue, 2); output_type = g_value_get_int(v); - v = g_value_array_get_nth(array, 3); + v = &g_array_index(array, GValue, 3); output_mode = g_value_get_int(v); - v = g_value_array_get_nth(array, 4); + v = &g_array_index(array, GValue, 4); w = g_value_get_int(v); - v = g_value_array_get_nth(array, 5); + v = &g_array_index(array, GValue, 5); h = g_value_get_int(v); - v = g_value_array_get_nth(array, 6); + v = &g_array_index(array, GValue, 6); w_mm = g_value_get_int(v); - v = g_value_array_get_nth(array, 7); + v = &g_array_index(array, GValue, 7); h_mm = g_value_get_int(v); - v = g_value_array_get_nth(array, 8); + v = &g_array_index(array, GValue, 8); pid = g_value_get_int(v); - v = g_value_array_get_nth(array, 9); + v = &g_array_index(array, GValue, 9); attr = g_value_get_int(v); - v = g_value_array_get_nth(array, 10); + v = &g_array_index(array, GValue, 10); state = g_value_get_int(v); INFO("notify: %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", @@ -527,7 +527,7 @@ eom_deinit(void) API eom_output_id* eom_get_eom_output_ids(int *count) { - GValueArray *ret_array = NULL; + GArray *ret_array = NULL; eom_output_id *output_ids = NULL; int i; @@ -550,25 +550,25 @@ eom_get_eom_output_ids(int *count) return NULL; } - if (ret_array->n_values == 0) { - g_value_array_free(ret_array); + if (ret_array->len == 0) { + g_array_free(ret_array, FALSE); *count = 0; _eom_mutex_unlock(); set_last_result(EOM_ERROR_NONE); return NULL; } - output_ids = calloc(ret_array->n_values, sizeof(eom_output_id)); + output_ids = calloc(ret_array->len, sizeof(eom_output_id)); GOTO_IF_FAIL(output_ids != NULL, fail); - *count = ret_array->n_values; - for (i = 0; i < ret_array->n_values; i++) { - GValue *v = g_value_array_get_nth(ret_array, i); + *count = ret_array->len; + for (i = 0; i < ret_array->len; i++) { + GValue *v = &g_array_index(ret_array, GValue, i); output_ids[i] = g_value_get_int(v); INFO("output_ids: %d", output_ids[i]); } - g_value_array_free(ret_array); + g_array_free(ret_array, FALSE); ret_array = NULL; /* TODO: redesign the life-cycle of output_infos */ @@ -588,19 +588,19 @@ eom_get_eom_output_ids(int *count) #endif if (ret_array) { /* 0:output_id, 1:output_type, 2:output_mode, 3:w, 4:h, 5:w_mm, 6:h_mm */ - output_info = _eom_alloc_output_info(g_value_get_int(g_value_array_get_nth(ret_array, 0)), - g_value_get_int(g_value_array_get_nth(ret_array, 1))); + output_info = _eom_alloc_output_info(g_value_get_int(&g_array_index(ret_array, GValue, 0)), + g_value_get_int(&g_array_index(ret_array, GValue, 1))); if (output_info) { output_info_list = g_list_append(output_info_list, output_info); - _eom_set_output_info_mode(output_info, g_value_get_int(g_value_array_get_nth(ret_array, 2))); - _eom_set_output_info_size(output_info, g_value_get_int(g_value_array_get_nth(ret_array, 3)), - g_value_get_int(g_value_array_get_nth(ret_array, 4))); - _eom_set_output_info_phy_size(output_info, g_value_get_int(g_value_array_get_nth(ret_array, 5)), - g_value_get_int(g_value_array_get_nth(ret_array, 6))); + _eom_set_output_info_mode(output_info, g_value_get_int(&g_array_index(ret_array, GValue, 2))); + _eom_set_output_info_size(output_info, g_value_get_int(&g_array_index(ret_array, GValue, 3)), + g_value_get_int(&g_array_index(ret_array, GValue, 4))); + _eom_set_output_info_phy_size(output_info, g_value_get_int(&g_array_index(ret_array, GValue, 5)), + g_value_get_int(&g_array_index(ret_array, GValue, 6))); INFO("GetOutputInfo: %s(%d)", TYPE(output_info->type), output_info->id); } - g_value_array_free(ret_array); + g_array_free(ret_array, FALSE); ret_array = NULL; } else ERR("fail: get id(%d)'s information", output_id); @@ -614,7 +614,7 @@ eom_get_eom_output_ids(int *count) fail: if (ret_array) - g_value_array_free(ret_array); + g_array_free(ret_array, FALSE); *count = 0; @@ -894,7 +894,7 @@ eom_set_output_attribute(eom_output_id output_id, eom_output_attribute_e attr) { eom_output_info *output_info = NULL; bool ret = false; - GValueArray *ret_array; + GArray *ret_array; RETV_IF_FAIL(output_id != 0, EOM_ERROR_INVALID_PARAMETER); RETV_IF_FAIL(attr > EOM_OUTPUT_ATTRIBUTE_NONE, EOM_ERROR_INVALID_PARAMETER); @@ -921,9 +921,9 @@ eom_set_output_attribute(eom_output_id output_id, eom_output_attribute_e attr) return EOM_ERROR_MESSAGE_SENDING_FAILURE; } - ret = g_value_get_int (g_value_array_get_nth(ret_array, 0)); + ret = g_value_get_int(&g_array_index(ret_array, GValue, 0)); - g_value_array_free(ret_array); + g_array_free(ret_array, FALSE); INFO("SetOutputAttribute: %s", (ret) ? "success" : "failed"); @@ -1096,7 +1096,7 @@ eom_set_output_window(eom_output_id output_id, Evas_Object *win) { eom_output_info *output_info = NULL; bool ret = false; - GValueArray *ret_array; + GArray *ret_array; RETV_IF_FAIL(output_id != 0, EOM_ERROR_INVALID_PARAMETER); RETV_IF_FAIL(win != NULL, EOM_ERROR_INVALID_PARAMETER); @@ -1122,8 +1122,8 @@ eom_set_output_window(eom_output_id output_id, Evas_Object *win) return EOM_ERROR_MESSAGE_SENDING_FAILURE; } - ret = g_value_get_int(g_value_array_get_nth(ret_array, 0)); - g_value_array_free(ret_array); + ret = g_value_get_int(&g_array_index(ret_array, GValue, 0)); + g_array_free(ret_array, FALSE); if (ret == 0) { ERR("SetWindow: failed\n"); _eom_mutex_unlock(); diff --git a/src/wayland/eom-wayland.c b/src/wayland/eom-wayland.c index 2fe1804..ad0aaa0 100755 --- a/src/wayland/eom-wayland.c +++ b/src/wayland/eom-wayland.c @@ -260,83 +260,83 @@ _convert_to_wl_eom_attribute(eom_output_attribute_e attr) static void _eom_wayland_client_call_notify(EomWaylandOutput *eom_wl_output, eom_output_notify_type_e type) { - GValueArray *array = NULL; + GArray *array = NULL; GValue v = G_VALUE_INIT; - array = g_value_array_new(0); + array = g_array_new(FALSE, FALSE, sizeof(GValue)); /* 11 args 0: notify_type 1:output_id, 2:output_type, 3:output_mode, 4:w, 5:h, 6:w_mm, 7:h_mm, 8:pid, 9:attri, 10:state */ /* 0: notify_type */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, type); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 1:output_id */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->id); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 2:output_type */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, _convert_to_eom_output_type(eom_wl_output->eom_type)); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 3:output_mode */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, _convert_to_eom_output_mode(eom_wl_output->eom_mode)); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 4:w */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->width); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 5:h */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->height); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 6:w_mm */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->physical_width); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 7:h_mm */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->physical_height); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 8:pid */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->physical_width); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 9:attri */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, _convert_to_eom_output_attribute(eom_wl_output->eom_attribute)); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 10:state */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, _convert_to_eom_output_attribute_state(eom_wl_output->eom_attribute_state)); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); if (eom_wl_output->client_info->func) eom_wl_output->client_info->func(NULL, array); if (array) - g_value_array_free(array); + g_array_free(array, FALSE); } @@ -692,10 +692,10 @@ eom_wayland_client_deinit(GList *cb_info_list) memset(&wl_client_info, 0x0, sizeof(EomWaylandClientInfo)); } -GValueArray * +GArray * eom_wayland_client_get_output_ids(void) { - GValueArray *array = NULL; + GArray *array = NULL; GValue v = G_VALUE_INIT; EomWaylandOutput *eom_wl_output = NULL; EomWaylandOutput *tmp = NULL; @@ -705,14 +705,14 @@ eom_wayland_client_get_output_ids(void) return NULL; } - array = g_value_array_new(0); + array = g_array_new(FALSE, FALSE, sizeof(GValue)); /* remove all eom_wl_outputs */ wl_list_for_each_safe(eom_wl_output, tmp, &wl_client_info.eom_wl_output_list, link) { if (eom_wl_output->output) { g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->id); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); } } @@ -721,69 +721,69 @@ eom_wayland_client_get_output_ids(void) return array; } -GValueArray * +GArray * eom_wayland_client_get_output_info(eom_output_id output_id) { - GValueArray *array = NULL; + GArray *array = NULL; GValue v = G_VALUE_INIT; EomWaylandOutput *eom_wl_output = NULL; eom_wl_output = _eom_wayland_client_find_output_from_eom_output(&wl_client_info.eom_wl_output_list, output_id); RETV_IF_FAIL(eom_wl_output != NULL, NULL); - array = g_value_array_new(0); + array = g_array_new(FALSE, FALSE, sizeof(GValue)); /* 0:output_id, 1:output_type, 2:output_mode, 3:w, 4:h, 5:w_mm, 6:h_mm */ /* 0:output_id */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->id); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 1:output_type */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->eom_type); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 2:output_mode */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->eom_mode); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 3:w */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->width); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 4:h */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->height); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 5:w_mm */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->physical_width); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* 6:h_mm */ g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, eom_wl_output->physical_height); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* returned array will be freed by caller */ return array; } -GValueArray * +GArray * eom_wayland_client_set_attribute(eom_output_id output_id, eom_output_attribute_e attr) { - GValueArray *array = NULL; + GArray *array = NULL; GValue v = G_VALUE_INIT; EomWaylandOutput *eom_wl_output = NULL; int ret = 0; @@ -799,10 +799,10 @@ eom_wayland_client_set_attribute(eom_output_id output_id, eom_output_attribute_e ret = 1; - array = g_value_array_new(0); + array = g_array_new(FALSE, FALSE, sizeof(GValue)); g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, ret); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* returned array will be freed by caller */ @@ -812,10 +812,10 @@ fail: return NULL; } -GValueArray * +GArray * eom_wayland_client_set_window(eom_output_id output_id, Evas_Object *win) { - GValueArray *array = NULL; + GArray *array = NULL; GValue v = G_VALUE_INIT; Ecore_Wl_Window *e_wl_win = NULL; EomWaylandOutput *eom_wl_output = NULL; @@ -847,10 +847,10 @@ eom_wayland_client_set_window(eom_output_id output_id, Evas_Object *win) ret = 1; - array = g_value_array_new(0); + array = g_array_new(FALSE, FALSE, sizeof(GValue)); g_value_init(&v, G_TYPE_INT); g_value_set_int(&v, ret); - array = g_value_array_append(array, &v); + array = g_array_append_val(array, v); g_value_unset(&v); /* returned array will be freed by caller */ diff --git a/src/wayland/eom-wayland.h b/src/wayland/eom-wayland.h index 6ce7403..1c3d617 100755 --- a/src/wayland/eom-wayland.h +++ b/src/wayland/eom-wayland.h @@ -41,10 +41,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. bool eom_wayland_client_init(notify_func func); void eom_wayland_client_deinit(GList *cb_info_list); -GValueArray *eom_wayland_client_get_output_ids(void); -GValueArray *eom_wayland_client_get_output_info(eom_output_id output_id); -GValueArray *eom_wayland_client_set_attribute(eom_output_id output_id, eom_output_attribute_e attry); -GValueArray *eom_wayland_client_set_window(eom_output_id output_id, Evas_Object *win); +GArray *eom_wayland_client_get_output_ids(void); +GArray *eom_wayland_client_get_output_info(eom_output_id output_id); +GArray *eom_wayland_client_set_attribute(eom_output_id output_id, eom_output_attribute_e attry); +GArray *eom_wayland_client_set_window(eom_output_id output_id, Evas_Object *win); #endif /* __EOM_WAYLAND_H__ */