merge of 8f7f4f1a6f08da91c5fe2312650063893394888b

     and f69ed55f40216d16d8f1cb7559d13b46385991b2

1 files changed, 0 insertions, 40 deletions

diff --git a/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch b/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch
deleted file mode 100644
index c4603333cf..0000000000
--- a/packages/opie-console/opie-console-1.2.1/1647-bugfix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: opie-console/TEWidget.cpp
-===================================================================
-RCS file: /cvs/opie/noncore/apps/opie-console/TEWidget.cpp,v
-retrieving revision 1.13
-retrieving revision 1.14
-diff -u -u -r1.13 -r1.14
---- opie-console/TEWidget.cpp	21 Jan 2005 19:56:17 -0000	1.13
-+++ opie-console/TEWidget.cpp	18 Oct 2005 13:56:12 -0000	1.14
-@@ -320,16 +320,21 @@
- 
-   Config cfg("Konsole");
-   cfg.setGroup("ScrollBar");
--  switch( cfg.readNumEntry("Position",2)){
--  case 0:
--      scrollLoc = SCRNONE;
--      break;
--  case 1:
--      scrollLoc = SCRLEFT;
--      break;
--  case 2:
--      scrollLoc = SCRRIGHT;
--      break;
-+  
-+  scrollLoc = cfg.readNumEntry("Position", -1);
-+
-+  // bugfix for #1647
-+  // if user set 'show scrollbar on left' then let it be on left
-+  // but only if it is not set in opie-console itself
-+  if(scrollLoc == -1)
-+  {
-+      Config qpecfg ("qpe");
-+      qpecfg.setGroup("Appearance");
-+      scrollLoc = qpecfg.readNumEntry("LeftHand", SCRRIGHT);
-+      if(scrollLoc == 0)    // user set LeftHand in past and switched it off later
-+      {
-+	  scrollLoc = SCRRIGHT;
-+      }
-   };
- 
-   blinkT   = new QTimer(this);