summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog4
-rw-r--r--modules/indic/indic-ot.c4
-rw-r--r--modules/indic/indic-ot.h2
-rw-r--r--modules/syriac/syriac-ot.c42
-rw-r--r--modules/thai/thai-ot.c4
-rw-r--r--modules/thai/thai-shaper.c30
-rw-r--r--modules/tibetan/tibetan-fc.c8
-rw-r--r--pango-view/viewer-cairo.h2
-rw-r--r--pango-view/viewer-render.c14
-rw-r--r--pango/fonts.c2
-rw-r--r--pango/pango-context.c18
-rw-r--r--pango/pango-engine.h2
-rw-r--r--pango/pango-impl-utils.h10
-rw-r--r--pango/pango-layout.c16
-rw-r--r--pango/pango-tabs.c2
-rw-r--r--pango/pangoatsui.c2
-rw-r--r--pango/pangocairo-private.h2
-rw-r--r--pango/pangofc-fontmap.c6
-rw-r--r--pango/pangowin32.h2
-rw-r--r--pango/pangoxft-font.c4
-rw-r--r--pango/pangoxft-render.c2
-rw-r--r--tools/gen-script-for-lang.c2
22 files changed, 92 insertions, 88 deletions
diff --git a/ChangeLog b/ChangeLog
index 3f0eb7a6..e7313de1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
+ *.c, *.h: Removed spaces followed b tabs.
+
+2007-01-16 Behdad Esfahbod <behdad@gnome.org>
+
*.c, *.h: Replace preceding sequences of 8 spaces with tabs.
2007-01-16 Behdad Esfahbod <behdad@gnome.org>
diff --git a/modules/indic/indic-ot.c b/modules/indic/indic-ot.c
index 477c53e9..e764184c 100644
--- a/modules/indic/indic-ot.c
+++ b/modules/indic/indic-ot.c
@@ -265,7 +265,7 @@ glong indic_ot_reorder(const gunichar *chars, const glong *utf8_offsets, glong c
last_in_word = TRUE;
switch (indic_ot_get_char_class(class_table, chars[prev]) & CF_CLASS_MASK) {
case CC_RESERVED:
- last_in_word = FALSE;
+ last_in_word = FALSE;
/* Fall through */
case CC_INDEPENDENT_VOWEL:
case CC_ZERO_WIDTH_MARK:
@@ -427,7 +427,7 @@ glong indic_ot_reorder(const gunichar *chars, const glong *utf8_offsets, glong c
(chars[baseConsonant] == 0x0d30)) &&
((chars[baseConsonant - 2] >= 0x0d15) &&
(chars[baseConsonant - 2] <= 0x0d39))) {
- swapChars (&output, -1, -3);
+ swapChars (&output, -1, -3);
if (mpreFixups) {
if (mpreFixups->fFixupCount > 0) {
diff --git a/modules/indic/indic-ot.h b/modules/indic/indic-ot.h
index b502c679..47dd39f2 100644
--- a/modules/indic/indic-ot.h
+++ b/modules/indic/indic-ot.h
@@ -184,7 +184,7 @@ struct _IndicOTClassTable
{
gunichar firstChar;
gunichar lastChar;
- glong worstCaseExpansion;
+ glong worstCaseExpansion;
IndicOTScriptFlags scriptFlags;
const IndicOTCharClass *charClasses;
diff --git a/modules/syriac/syriac-ot.c b/modules/syriac/syriac-ot.c
index abbe856b..30995021 100644
--- a/modules/syriac/syriac-ot.c
+++ b/modules/syriac/syriac-ot.c
@@ -140,50 +140,50 @@ Get_Joining_Class (gunichar* string,
*
* R3: <causing|right|dual> && <!(0x0715|0x0716|0x072A)> |<alaph>|
*
- * -> [final2]
+ * -> [final2]
*
- * If the preceding glyph cannot be joined to the current
- * glyph and the preceding character is not a Dalath, Rish,
- * or Dotless Dalath Rish, then the Alaph takes this contextual
- * position.
+ * If the preceding glyph cannot be joined to the current
+ * glyph and the preceding character is not a Dalath, Rish,
+ * or Dotless Dalath Rish, then the Alaph takes this contextual
+ * position.
*
- * The [final2] joining rule is placed ahead of the [final] to
- * give it greater precedence when choosing the correct glyph.
- * If it comes after the [final] rule, the incorrect glyph is
- * inserted into position.
+ * The [final2] joining rule is placed ahead of the [final] to
+ * give it greater precedence when choosing the correct glyph.
+ * If it comes after the [final] rule, the incorrect glyph is
+ * inserted into position.
*
*
* R4: <0x0715|0x0715|0x072A> |<alaph>|
*
- * -> [final3]
+ * -> [final3]
*
- * If the previous glyph is a Dalath, Rish, or Dotless Dalath
- * Rish, then the Alaph takes this contextual position.
+ * If the previous glyph is a Dalath, Rish, or Dotless Dalath
+ * Rish, then the Alaph takes this contextual position.
*
- * The [final3] joining rule is placed ahead of the [final] to
- * give it greater precedence when choosing the correct glyph.
- * If it comes after the [final] rule, the incorrect glyph is
- * inserted into position.
+ * The [final3] joining rule is placed ahead of the [final] to
+ * give it greater precedence when choosing the correct glyph.
+ * If it comes after the [final] rule, the incorrect glyph is
+ * inserted into position.
*
*
* R5: <causing|right|dual> |<right>|
*
- * -> [final]
+ * -> [final]
*
*
* R6: <causing|right|dual> |<dual>| <!(causing|right|dual)>
*
- * -> [final]
+ * -> [final]
*
*
* R7: <causing|left|dual> |<dual>| <causing|right|dual>
*
- * -> [medial]
+ * -> [medial]
*
*
* R8: <causing|right> |<alaph>| <causing|right|dual>
*
- * -> [medial2]
+ * -> [medial2]
*
* If the Alaph glyph falls in the middle of a Syriac word and
* the preceding character cannot be joined to, then the Alaph
@@ -192,7 +192,7 @@ Get_Joining_Class (gunichar* string,
*
* R9: |<left>| <causing|right|dual>
*
- * -> [initial]
+ * -> [initial]
*
*
* R10: <!(causing|left|dual)> |<dual>| <causing|right|dual>
diff --git a/modules/thai/thai-ot.c b/modules/thai/thai-ot.c
index b6866321..e17cefd5 100644
--- a/modules/thai/thai-ot.c
+++ b/modules/thai/thai-ot.c
@@ -123,7 +123,7 @@ thai_ot_get_ruleset (PangoFont *font)
if (n > 0)
g_object_set_qdata_full (G_OBJECT (info), ruleset_quark, ruleset,
- (GDestroyNotify)g_object_unref);
+ (GDestroyNotify)g_object_unref);
else
{
g_object_unref (ruleset);
@@ -196,7 +196,7 @@ lao_ot_get_ruleset (PangoFont *font)
if (n > 0)
g_object_set_qdata_full (G_OBJECT (info), ruleset_quark, ruleset,
- (GDestroyNotify)g_object_unref);
+ (GDestroyNotify)g_object_unref);
else
{
g_object_unref (ruleset);
diff --git a/modules/thai/thai-shaper.c b/modules/thai/thai-shaper.c
index 6d65a3b4..91cdbf89 100644
--- a/modules/thai/thai-shaper.c
+++ b/modules/thai/thai-shaper.c
@@ -193,7 +193,7 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
return 3;
}
else if (is_char_type (cluster[0], UpTailCons) &&
- is_char_type (cluster[1], SaraAm))
+ is_char_type (cluster[1], SaraAm))
{
glyph_lists[0] =
thai_make_glyph_tis (font_info, ucs2tis (cluster[0]));
@@ -203,7 +203,7 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
return 3;
}
else if (is_char_type (cluster[0], NoTailCons|BotTailCons|SpltTailCons) &&
- is_char_type (cluster[1], AboveVowel))
+ is_char_type (cluster[1], AboveVowel))
{
glyph_lists[0] =
thai_make_glyph_tis (font_info, ucs2tis (cluster[0]));
@@ -212,25 +212,25 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
return 2;
}
else if (is_char_type (cluster[0], NoTailCons|BotTailCons|SpltTailCons) &&
- is_char_type (cluster[1], AboveDiac|Tone))
+ is_char_type (cluster[1], AboveDiac|Tone))
{
glyph_lists[0] =
thai_make_glyph_tis (font_info, ucs2tis (cluster[0]));
glyph_lists[1] = thai_make_glyph_tis (font_info,
- shiftdown_tone_ad (ucs2tis (cluster[1]), shaping_table));
+ shiftdown_tone_ad (ucs2tis (cluster[1]), shaping_table));
return 2;
}
else if (is_char_type (cluster[0], UpTailCons) &&
- is_char_type (cluster[1], AboveVowel))
+ is_char_type (cluster[1], AboveVowel))
{
glyph_lists[0] =
thai_make_glyph_tis (font_info, ucs2tis (cluster[0]));
glyph_lists[1] = thai_make_glyph_tis (font_info,
- shiftleft_av (ucs2tis (cluster[1]), shaping_table));
+ shiftleft_av (ucs2tis (cluster[1]), shaping_table));
return 2;
}
else if (is_char_type (cluster[0], UpTailCons) &&
- is_char_type (cluster[1], AboveDiac|Tone))
+ is_char_type (cluster[1], AboveDiac|Tone))
{
glyph_lists[0] =
thai_make_glyph_tis (font_info, ucs2tis (cluster[0]));
@@ -239,7 +239,7 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
return 2;
}
else if (is_char_type (cluster[0], NoTailCons|UpTailCons) &&
- is_char_type (cluster[1], BelowVowel|BelowDiac))
+ is_char_type (cluster[1], BelowVowel|BelowDiac))
{
glyph_lists[0] =
thai_make_glyph_tis (font_info, ucs2tis (cluster[0]));
@@ -258,10 +258,10 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
return 2;
}
else if (is_char_type (cluster[0], SpltTailCons) &&
- is_char_type (cluster[1], BelowVowel|BelowDiac))
+ is_char_type (cluster[1], BelowVowel|BelowDiac))
{
glyph_lists[0] = thai_make_glyph_tis (font_info,
- tailcutcons (ucs2tis (cluster[0]), shaping_table));
+ tailcutcons (ucs2tis (cluster[0]), shaping_table));
glyph_lists[1] =
thai_make_glyph_tis (font_info, ucs2tis (cluster[1]));
return 2;
@@ -301,7 +301,7 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
glyph_lists[1] = thai_make_glyph_tis (font_info,
shiftleft_tone_ad (shaping_table->AmComp[0], shaping_table));
glyph_lists[2] = thai_make_glyph_tis (font_info,
- shiftleft_tone_ad (ucs2tis (cluster[1]), shaping_table));
+ shiftleft_tone_ad (ucs2tis (cluster[1]), shaping_table));
glyph_lists[3] = thai_make_glyph_tis (font_info, shaping_table->AmComp[1]);
return 4;
}
@@ -314,7 +314,7 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
glyph_lists[1] = thai_make_glyph_tis (font_info,
shiftleft_av (ucs2tis (cluster[1]), shaping_table));
glyph_lists[2] = thai_make_glyph_tis (font_info,
- shiftleft_tone_ad (ucs2tis (cluster[2]), shaping_table));
+ shiftleft_tone_ad (ucs2tis (cluster[2]), shaping_table));
return 3;
}
else if (is_char_type (cluster[0], UpTailCons) &&
@@ -347,11 +347,11 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
is_char_type (cluster[2], AboveDiac|Tone))
{
glyph_lists[0] = thai_make_glyph_tis (font_info,
- tailcutcons (ucs2tis (cluster[0]), shaping_table));
+ tailcutcons (ucs2tis (cluster[0]), shaping_table));
glyph_lists[1] =
thai_make_glyph_tis (font_info, ucs2tis (cluster[1]));
glyph_lists[2] = thai_make_glyph_tis (font_info,
- shiftdown_tone_ad (ucs2tis (cluster[2]), shaping_table));
+ shiftdown_tone_ad (ucs2tis (cluster[2]), shaping_table));
return 3;
}
else if (is_char_type (cluster[0], BotTailCons) &&
@@ -361,7 +361,7 @@ get_adjusted_glyphs_list (ThaiFontInfo *font_info,
glyph_lists[0] =
thai_make_glyph_tis (font_info, ucs2tis (cluster[0]));
glyph_lists[1] = thai_make_glyph_tis (font_info,
- shiftdown_bv_bd (ucs2tis (cluster[1]), shaping_table));
+ shiftdown_bv_bd (ucs2tis (cluster[1]), shaping_table));
glyph_lists[2] = thai_make_glyph_tis (font_info,
shiftdown_tone_ad (ucs2tis (cluster[2]), shaping_table));
return 3;
diff --git a/modules/tibetan/tibetan-fc.c b/modules/tibetan/tibetan-fc.c
index ff773b0f..dfb68820 100644
--- a/modules/tibetan/tibetan-fc.c
+++ b/modules/tibetan/tibetan-fc.c
@@ -543,10 +543,10 @@ tibetan_engine_shape (PangoEngineShape *engine,
if ((charClass & CF_DIGIT )
&& ( get_char_class (wcs[i+1]) & CF_PREDIGIT))
{
- pango_ot_buffer_add_glyph (buffer, get_index (fc_font, C_PRE_NUMBER_MARK), pref_p, p - text);
- p = g_utf8_next_char (p);
- pango_ot_buffer_add_glyph (buffer, get_index (fc_font, wcs[i]), pref_p, p - text);
- i += 1;
+ pango_ot_buffer_add_glyph (buffer, get_index (fc_font, C_PRE_NUMBER_MARK), pref_p, p - text);
+ p = g_utf8_next_char (p);
+ pango_ot_buffer_add_glyph (buffer, get_index (fc_font, wcs[i]), pref_p, p - text);
+ i += 1;
} else {
switch (charClass & CF_POS_MASK)
{
diff --git a/pango-view/viewer-cairo.h b/pango-view/viewer-cairo.h
index 6e2adb84..ba5a5d7c 100644
--- a/pango-view/viewer-cairo.h
+++ b/pango-view/viewer-cairo.h
@@ -32,7 +32,7 @@ struct _CairoViewerIface
const PangoViewer *backend_class;
cairo_surface_t * (*create_surface) (gpointer instance,
- gpointer surface,
+ gpointer surface,
int width,
int height);
};
diff --git a/pango-view/viewer-render.c b/pango-view/viewer-render.c
index 6e8bc4a9..9d3af1af 100644
--- a/pango-view/viewer-render.c
+++ b/pango-view/viewer-render.c
@@ -562,27 +562,27 @@ parse_options (int argc, char *argv[])
{"hinting", 0, 0, G_OPTION_ARG_CALLBACK, &parse_hinting,
"Hinting style", "none/auto/full"},
{"indent", 0, 0, G_OPTION_ARG_INT, &opt_indent,
- "Width in points to indent paragraphs", "points"},
+ "Width in points to indent paragraphs", "points"},
{"margin", 0, 0, G_OPTION_ARG_INT, &opt_margin,
"Set the margin on the output in pixels", "pixels"},
{"markup", 0, 0, G_OPTION_ARG_NONE, &opt_markup,
- "Interpret text as Pango markup", NULL},
+ "Interpret text as Pango markup", NULL},
{"output", 'o', 0, G_OPTION_ARG_STRING, &opt_output,
- "Save rendered image to output file", "file"},
+ "Save rendered image to output file", "file"},
{"pangorc", 0, 0, G_OPTION_ARG_STRING, &opt_pangorc,
"pangorc file to use (default is ./pangorc)", "file"},
{"rtl", 0, 0, G_OPTION_ARG_NONE, &opt_rtl,
- "Set base direction to right-to-left", NULL},
+ "Set base direction to right-to-left", NULL},
{"rotate", 0, 0, G_OPTION_ARG_DOUBLE, &opt_rotate,
- "Angle at which to rotate results", "degrees"},
+ "Angle at which to rotate results", "degrees"},
{"runs", 'n', 0, G_OPTION_ARG_INT, &opt_runs,
"Run Pango layout engine this many times", "integer"},
{"text", 't', 0, G_OPTION_ARG_STRING, &opt_text,
- "Text to display (instead of a file)", "string"},
+ "Text to display (instead of a file)", "string"},
{"version", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, &show_version,
"Show version numbers", NULL},
{"waterfall", 0, 0, G_OPTION_ARG_NONE, &opt_waterfall,
- "Create a waterfall display", NULL},
+ "Create a waterfall display", NULL},
{"width", 'w', 0, G_OPTION_ARG_INT, &opt_width,
"Width in points to which to wrap output", "points"},
{"wrap", 0, 0, G_OPTION_ARG_CALLBACK, &parse_wrap,
diff --git a/pango/fonts.c b/pango/fonts.c
index 13041245..91186a09 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -709,7 +709,7 @@ pango_font_description_copy_static (const PangoFontDescription *desc)
* being loaded, but still compare %FALSE.)
*
* Return value: %TRUE if the two font descriptions are identical,
- * %FALSE otherwise.
+ * %FALSE otherwise.
**/
gboolean
pango_font_description_equal (const PangoFontDescription *desc1,
diff --git a/pango/pango-context.c b/pango/pango-context.c
index b92f96ff..bed0021e 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -981,15 +981,15 @@ itemize_state_add_character (ItemizeState *state,
state->item->analysis.gravity = state->resolved_gravity;
/* The level vs. gravity dance:
- * - If gravity is SOUTH, leave level untouched.
- * - If gravity is NORTH, step level one up, to
- * not get mirrored upside-down text.
- * - If gravity is EAST, step up to an even level, as
- * it's a clockwise-rotated layout, so the rotated
- * top is unrotated left.
- * - If gravity is WEST, step up to an odd level, as
- * it's a counter-clockwise-rotated layout, so the rotated
- * top is unrotated right.
+ * - If gravity is SOUTH, leave level untouched.
+ * - If gravity is NORTH, step level one up, to
+ * not get mirrored upside-down text.
+ * - If gravity is EAST, step up to an even level, as
+ * it's a clockwise-rotated layout, so the rotated
+ * top is unrotated left.
+ * - If gravity is WEST, step up to an odd level, as
+ * it's a counter-clockwise-rotated layout, so the rotated
+ * top is unrotated right.
*
* A similar dance is performed in pango-layout.c:
* line_set_resolved_dir(). Keep in synch.
diff --git a/pango/pango-engine.h b/pango/pango-engine.h
index c620db94..ddc9ab16 100644
--- a/pango/pango-engine.h
+++ b/pango/pango-engine.h
@@ -282,7 +282,7 @@ prefix ## _register_type (GTypeModule *module) \
(GClassInitFunc) class_init, \
(GClassFinalizeFunc) NULL, \
NULL, /* class_data */ \
- sizeof (name), \
+ sizeof (name), \
0, /* n_prelocs */ \
(GInstanceInitFunc) instance_init, \
NULL /* value_table */ \
diff --git a/pango/pango-impl-utils.h b/pango/pango-impl-utils.h
index ac6a8e5f..2f71dadf 100644
--- a/pango/pango-impl-utils.h
+++ b/pango/pango-impl-utils.h
@@ -31,11 +31,11 @@ G_BEGIN_DECLS
#define PANGO_DEFINE_TYPE_FULL(name, prefix, \
class_init, instance_init, \
parent_type, abstract) \
-GType \
+GType \
prefix ## _get_type (void) \
{ \
static GType object_type = 0; \
- \
+ \
if (!object_type) \
{ \
static const GTypeInfo object_info = \
@@ -51,10 +51,10 @@ prefix ## _get_type (void) \
(GInstanceInitFunc) instance_init, \
NULL /* value_table */ \
}; \
- \
- object_type = g_type_register_static (parent_type, \
+ \
+ object_type = g_type_register_static (parent_type, \
g_intern_static_string (# name), \
- &object_info, abstract); \
+ &object_info, abstract); \
} \
\
return object_type; \
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 309d6e2e..5988e839 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3274,14 +3274,14 @@ line_set_resolved_dir (PangoLayoutLine *line,
}
/* The direction vs. gravity dance:
- * - If gravity is SOUTH, leave direction untouched.
- * - If gravity is NORTH, switch direction.
- * - If gravity is EAST, set to LTR, as
- * it's a clockwise-rotated layout, so the rotated
- * top is unrotated left.
- * - If gravity is WEST, set to RTL, as
- * it's a counter-clockwise-rotated layout, so the rotated
- * top is unrotated right.
+ * - If gravity is SOUTH, leave direction untouched.
+ * - If gravity is NORTH, switch direction.
+ * - If gravity is EAST, set to LTR, as
+ * it's a clockwise-rotated layout, so the rotated
+ * top is unrotated left.
+ * - If gravity is WEST, set to RTL, as
+ * it's a counter-clockwise-rotated layout, so the rotated
+ * top is unrotated right.
*
* A similar dance is performed in pango-context.c:
* itemize_state_add_character(). Keep in synch.
diff --git a/pango/pango-tabs.c b/pango/pango-tabs.c
index fbb9037a..705ad0a0 100644
--- a/pango/pango-tabs.c
+++ b/pango/pango-tabs.c
@@ -28,7 +28,7 @@ typedef struct _PangoTab PangoTab;
struct _PangoTab
{
- gint location; /* Offset in pixels of this tab stop
+ gint location; /* Offset in pixels of this tab stop
* from the left margin of the text.
*/
PangoTabAlign alignment; /* Where the tab stop appears relative
diff --git a/pango/pangoatsui.c b/pango/pangoatsui.c
index fda231ee..231c1002 100644
--- a/pango/pangoatsui.c
+++ b/pango/pangoatsui.c
@@ -48,7 +48,7 @@ pango_atsui_font_describe (PangoFont *font)
static PangoCoverage *
pango_atsui_font_get_coverage (PangoFont *font,
- PangoLanguage *language)
+ PangoLanguage *language)
{
PangoCoverage *coverage;
int i;
diff --git a/pango/pangocairo-private.h b/pango/pangocairo-private.h
index 74ab88cf..d739abff 100644
--- a/pango/pangocairo-private.h
+++ b/pango/pangocairo-private.h
@@ -36,7 +36,7 @@ struct _PangoCairoFontMapIface
GTypeInterface g_iface;
void (*set_resolution) (PangoCairoFontMap *fontmap,
- double dpi);
+ double dpi);
double (*get_resolution) (PangoCairoFontMap *fontmap);
PangoRenderer *(*get_renderer) (PangoCairoFontMap *fontmap);
};
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index de73ecf9..7a3985d3 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -50,7 +50,7 @@ typedef struct _FontHashKey FontHashKey;
struct _PangoFcFontMapPrivate
{
- GHashTable *fontset_hash; /* Maps PangoFontDescription -> PangoFcPatternSet */
+ GHashTable *fontset_hash; /* Maps PangoFontDescription -> PangoFcPatternSet */
/* pattern_hash is used to make sure we only store one copy of
* each identical pattern. (Speeds up lookup).
@@ -842,8 +842,8 @@ pango_fc_make_pattern (const PangoFontDescription *description,
#ifdef FC_VERTICAL_LAYOUT
FC_VERTICAL_LAYOUT, FcTypeBool, vertical,
#endif
- FC_SIZE, FcTypeDouble, pixel_size * (72. / dpi),
- FC_PIXEL_SIZE, FcTypeDouble, pixel_size,
+ FC_SIZE, FcTypeDouble, pixel_size * (72. / dpi),
+ FC_PIXEL_SIZE, FcTypeDouble, pixel_size,
NULL);
families = g_strsplit (pango_font_description_get_family (description), ",", -1);
diff --git a/pango/pangowin32.h b/pango/pangowin32.h
index 5831393b..18293993 100644
--- a/pango/pangowin32.h
+++ b/pango/pangowin32.h
@@ -98,7 +98,7 @@ void pango_win32_font_cache_free (PangoWin32FontCache *c
HFONT pango_win32_font_cache_load (PangoWin32FontCache *cache,
const LOGFONT *logfont);
void pango_win32_font_cache_unload (PangoWin32FontCache *cache,
- HFONT hfont);
+ HFONT hfont);
PangoFontMap *pango_win32_font_map_for_display (void);
void pango_win32_shutdown_display (void);
diff --git a/pango/pangoxft-font.c b/pango/pangoxft-font.c
index 9fd22d59..73e87104 100644
--- a/pango/pangoxft-font.c
+++ b/pango/pangoxft-font.c
@@ -399,9 +399,9 @@ xft_font_get_font (PangoFont *font)
{
gchar *name = pango_font_description_to_string (fcfont->description);
g_warning ("Cannot open font file for font %s", name);
- g_free (name);
+ g_free (name);
- load_fallback_font (xfont);
+ load_fallback_font (xfont);
}
}
diff --git a/pango/pangoxft-render.c b/pango/pangoxft-render.c
index 82333e2b..efaae64e 100644
--- a/pango/pangoxft-render.c
+++ b/pango/pangoxft-render.c
@@ -594,7 +594,7 @@ pango_xft_renderer_real_composite_glyphs (PangoXftRenderer *xftrenderer,
PangoColor *color = pango_renderer_get_color (PANGO_RENDERER (xftrenderer),
PANGO_RENDER_PART_FOREGROUND);
if (!color)
- color = &xftrenderer->priv->default_color;
+ color = &xftrenderer->priv->default_color;
xft_color.color.red = color->red;
xft_color.color.green = color->green;
diff --git a/tools/gen-script-for-lang.c b/tools/gen-script-for-lang.c
index 0e1f5f76..00d847aa 100644
--- a/tools/gen-script-for-lang.c
+++ b/tools/gen-script-for-lang.c
@@ -191,7 +191,7 @@ scripts_for_file (const char *base_dir,
if (comment)
*comment = '\0';
g_strstrip (str);
- if (str[0] != '\0') /* Empty */
+ if (str[0] != '\0') /* Empty */
scripts_for_line (base_dir, file_part, str, info);
g_free (str);
break;
View Lorry Controller Status