Commit 6f7faf9d authored by Tim Janik's avatar Tim Janik
Browse files

gtk_object_query_args() now returns the args in the corret order.

-timj
parent 3942cb76
......@@ -52,6 +52,7 @@ struct _GtkArgInfo
GtkType type;
GtkType class_type;
guint arg_id;
guint seq_id;
};
......@@ -464,28 +465,33 @@ gtk_object_query_args (GtkType class_type,
if (query_data.arg_list)
{
register GList *list;
register guint i;
register guint len;
list = query_data.arg_list;
i = g_list_length (list);
args = g_new0 (GtkArg, i);
*nargs = i;
len = 1;
while (list->next)
{
len++;
list = list->next;
}
g_assert (len == ((GtkObjectClass*) gtk_type_class (class_type))->n_args); /* paranoid */
args = g_new0 (GtkArg, len);
*nargs = len;
do
{
GtkArgInfo *info;
i--;
info = list->data;
list = list->next;
list = list->prev;
args[i].type = info->type;
args[i].name = info->name;
}
while (i > 0);
g_assert (info->seq_id > 0 && info->seq_id <= len); /* paranoid */
g_assert (list == NULL); /* paranoid */
args[info->seq_id - 1].type = info->type;
args[info->seq_id - 1].name = info->name;
}
while (list);
g_list_free (query_data.arg_list);
}
......@@ -634,6 +640,8 @@ gtk_object_add_arg_type (const char *arg_name,
info->type = arg_type;
info->class_type = class_type;
info->arg_id = arg_id;
info->seq_id = ++((GtkObjectClass*) gtk_type_class (class_type))->n_args;
printf ("arg seq id: %d for %s\n", info->seq_id, info->name);
if (!arg_info_ht)
arg_info_ht = g_hash_table_new (g_str_hash, g_str_equal);
......
......@@ -356,6 +356,7 @@ gtk_type_class_init (GtkTypeNode *node)
object_class = node->klass;
object_class->type = node->type;
object_class->n_args = 0;
if (node->type_info.class_init_func)
(* node->type_info.class_init_func) (node->klass);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment