From c8508a346bd0d33126fef88406bab42320514abd Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Tue, 17 Jan 2006 10:11:42 +0000
Subject: opie-console: yet another CVS backport - fallback in configuration to
 fixed font from qpe.conf

---
 .../0117_opie-console-use-default-fixed.diff       | 25 ++++++++++++++++++++++
 packages/opie-console/opie-console_1.2.1.bb        |  5 +++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff

diff --git a/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff
new file mode 100644
index 0000000000..e871e8e1e4
--- /dev/null
+++ b/packages/opie-console/opie-console-1.2.1/0117_opie-console-use-default-fixed.diff
@@ -0,0 +1,25 @@
+Index: terminalwidget.cpp
+===================================================================
+RCS file: /cvs/opie/noncore/apps/opie-console/terminalwidget.cpp,v
+retrieving revision 1.12
+diff -u -u -r1.12 terminalwidget.cpp
+--- opie-console/terminalwidget.cpp	16 Oct 2004 21:06:28 -0000	1.12
++++ opie-console/terminalwidget.cpp	17 Jan 2006 10:00:13 -0000
+@@ -1,4 +1,5 @@
+ #include "terminalwidget.h"
++#include <qpe/config.h>
+ 
+ /* QT */
+ #include <qlabel.h>
+@@ -151,8 +152,10 @@
+         break;
+     };
+ 
++    Config qpecfg("qpe");
++    qpecfg.setGroup("Appearance");
+ 
+-    m_fontSelector->setSelectedFont( prof.readEntry( "Font"), prof.readEntry( "FontStyle"), prof.readNumEntry( "FontSize"  ), prof.readEntry( "FontCharset") );
++    m_fontSelector->setSelectedFont( prof.readEntry( "Font", qpecfg.readEntry("FixedFontFamily")), prof.readEntry( "FontStyle", qpecfg.readEntry("FixedFontStyle")), prof.readNumEntry( "FontSize" , qpecfg.readNumEntry("FixedFontStyle")), prof.readEntry( "FontCharset") );
+ 
+ //     switch( fontsize ) {
+ //     case Profile::Micro:
diff --git a/packages/opie-console/opie-console_1.2.1.bb b/packages/opie-console/opie-console_1.2.1.bb
index b9ba9e0e43..061c489c7e 100644
--- a/packages/opie-console/opie-console_1.2.1.bb
+++ b/packages/opie-console/opie-console_1.2.1.bb
@@ -1,9 +1,10 @@
 include ${PN}.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
 	   file://1686-bugfix.patch;patch=1 \
-	   file://1647-bugfix.patch;patch=1"
+	   file://1647-bugfix.patch;patch=1 \
+	   file://0117_opie-console-use-default-fixed.diff;patch=1"
-- 
cgit v1.2.3