From: Paul Eggert Date: Mon, 20 Jun 2011 05:54:33 +0000 (-0700) Subject: * gtkutil.c (style_changed_cb): Avoid need for strlen. X-Git-Tag: emacs-pretest-24.0.90~104^2~473^2~23 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9bda3520ff9b70be8645e0ebc38cf212208c444b;p=emacs.git * gtkutil.c (style_changed_cb): Avoid need for strlen. --- diff --git a/src/ChangeLog b/src/ChangeLog index cb6ea8ff9eb..16e8342ee0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-06-20 Paul Eggert + * gtkutil.c (style_changed_cb): Avoid need for strlen. + * font.c: Don't assume string length fits in int. (font_parse_xlfd, font_parse_fcname, font_unparse_fcname): Use ptrdiff_t, not int. diff --git a/src/gtkutil.c b/src/gtkutil.c index 45f112ae9e5..6c00058e7af 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1015,7 +1015,7 @@ style_changed_cb (GObject *go, EVENT_INIT (event); event.kind = CONFIG_CHANGED_EVENT; - event.frame_or_window = make_string (display_name, strlen (display_name)); + event.frame_or_window = build_string (display_name); /* Theme doesn't change often, so intern is called seldom. */ event.arg = intern ("theme-name"); kbd_buffer_store_event (&event); @@ -1024,7 +1024,7 @@ style_changed_cb (GObject *go, /* If scroll bar width changed, we need set the new size on all frames on this display. */ - if (dpy) + if (dpy) { Lisp_Object rest, frame; FOR_EACH_FRAME (rest, frame)