Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ec867797
Commit
ec867797
authored
Aug 30, 2004
by
Jan Djärv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't call ENCODE_MENU_STRING on top level menu names, GC may occur.
parent
2bf436c3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
src/ChangeLog
src/ChangeLog
+1
-2
src/xmenu.c
src/xmenu.c
+2
-2
No files found.
src/ChangeLog
View file @
ec867797
...
...
@@ -4,8 +4,7 @@
instead of name and key.
(update_submenu_strings): New function.
(set_frame_menubar): Remove call to inhibit_garbage_collection,
call update_submenu_strings. Call ENCODE_MENU_STRING for top level
menu names.
call update_submenu_strings.
* gtkutil.h (_widget_value): Added lname and lkey.
...
...
src/xmenu.c
View file @
ec867797
...
...
@@ -2056,7 +2056,7 @@ set_frame_menubar (f, first_time, deep_p)
string
=
XVECTOR
(
items
)
->
contents
[
i
+
1
];
if
(
NILP
(
string
))
break
;
wv
->
name
=
(
char
*
)
SDATA
(
ENCODE_MENU_STRING
(
string
)
)
;
wv
->
name
=
(
char
*
)
SDATA
(
string
);
update_submenu_strings
(
wv
->
contents
);
wv
=
wv
->
next
;
}
...
...
@@ -2088,7 +2088,7 @@ set_frame_menubar (f, first_time, deep_p)
break
;
wv
=
xmalloc_widget_value
();
wv
->
name
=
(
char
*
)
SDATA
(
ENCODE_MENU_STRING
(
string
)
)
;
wv
->
name
=
(
char
*
)
SDATA
(
string
);
wv
->
value
=
0
;
wv
->
enabled
=
1
;
wv
->
button_type
=
BUTTON_TYPE_NONE
;
...
...
Write
Preview
Markdown
is supported
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