Skip to content
GitLab
Menu
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
a7ad2a46
Commit
a7ad2a46
authored
Sep 17, 2003
by
Matthias Clasen
Browse files
Robustness improvements.
* gtk/gtkuimanager.c (update_node): Robustness improvements.
parent
3044d0f5
Changes
6
Hide whitespace changes
Inline
Side-by-side
ChangeLog
View file @
a7ad2a46
2003-09-18 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Robustness improvements.
2003-09-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (text_handler): Report unexpected character
...
...
ChangeLog.pre-2-10
View file @
a7ad2a46
2003-09-18 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Robustness improvements.
2003-09-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (text_handler): Report unexpected character
...
...
ChangeLog.pre-2-4
View file @
a7ad2a46
2003-09-18 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Robustness improvements.
2003-09-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (text_handler): Report unexpected character
...
...
ChangeLog.pre-2-6
View file @
a7ad2a46
2003-09-18 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Robustness improvements.
2003-09-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (text_handler): Report unexpected character
...
...
ChangeLog.pre-2-8
View file @
a7ad2a46
2003-09-18 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (update_node): Robustness improvements.
2003-09-17 Matthias Clasen <maclas@gmx.de>
* gtk/gtkuimanager.c (text_handler): Report unexpected character
...
...
gtk/gtkuimanager.c
View file @
a7ad2a46
...
...
@@ -1722,13 +1722,15 @@ update_node (GtkUIManager *self,
/* Check if the node doesn't have an action and must have an action */
if
(
action
==
NULL
&&
info
->
type
!=
NODE_TYPE_ROOT
&&
info
->
type
!=
NODE_TYPE_MENUBAR
&&
info
->
type
!=
NODE_TYPE_TOOLBAR
&&
info
->
type
!=
NODE_TYPE_SEPARATOR
&&
info
->
type
!=
NODE_TYPE_MENU_PLACEHOLDER
&&
info
->
type
!=
NODE_TYPE_TOOLBAR_PLACEHOLDER
)
{
/* FIXME: Should we warn here? */
g_warning
(
"%s: missing action"
,
info
->
name
);
goto
recurse_children
;
}
...
...
@@ -2063,12 +2065,14 @@ update_node (GtkUIManager *self,
child
=
current
->
next
;
update_node
(
self
,
current
,
add_tearoffs
&&
(
info
->
type
!=
NODE_TYPE_POPUP
));
}
if
(
info
->
type
==
NODE_TYPE_MENU
)
update_smart_separators
(
gtk_menu_item_get_submenu
(
GTK_MENU_ITEM
(
info
->
proxy
)));
else
if
(
info
->
type
==
NODE_TYPE_TOOLBAR
)
update_smart_separators
(
info
->
proxy
);
if
(
info
->
proxy
)
{
if
(
info
->
type
==
NODE_TYPE_MENU
)
update_smart_separators
(
gtk_menu_item_get_submenu
(
GTK_MENU_ITEM
(
info
->
proxy
)));
else
if
(
info
->
type
==
NODE_TYPE_TOOLBAR
)
update_smart_separators
(
info
->
proxy
);
}
/* handle cleanup of dead nodes */
if
(
node
->
children
==
NULL
&&
info
->
uifiles
==
NULL
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment