diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
| -rw-r--r-- | examples/viewer-qt.cc | 22 | ||||
| -rw-r--r-- | examples/viewer-qt.h | 2 | ||||
| -rw-r--r-- | pango/modules.c | 2 | ||||
| -rw-r--r-- | pango/pangox.c | 1 |
11 files changed, 83 insertions, 7 deletions
@@ -1,3 +1,12 @@ +Sat Jul 29 21:26:30 2000 Owen Taylor <otaylor@redhat.com> + + * examples/viewer-qt.[ch] (ViewerWindow): Remove + hardcoded path to my home directory! Allow specifying + the file on the command line. + + * pango/modules.c (process_module_file): Fix bug in + parsing of range strings. + 2000-07-31 Havoc Pennington <hp@redhat.com> * pango.pc.in, pangox.pc.in: pkg-config info files diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index b04c187e..0d023e6b 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,3 +1,12 @@ +Sat Jul 29 21:26:30 2000 Owen Taylor <otaylor@redhat.com> + + * examples/viewer-qt.[ch] (ViewerWindow): Remove + hardcoded path to my home directory! Allow specifying + the file on the command line. + + * pango/modules.c (process_module_file): Fix bug in + parsing of range strings. + 2000-07-31 Havoc Pennington <hp@redhat.com> * pango.pc.in, pangox.pc.in: pkg-config info files diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index b04c187e..0d023e6b 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +Sat Jul 29 21:26:30 2000 Owen Taylor <otaylor@redhat.com> + + * examples/viewer-qt.[ch] (ViewerWindow): Remove + hardcoded path to my home directory! Allow specifying + the file on the command line. + + * pango/modules.c (process_module_file): Fix bug in + parsing of range strings. + 2000-07-31 Havoc Pennington <hp@redhat.com> * pango.pc.in, pangox.pc.in: pkg-config info files diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index b04c187e..0d023e6b 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,12 @@ +Sat Jul 29 21:26:30 2000 Owen Taylor <otaylor@redhat.com> + + * examples/viewer-qt.[ch] (ViewerWindow): Remove + hardcoded path to my home directory! Allow specifying + the file on the command line. + + * pango/modules.c (process_module_file): Fix bug in + parsing of range strings. + 2000-07-31 Havoc Pennington <hp@redhat.com> * pango.pc.in, pangox.pc.in: pkg-config info files diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index b04c187e..0d023e6b 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +Sat Jul 29 21:26:30 2000 Owen Taylor <otaylor@redhat.com> + + * examples/viewer-qt.[ch] (ViewerWindow): Remove + hardcoded path to my home directory! Allow specifying + the file on the command line. + + * pango/modules.c (process_module_file): Fix bug in + parsing of range strings. + 2000-07-31 Havoc Pennington <hp@redhat.com> * pango.pc.in, pangox.pc.in: pkg-config info files diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index b04c187e..0d023e6b 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +Sat Jul 29 21:26:30 2000 Owen Taylor <otaylor@redhat.com> + + * examples/viewer-qt.[ch] (ViewerWindow): Remove + hardcoded path to my home directory! Allow specifying + the file on the command line. + + * pango/modules.c (process_module_file): Fix bug in + parsing of range strings. + 2000-07-31 Havoc Pennington <hp@redhat.com> * pango.pc.in, pangox.pc.in: pkg-config info files diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index b04c187e..0d023e6b 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +Sat Jul 29 21:26:30 2000 Owen Taylor <otaylor@redhat.com> + + * examples/viewer-qt.[ch] (ViewerWindow): Remove + hardcoded path to my home directory! Allow specifying + the file on the command line. + + * pango/modules.c (process_module_file): Fix bug in + parsing of range strings. + 2000-07-31 Havoc Pennington <hp@redhat.com> * pango.pc.in, pangox.pc.in: pkg-config info files diff --git a/examples/viewer-qt.cc b/examples/viewer-qt.cc index 0f5aeae0..8afc09e5 100644 --- a/examples/viewer-qt.cc +++ b/examples/viewer-qt.cc @@ -22,6 +22,7 @@ #include <string.h> #include <stdlib.h> +#include <stdio.h> #include <qapplication.h> #include <qcdestyle.h> @@ -165,7 +166,12 @@ ViewerView::readFile (const QString &name) { QFile file (name); - file.open (IO_ReadOnly); + if (!file.open (IO_ReadOnly)) + { + fprintf (stderr, "Cannot open file '%s'\n"); + return; + } + QTextStream ts (&file);; ts.setCodec (QTextCodec::codecForName ("utf8")); @@ -349,7 +355,7 @@ cmp_strings (const void *a, const void *b) return strcmp (*(const char **)a, *(const char **)b); } -ViewerWindow::ViewerWindow () +ViewerWindow::ViewerWindow (const QString &filename) { // Create menu @@ -401,7 +407,7 @@ ViewerWindow::ViewerWindow () fontChanged (); - view_->readFile ("/home/otaylor/devel/pango/examples/HELLO.utf8"); + view_->readFile (filename); resize (500, 500); } @@ -500,13 +506,19 @@ int main (int argc, char **argv) { QApplication a (argc, argv); + const char *filename; QApplication::setStyle (new QCDEStyle()); if (QFileInfo ("./pangorc").exists ()) putenv ("PANGO_RC_FILE=./pangorc"); - - ViewerWindow *vw = new ViewerWindow (); + + if (argc == 2) + filename = argv[1]; + else + filename = "HELLO.utf8"; + + ViewerWindow *vw = new ViewerWindow (filename); vw->show(); diff --git a/examples/viewer-qt.h b/examples/viewer-qt.h index c03a543d..c8d8001b 100644 --- a/examples/viewer-qt.h +++ b/examples/viewer-qt.h @@ -89,7 +89,7 @@ class ViewerWindow : public QMainWindow public: - ViewerWindow (); + ViewerWindow (const QString &filename); ~ViewerWindow (); private: diff --git a/pango/modules.c b/pango/modules.c index c31e4d3c..d7d3b838 100644 --- a/pango/modules.c +++ b/pango/modules.c @@ -261,7 +261,7 @@ process_module_file (FILE *module_file) q++; range->start = start; range->end = end; - range->langs = g_strdup (tmp_buf->str); + range->langs = g_strdup (q); ranges = g_list_prepend (ranges, range); } diff --git a/pango/pangox.c b/pango/pangox.c index 7aa3b638..d6467968 100644 --- a/pango/pangox.c +++ b/pango/pangox.c @@ -20,6 +20,7 @@ */ #include <string.h> +#include <stdlib.h> #include <math.h> #include <X11/Xlib.h> |