diff options
| author | Owen Taylor <otaylor@redhat.com> | 2000-02-11 09:49:27 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2000-02-11 09:49:27 +0000 |
| commit | 6316f1a5c6e868f9e82fceebbb954346e2ba8839 (patch) | |
| tree | b584b7bd53efe3a00f1f15aaef1382da0c4390f4 /examples | |
| parent | 1b2e543aa5bc412062c97a9d37c4c5292604025f (diff) | |
| download | pango-6316f1a5c6e868f9e82fceebbb954346e2ba8839.tar.gz | |
Up version to match 0.6 release that was made yesterday.
Thu Feb 10 23:45:27 2000 Owen Taylor <otaylor@redhat.com>
* configure.in: Up version to match 0.6 release that
was made yesterday.
* examples/viewer.c (main): Look for fixed if sans
isn't found as an initial font.
* modules/Makefile.am: Add an install rule to
run pango-querymodules.
* modules/*/Makefile.am (module_LTLIBRARIES): Set up
appropriate install rules.
* libpango/Makefile.am: Break the X code out into a
separate library.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/viewer.c | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index dc6591cf..cd9fb182 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/libpango/ pango_viewer_SOURCES = \ viewer.c -pango_viewer_LDADD = ../libpango/libpango.la $(GTK_LIBS) -lfribidi $(UNICODE_LIBS) +pango_viewer_LDADD = ../libpango/libpango.la ../libpango/libpangox.la $(GTK_LIBS) -lfribidi $(UNICODE_LIBS) all-local: pango.modules diff --git a/examples/viewer.c b/examples/viewer.c index 4fe00d2a..4967a35e 100644 --- a/examples/viewer.c +++ b/examples/viewer.c @@ -1177,6 +1177,18 @@ main (int argc, char **argv) font_description.stretch = PANGO_STRETCH_NORMAL; font = pango_context_load_font (context, &font_description, font_size); + if (!font) + { + g_free (font_description.family_name); + font_description.family_name = g_strdup ("fixed"); + font = pango_context_load_font (context, &font_description, font_size); + + if (!font) + { + g_warning ("Can't load an initial font!\n"); + exit (1); + } + } /* Create the user interface */ |