[Emacs-diffs] /srv/bzr/emacs/trunk r112144: * gtkutil.c (style_changed_cb): Check if frame is live and an

[Jan D.]

------------------------------------------------------------
revno: 112144
fixes bug: http://debbugs.gnu.org/14038
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2013-03-26 16:34:45 +0100
message:
  * gtkutil.c (style_changed_cb): Check if frame is live and an
  X frame.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-03-26 14:04:07 +0000
+++ b/src/ChangeLog     2013-03-26 15:34:45 +0000
@@ -1,3 +1,8 @@
+2013-03-26  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (style_changed_cb): Check if frame is live and an
+       X frame (Bug#14038).
+
 2013-03-26  Eli Zaretskii  <address@hidden>
 
        * w32.c (_PROCESS_MEMORY_COUNTERS_EX) [_WIN32_WINNT < 0x0500]:

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2013-03-24 12:59:45 +0000
+++ b/src/gtkutil.c     2013-03-26 15:34:45 +0000
@@ -1094,7 +1094,9 @@
       FOR_EACH_FRAME (rest, frame)
         {
           FRAME_PTR f = XFRAME (frame);
-          if (FRAME_X_DISPLAY (f) == dpy)
+          if (FRAME_LIVE_P (f)
+              && FRAME_X_P (f)
+              && FRAME_X_DISPLAY (f) == dpy)
             {
               x_set_scroll_bar_default_width (f);
               xg_frame_set_char_size (f, FRAME_COLS (f), FRAME_LINES (f));