Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
GNOME
gtk
Commits
96b37f4e
Commit
96b37f4e
authored
Aug 29, 2019
by
Alexander Larsson
Committed by
Matthias Clasen
Sep 10, 2019
Browse files
Use the new GtkBuildableParser type in GtkBuildable interfaces
parent
135cea76
Changes
25
Hide whitespace changes
Inline
Side-by-side
gtk/gtkassistant.c
View file @
96b37f4e
...
...
@@ -178,47 +178,47 @@ static void gtk_assistant_page_get_property (GObject *object,
GValue
*
value
,
GParamSpec
*
pspec
);
static
void
gtk_assistant_buildable_interface_init
(
GtkBuildableIface
*
iface
);
static
void
gtk_assistant_buildable_add_child
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
char
*
type
);
static
gboolean
gtk_assistant_buildable_custom_tag_start
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
GMarkup
Parser
*
parser
,
gpointer
*
data
);
static
void
gtk_assistant_buildable_custom_finished
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
gpointer
user_data
);
static
GList
*
find_page
(
GtkAssistant
*
assistant
,
GtkWidget
*
page
);
static
void
on_assistant_close
(
Gtk
Widget
*
widget
,
GtkA
ssistant
*
assistant
);
static
void
on_assistant_apply
(
Gtk
Widget
*
widget
,
GtkA
ssistant
*
assistant
);
static
void
on_assistant_forward
(
Gtk
Widget
*
widget
,
GtkA
ssistant
*
assistant
);
static
void
on_assistant_back
(
Gtk
Widget
*
widget
,
GtkA
ssistant
*
assistant
);
static
void
on_assistant_cancel
(
Gtk
Widget
*
widget
,
GtkA
ssistant
*
assistant
);
static
void
on_assistant_last
(
Gtk
Widget
*
widget
,
GtkA
ssistant
*
assistant
);
static
void
assistant_remove_page_cb
(
GtkContainer
*
container
,
GtkWidget
*
page
,
GtkAssistant
*
assistant
);
static
int
gtk_assistant_add_page
(
GtkAssistant
*
assistant
,
GtkAssistantPage
*
page_info
,
gint
position
);
GType
_gtk_assistant_accessible_get_type
(
void
);
static
void
gtk_assistant_buildable_interface_init
(
GtkBuildableIface
*
iface
);
static
void
gtk_assistant_buildable_add_child
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
char
*
type
);
static
gboolean
gtk_assistant_buildable_custom_tag_start
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
GtkBuildable
Parser
*
parser
,
gpointer
*
data
);
static
void
gtk_assistant_buildable_custom_finished
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
gpointer
user_data
);
static
GList
*
find_page
(
GtkAssistant
*
assistant
,
GtkWidget
*
page
);
static
void
on_assistant_close
(
GtkWidget
*
widget
,
Gtk
Assistant
*
assistant
);
static
void
on_a
ssistant
_apply
(
GtkWidget
*
widget
,
Gtk
Assistant
*
assistant
);
static
void
on_a
ssistant
_forward
(
GtkWidget
*
widget
,
Gtk
Assistant
*
assistant
);
static
void
on_a
ssistant
_back
(
GtkWidget
*
widget
,
Gtk
Assistant
*
assistant
);
static
void
on_a
ssistant
_cancel
(
GtkWidget
*
widget
,
Gtk
Assistant
*
assistant
);
static
void
on_a
ssistant
_last
(
GtkWidget
*
widget
,
Gtk
Assistant
*
assistant
);
static
void
a
ssistant
_remove_page_cb
(
GtkContainer
*
container
,
GtkWidget
*
page
,
GtkAssistant
*
assistant
);
static
int
gtk_assistant_add_page
(
GtkAssistant
*
assistant
,
GtkAssistantPage
*
page_info
,
gint
position
);
GType
_gtk_assistant_accessible_get_type
(
void
);
enum
{
...
...
@@ -2355,7 +2355,7 @@ gtk_assistant_buildable_custom_tag_start (GtkBuildable *buildable,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
G
Markup
Parser
*
parser
,
G
tkBuildable
Parser
*
parser
,
gpointer
*
data
)
{
return
parent_buildable_iface
->
custom_tag_start
(
buildable
,
builder
,
child
,
...
...
gtk/gtkbuildable.c
View file @
96b37f4e
...
...
@@ -230,12 +230,12 @@ gtk_buildable_construct_child (GtkBuildable *buildable,
* if it doesn't.
**/
gboolean
gtk_buildable_custom_tag_start
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
G
Markup
Parser
*
parser
,
gpointer
*
data
)
gtk_buildable_custom_tag_start
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
G
tkBuildable
Parser
*
parser
,
gpointer
*
data
)
{
GtkBuildableIface
*
iface
;
...
...
gtk/gtkbuildable.h
View file @
96b37f4e
...
...
@@ -126,42 +126,42 @@ struct _GtkBuildableIface
GTypeInterface
g_iface
;
/* virtual table */
void
(
*
set_name
)
(
GtkBuildable
*
buildable
,
const
gchar
*
name
);
const
gchar
*
(
*
get_name
)
(
GtkBuildable
*
buildable
);
void
(
*
add_child
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
type
);
void
(
*
set_buildable_property
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
const
gchar
*
name
,
const
GValue
*
value
);
GObject
*
(
*
construct_child
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
const
gchar
*
name
);
gboolean
(
*
custom_tag_start
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
GMarkup
Parser
*
parser
,
gpointer
*
data
);
void
(
*
custom_tag_end
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
gpointer
data
);
void
(
*
custom_finished
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
gpointer
data
);
void
(
*
parser_finished
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
);
GObject
*
(
*
get_internal_child
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
const
gchar
*
childname
);
void
(
*
set_name
)
(
GtkBuildable
*
buildable
,
const
gchar
*
name
);
const
gchar
*
(
*
get_name
)
(
GtkBuildable
*
buildable
);
void
(
*
add_child
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
type
);
void
(
*
set_buildable_property
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
const
gchar
*
name
,
const
GValue
*
value
);
GObject
*
(
*
construct_child
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
const
gchar
*
name
);
gboolean
(
*
custom_tag_start
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
GtkBuildable
Parser
*
parser
,
gpointer
*
data
);
void
(
*
custom_tag_end
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
gpointer
data
);
void
(
*
custom_finished
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
gpointer
data
);
void
(
*
parser_finished
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
);
GObject
*
(
*
get_internal_child
)
(
GtkBuildable
*
buildable
,
GtkBuilder
*
builder
,
const
gchar
*
childname
);
};
...
...
@@ -192,7 +192,7 @@ gboolean gtk_buildable_custom_tag_start (GtkBuildable *buildable,
GtkBuilder
*
builder
,
GObject
*
child
,
const
gchar
*
tagname
,
G
Markup
Parser
*
parser
,
G
tkBuildable
Parser
*
parser
,
gpointer
*
data
);
GDK_AVAILABLE_IN_ALL
void
gtk_buildable_custom_tag_end
(
GtkBuildable
*
buildable
,
...
...
gtk/gtkbuilder-menus.c
View file @
96b37f4e
...
...
@@ -80,12 +80,12 @@ gtk_builder_menu_pop_frame (GtkBuilderMenuState *state)
}
static
void
gtk_builder_menu_start_element
(
G
Markup
ParseContext
*
context
,
const
gchar
*
element_name
,
const
gchar
**
attribute_names
,
const
gchar
**
attribute_values
,
gpointer
user_data
,
GError
**
error
)
gtk_builder_menu_start_element
(
G
tkBuildable
ParseContext
*
context
,
const
gchar
*
element_name
,
const
gchar
**
attribute_names
,
const
gchar
**
attribute_values
,
gpointer
user_data
,
GError
**
error
)
{
GtkBuilderMenuState
*
state
=
user_data
;
...
...
@@ -214,14 +214,15 @@ gtk_builder_menu_start_element (GMarkupParseContext *context,
}
{
const
GSList
*
element_stack
;
GPtrArray
*
element_stack
;
element_stack
=
g
_markup
_parse_context_get_element_stack
(
context
);
element_stack
=
g
tk_buildable
_parse_context_get_element_stack
(
context
);
if
(
element_stack
->
next
)
if
(
element_stack
->
len
>
1
)
g_set_error
(
error
,
G_MARKUP_ERROR
,
G_MARKUP_ERROR_UNKNOWN_ELEMENT
,
_
(
"Element <%s> not allowed inside <%s>"
),
element_name
,
(
const
gchar
*
)
element_stack
->
next
->
data
);
element_name
,
(
const
gchar
*
)
g_ptr_array_index
(
element_stack
,
element_stack
->
len
-
2
));
else
g_set_error
(
error
,
G_MARKUP_ERROR
,
G_MARKUP_ERROR_UNKNOWN_ELEMENT
,
...
...
@@ -230,10 +231,10 @@ gtk_builder_menu_start_element (GMarkupParseContext *context,
}
static
void
gtk_builder_menu_end_element
(
G
Markup
ParseContext
*
context
,
const
gchar
*
element_name
,
gpointer
user_data
,
GError
**
error
)
gtk_builder_menu_end_element
(
G
tkBuildable
ParseContext
*
context
,
const
gchar
*
element_name
,
gpointer
user_data
,
GError
**
error
)
{
GtkBuilderMenuState
*
state
=
user_data
;
...
...
@@ -297,11 +298,11 @@ gtk_builder_menu_end_element (GMarkupParseContext *context,
}
static
void
gtk_builder_menu_text
(
G
Markup
ParseContext
*
context
,
const
gchar
*
text
,
gsize
text_len
,
gpointer
user_data
,
GError
**
error
)
gtk_builder_menu_text
(
G
tkBuildable
ParseContext
*
context
,
const
gchar
*
text
,
gsize
text_len
,
gpointer
user_data
,
GError
**
error
)
{
GtkBuilderMenuState
*
state
=
user_data
;
gint
i
;
...
...
@@ -315,15 +316,15 @@ gtk_builder_menu_text (GMarkupParseContext *context,
else
g_set_error
(
error
,
G_MARKUP_ERROR
,
G_MARKUP_ERROR_INVALID_CONTENT
,
_
(
"Text may not appear inside <%s>"
),
g
_markup
_parse_context_get_element
(
context
));
g
tk_buildable
_parse_context_get_element
(
context
));
break
;
}
}
static
void
gtk_builder_menu_error
(
G
Markup
ParseContext
*
context
,
GError
*
error
,
gpointer
user_data
)
gtk_builder_menu_error
(
G
tkBuildable
ParseContext
*
context
,
GError
*
error
,
gpointer
user_data
)
{
GtkBuilderMenuState
*
state
=
user_data
;
...
...
@@ -348,12 +349,11 @@ gtk_builder_menu_error (GMarkupParseContext *context,
g_slice_free
(
GtkBuilderMenuState
,
state
);
}
static
G
Markup
Parser
gtk_builder_menu_subparser
=
static
G
tkBuildable
Parser
gtk_builder_menu_subparser
=
{
gtk_builder_menu_start_element
,
gtk_builder_menu_end_element
,
gtk_builder_menu_text
,
NULL
,
/* passthrough */
gtk_builder_menu_error
};
...
...
@@ -369,7 +369,7 @@ _gtk_builder_menu_start (ParserData *parser_data,
state
=
g_slice_new0
(
GtkBuilderMenuState
);
state
->
parser_data
=
parser_data
;
g
_markup
_parse_context_push
(
parser_data
->
ctx
,
&
gtk_builder_menu_subparser
,
state
);
g
tk_buildable
_parse_context_push
(
&
parser_data
->
ctx
,
&
gtk_builder_menu_subparser
,
state
);
if
(
COLLECT
(
STRING
,
"id"
,
&
id
))
{
...
...
@@ -387,7 +387,7 @@ _gtk_builder_menu_end (ParserData *parser_data)
{
GtkBuilderMenuState
*
state
;
state
=
g
_markup
_parse_context_pop
(
parser_data
->
ctx
);
state
=
g
tk_buildable
_parse_context_pop
(
&
parser_data
->
ctx
);
gtk_builder_menu_pop_frame
(
state
);
g_assert
(
state
->
frame
.
prev
==
NULL
);
...
...
gtk/gtkbuilder.c
View file @
96b37f4e
...
...
@@ -2805,7 +2805,7 @@ gtk_builder_get_application (GtkBuilder *builder)
/*< private >
* _gtk_builder_prefix_error:
* @builder: a #GtkBuilder
* @context: the #G
Markup
ParseContext
* @context: the #G
tkBuildable
ParseContext
* @error: an error
*
* Calls g_prefix_error() to prepend a filename:line:column marker
...
...
@@ -2817,21 +2817,21 @@ gtk_builder_get_application (GtkBuilder *builder)
* g_markup_collect_attributes() in a start_element vfunc.
*/
void
_gtk_builder_prefix_error
(
GtkBuilder
*
builder
,
G
Markup
ParseContext
*
context
,
GError
**
error
)
_gtk_builder_prefix_error
(
GtkBuilder
*
builder
,
G
tkBuildable
ParseContext
*
context
,
GError
**
error
)
{
GtkBuilderPrivate
*
priv
=
gtk_builder_get_instance_private
(
builder
);
gint
line
,
col
;
g
_markup
_parse_context_get_position
(
context
,
&
line
,
&
col
);
g
tk_buildable
_parse_context_get_position
(
context
,
&
line
,
&
col
);
g_prefix_error
(
error
,
"%s:%d:%d "
,
priv
->
filename
,
line
,
col
);
}
/*< private >
* _gtk_builder_error_unhandled_tag:
* @builder: a #GtkBuilder
* @context: the #G
Markup
ParseContext
* @context: the #G
tkBuildable
ParseContext
* @object: name of the object that is being handled
* @element_name: name of the element whose start tag is being handled
* @error: return location for the error
...
...
@@ -2842,16 +2842,16 @@ _gtk_builder_prefix_error (GtkBuilder *builder,
* This is intended to be called in a start_element vfunc.
*/
void
_gtk_builder_error_unhandled_tag
(
GtkBuilder
*
builder
,
G
Markup
ParseContext
*
context
,
const
gchar
*
object
,
const
gchar
*
element_name
,
GError
**
error
)
_gtk_builder_error_unhandled_tag
(
GtkBuilder
*
builder
,
G
tkBuildable
ParseContext
*
context
,
const
gchar
*
object
,
const
gchar
*
element_name
,
GError
**
error
)
{
GtkBuilderPrivate
*
priv
=
gtk_builder_get_instance_private
(
builder
);
gint
line
,
col
;
g
_markup
_parse_context_get_position
(
context
,
&
line
,
&
col
);
g
tk_buildable
_parse_context_get_position
(
context
,
&
line
,
&
col
);
g_set_error
(
error
,
GTK_BUILDER_ERROR
,
GTK_BUILDER_ERROR_UNHANDLED_TAG
,
...
...
@@ -2862,7 +2862,7 @@ _gtk_builder_error_unhandled_tag (GtkBuilder *builder,
/*< private >
* @builder: a #GtkBuilder
* @context: the #G
Markup
ParseContext
* @context: the #G
tkBuildable
ParseContext
* @parent_name: the name of the expected parent element
* @error: return location for an error
*
...
...
@@ -2875,27 +2875,27 @@ _gtk_builder_error_unhandled_tag (GtkBuilder *builder,
* Returns: %TRUE if @parent_name is the parent element
*/
gboolean
_gtk_builder_check_parent
(
GtkBuilder
*
builder
,
G
Markup
ParseContext
*
context
,
const
gchar
*
parent_name
,
GError
**
error
)
_gtk_builder_check_parent
(
GtkBuilder
*
builder
,
G
tkBuildable
ParseContext
*
context
,
const
gchar
*
parent_name
,
GError
**
error
)
{
GtkBuilderPrivate
*
priv
=
gtk_builder_get_instance_private
(
builder
);
const
GSList
*
stack
;
GPtrArray
*
stack
;
gint
line
,
col
;
const
gchar
*
parent
;
const
gchar
*
element
;
stack
=
g
_markup
_parse_context_get_element_stack
(
context
);
stack
=
g
tk_buildable
_parse_context_get_element_stack
(
context
);
element
=
(
const
gchar
*
)
stack
->
data
;
parent
=
stack
->
next
?
(
const
gchar
*
)
stack
->
next
->
data
:
""
;
element
=
g_ptr_array_index
(
stack
,
stack
->
len
-
1
)
;
parent
=
stack
->
len
>
1
?
g_ptr_array_index
(
stack
,
stack
->
len
-
2
)
:
""
;
if
(
g_str_equal
(
parent_name
,
parent
)
||
(
g_str_equal
(
parent_name
,
"object"
)
&&
g_str_equal
(
parent
,
"template"
)))
return
TRUE
;
g
_markup
_parse_context_get_position
(
context
,
&
line
,
&
col
);
g
tk_buildable
_parse_context_get_position
(
context
,
&
line
,
&
col
);
g_set_error
(
error
,
GTK_BUILDER_ERROR
,
GTK_BUILDER_ERROR_INVALID_TAG
,
...
...
gtk/gtkbuilderparser.c
View file @
96b37f4e
...
...
@@ -392,7 +392,7 @@ error_missing_attribute (ParserData *data,
{
gint
line
,
col
;
g
_markup
_parse_context_get_position
(
data
->
ctx
,
&
line
,
&
col
);
g
tk_buildable
_parse_context_get_position
(
&
data
->
ctx
,
&
line
,
&
col
);
g_set_error
(
error
,
GTK_BUILDER_ERROR
,
...
...
@@ -409,7 +409,7 @@ error_invalid_tag (ParserData *data,
{
gint
line
,
col
;
g
_markup
_parse_context_get_position
(
data
->
ctx
,
&
line
,
&
col
);
g
tk_buildable
_parse_context_get_position
(
&
data
->
ctx
,
&
line
,
&
col
);
if
(
expected
)
g_set_error
(
error
,
...
...
@@ -432,7 +432,7 @@ error_unhandled_tag (ParserData *data,
{
gint
line
,
col
;
g
_markup
_parse_context_get_position
(
data
->
ctx
,
&
line
,
&
col
);
g
tk_buildable
_parse_context_get_position
(
&
data
->
ctx
,
&
line
,
&
col
);
g_set_error
(
error
,
GTK_BUILDER_ERROR
,
GTK_BUILDER_ERROR_UNHANDLED_TAG
,
...
...
@@ -512,7 +512,7 @@ parse_requires (ParserData *data,
G_MARKUP_COLLECT_STRING
,
"version"
,
&
version
,
G_MARKUP_COLLECT_INVALID
))
{
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
...
...
@@ -522,7 +522,7 @@ parse_requires (ParserData *data,
GTK_BUILDER_ERROR
,
GTK_BUILDER_ERROR_INVALID_VALUE
,
"'version' attribute has malformed value '%s'"
,
version
);
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
version_major
=
g_ascii_strtoll
(
split
[
0
],
NULL
,
10
);
...
...
@@ -553,12 +553,12 @@ is_requested_object (const gchar *object,
}
static
void
parse_object
(
G
Markup
ParseContext
*
context
,
ParserData
*
data
,
const
gchar
*
element_name
,
const
gchar
**
names
,
const
gchar
**
values
,
GError
**
error
)
parse_object
(
G
tkBuildable
ParseContext
*
context
,
ParserData
*
data
,
const
gchar
*
element_name
,
const
gchar
**
names
,
const
gchar
**
values
,
GError
**
error
)
{
ObjectInfo
*
object_info
;
ChildInfo
*
child_info
;
...
...
@@ -590,7 +590,7 @@ parse_object (GMarkupParseContext *context,
G_MARKUP_COLLECT_STRING
|
G_MARKUP_COLLECT_OPTIONAL
,
"id"
,
&
object_id
,
G_MARKUP_COLLECT_INVALID
))
{
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
...
...
@@ -681,17 +681,17 @@ parse_object (GMarkupParseContext *context,
return
;
}
g
_markup
_parse_context_get_position
(
context
,
&
line
,
NULL
);
g
tk_buildable
_parse_context_get_position
(
context
,
&
line
,
NULL
);
g_hash_table_insert
(
data
->
object_ids
,
g_strdup
(
object_id
),
GINT_TO_POINTER
(
line
));
}
static
void
parse_template
(
G
Markup
ParseContext
*
context
,
ParserData
*
data
,
const
gchar
*
element_name
,
const
gchar
**
names
,
const
gchar
**
values
,
GError
**
error
)
parse_template
(
G
tkBuildable
ParseContext
*
context
,
ParserData
*
data
,
const
gchar
*
element_name
,
const
gchar
**
names
,
const
gchar
**
values
,
GError
**
error
)
{
ObjectInfo
*
object_info
;
const
gchar
*
object_class
=
NULL
;
...
...
@@ -707,7 +707,7 @@ parse_template (GMarkupParseContext *context,
G_MARKUP_COLLECT_STRING
|
G_MARKUP_COLLECT_OPTIONAL
,
"parent"
,
&
parent_class
,
G_MARKUP_COLLECT_INVALID
))
{
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
...
...
@@ -785,7 +785,7 @@ parse_template (GMarkupParseContext *context,
return
;
}
g
_markup
_parse_context_get_position
(
context
,
&
line
,
NULL
);
g
tk_buildable
_parse_context_get_position
(
context
,
&
line
,
NULL
);
g_hash_table_insert
(
data
->
object_ids
,
g_strdup
(
object_class
),
GINT_TO_POINTER
(
line
));
}
...
...
@@ -829,7 +829,7 @@ parse_child (ParserData *data,
G_MARKUP_COLLECT_STRING
|
G_MARKUP_COLLECT_OPTIONAL
,
"internal-child"
,
&
internal_child
,
G_MARKUP_COLLECT_INVALID
))
{
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
...
...
@@ -889,7 +889,7 @@ parse_property (ParserData *data,
G_MARKUP_COLLECT_STRING
|
G_MARKUP_COLLECT_OPTIONAL
,
"bind-flags"
,
&
bind_flags_str
,
G_MARKUP_COLLECT_INVALID
))
{
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
...
...
@@ -902,7 +902,7 @@ parse_property (ParserData *data,
GTK_BUILDER_ERROR_INVALID_PROPERTY
,
"Invalid property: %s.%s"
,
g_type_name
(
object_info
->
type
),
name
);
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
...
...
@@ -910,12 +910,12 @@ parse_property (ParserData *data,
{
if
(
!
_gtk_builder_flags_from_string
(
G_TYPE_BINDING_FLAGS
,
NULL
,
bind_flags_str
,
&
bind_flags
,
error
))
{
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
}
g
_markup
_parse_context_get_position
(
data
->
ctx
,
&
line
,
&
col
);
g
tk_buildable
_parse_context_get_position
(
&
data
->
ctx
,
&
line
,
&
col
);
if
(
bind_source
)
{
...
...
@@ -996,7 +996,7 @@ parse_signal (ParserData *data,
G_MARKUP_COLLECT_TRISTATE
|
G_MARKUP_COLLECT_OPTIONAL
,
"swapped"
,
&
swapped
,
G_MARKUP_COLLECT_INVALID
))
{
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
...
...
@@ -1007,7 +1007,7 @@ parse_signal (ParserData *data,
GTK_BUILDER_ERROR_INVALID_SIGNAL
,
"Invalid signal '%s' for type '%s'"
,
name
,
g_type_name
(
object_info
->
type
));
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);
return
;
}
...
...
@@ -1066,7 +1066,7 @@ parse_interface (ParserData *data,
G_MARKUP_COLLECT_STRING
|
G_MARKUP_COLLECT_OPTIONAL
,
"domain"
,
&
domain
,
G_MARKUP_COLLECT_INVALID
))
{
_gtk_builder_prefix_error
(
data
->
builder
,
data
->
ctx
,
error
);
_gtk_builder_prefix_error
(
data
->
builder
,
&
data
->
ctx
,
error
);