(U+6215): Apply new conventions for glyph granularity.

[chise/xemacs-chise.git.1] / src / dialog-x.c

diff --git a/src/dialog-x.c b/src/dialog-x.c
index 3985761..9b32e5a 100644 (file)
--- a/src/dialog-x.c
+++ b/src/dialog-x.c
@@ -105,7 +105,7 @@ dbox_selection_callback (Widget widget, LWLIB_ID id, XtPointer client_data)
      ourselves. */
 #ifdef EXTERNAL_WIDGET
   /* #### Not sure if this special case is necessary. */
-  if (!FRAME_X_EXTERNAL_WINDOW_P (f) && f)
+  if (f && !FRAME_X_EXTERNAL_WINDOW_P (f))
 #else
   if (f)
 #endif
@@ -128,7 +128,9 @@ dbox_descriptor_to_widget_value (Lisp_Object keys)
   int n = 0;
   int count = specpdl_depth ();
   Lisp_Object wv_closure, gui_item;
-  Lisp_Object question = Qnil, title = Qnil, buttons = Qnil;
+  Lisp_Object question = Qnil;
+  Lisp_Object title    = Qnil;  /* #### currently unused */
+  Lisp_Object buttons  = Qnil;
 
   {
     EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys)