--- Clock.c.orig 2007-09-14 17:18:56.000000000 -0400 +++ Clock.c 2008-05-10 22:18:46.147733977 -0400 @@ -656,46 +656,48 @@ 2 * w->clock.padding; } else + { #endif #ifndef NO_I18N - if (!no_locale) { - XFontSetExtents *fse; + if (!no_locale) { + XFontSetExtents *fse; - if(w->clock.fontSet == NULL) { - char **missing, *default_str; - int n_missing; - w->clock.fontSet = XCreateFontSet( XtDisplay(w), - XtDefaultFontSet, - &missing, - &n_missing, - &default_str); - } - if (w->clock.fontSet != NULL) - { - /* don't free this... it's freed with the XFontSet. */ - fse = XExtentsOfFontSet(w->clock.fontSet); - - min_width = XmbTextEscapement(w->clock.fontSet,str, - len) - + 2 * w->clock.padding; - min_height = fse->max_logical_extent.height + - 3 * w->clock.padding; - } else { - no_locale = True; - } - } + if(w->clock.fontSet == NULL) { + char **missing, *default_str; + int n_missing; + w->clock.fontSet = XCreateFontSet( XtDisplay(w), + XtDefaultFontSet, + &missing, + &n_missing, + &default_str); + } + if (w->clock.fontSet != NULL) + { + /* don't free this... it's freed with the XFontSet. */ + fse = XExtentsOfFontSet(w->clock.fontSet); + + min_width = XmbTextEscapement(w->clock.fontSet,str, + len) + + 2 * w->clock.padding; + min_height = fse->max_logical_extent.height + + 3 * w->clock.padding; + } else { + no_locale = True; + } + } - if (!no_locale) -#endif /* NO_I18N */ - { - if (w->clock.font == NULL) - w->clock.font = XQueryFont( XtDisplay(w), - XGContextFromGC( - DefaultGCOfScreen(XtScreen(w))) ); - min_width = XTextWidth(w->clock.font, str, len) + - 2 * w->clock.padding; - min_height = w->clock.font->ascent + - w->clock.font->descent + 2 * w->clock.padding; + if (!no_locale) + #endif /* NO_I18N */ + { + if (w->clock.font == NULL) + w->clock.font = XQueryFont( XtDisplay(w), + XGContextFromGC( + DefaultGCOfScreen(XtScreen(w))) ); + min_width = XTextWidth(w->clock.font, str, len) + + 2 * w->clock.padding; + min_height = w->clock.font->ascent + + w->clock.font->descent + 2 * w->clock.padding; + } } } if (w->core.width == 0)