From b0afc268e8513939e5fc0551f33aec6884e7a4e6 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 13 Mar 2011 00:15:55 -0800 Subject: [PATCH] * gtkutil.c (xg_free_frame_widgets): Make it clear that a local variable is needed only if USE_GTK_TOOLTIP. --- src/ChangeLog | 2 ++ src/gtkutil.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 2d88ba25092..269285d32b0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -2,6 +2,8 @@ * gtkutil.c (xg_get_pixbuf_from_pixmap): Add cast from char * to unsigned char * to avoid compiler diagnostic. + (xg_free_frame_widgets): Make it clear that a local variable is + needed only if USE_GTK_TOOLTIP. * xgselect.c (xg_select): Remove unused var. diff --git a/src/gtkutil.c b/src/gtkutil.c index 8ab41fdefd1..04b8a64c995 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1188,7 +1188,9 @@ xg_free_frame_widgets (FRAME_PTR f) { if (FRAME_GTK_OUTER_WIDGET (f)) { +#ifdef USE_GTK_TOOLTIP struct x_output *x = f->output_data.x; +#endif gtk_widget_destroy (FRAME_GTK_OUTER_WIDGET (f)); FRAME_X_WINDOW (f) = 0; /* Set to avoid XDestroyWindow in xterm.c */ FRAME_GTK_OUTER_WIDGET (f) = 0; -- 2.39.5