[rkward-cvs] SF.net SVN: rkward:[2487] branches/release_branch_0.4.9

[tfry at users.sourceforge.net]

Revision: 2487
          http://rkward.svn.sourceforge.net/rkward/?rev=2487&view=rev
Author:   tfry
Date:     2009-05-18 16:48:13 +0000 (Mon, 18 May 2009)

Log Message:
-----------
Backport r2462

Modified Paths:
--------------
    branches/release_branch_0.4.9/ChangeLog
    branches/release_branch_0.4.9/rkward/settings/rksettingsmoduler.cpp

Property Changed:
----------------
    branches/release_branch_0.4.9/
    branches/release_branch_0.4.9/rkward/


Property changes on: branches/release_branch_0.4.9
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/rkward:2410
   + /trunk/rkward:2410,2462

Modified: branches/release_branch_0.4.9/ChangeLog
===================================================================
--- branches/release_branch_0.4.9/ChangeLog	2009-05-18 14:58:15 UTC (rev 2486)
+++ branches/release_branch_0.4.9/ChangeLog	2009-05-18 16:48:13 UTC (rev 2487)
@@ -1,4 +1,5 @@
 - Fix: Do not try to open mimetypes other than text/html directly in the help browser.
+- Fixed: Screen device in rkward was not seen as interactive by R
 
 --- Version 0.4.9b - May-10-2009
 - Workaround: Deactivate all filemanagement shortcuts in the File Browser. These would sometimes trigger when they should not.


Property changes on: branches/release_branch_0.4.9/rkward
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/rkward/rkward:2433
   + /trunk/rkward/rkward:2433,2462

Modified: branches/release_branch_0.4.9/rkward/settings/rksettingsmoduler.cpp
===================================================================
--- branches/release_branch_0.4.9/rkward/settings/rksettingsmoduler.cpp	2009-05-18 14:58:15 UTC (rev 2486)
+++ branches/release_branch_0.4.9/rkward/settings/rksettingsmoduler.cpp	2009-05-18 16:48:13 UTC (rev 2487)
@@ -2,7 +2,7 @@
                           rksettingsmoduler  -  description
                              -------------------
     begin                : Wed Jul 28 2004
-    copyright            : (C) 2004, 2007 by Thomas Friedrichsmeier
+    copyright            : (C) 2004, 2007, 2009 by Thomas Friedrichsmeier
     email                : tfry at users.sourceforge.net
  ***************************************************************************/
 
@@ -217,7 +217,9 @@
 	list.append ("options (printcmd=\"" + options_printcmd + "\")\n");
 
 #warning TODO make configurable
-	list.append ("options (device=rk.screen.device)\n");
+	list.append ("options (device=\"rk.screen.device\")\n");
+	// register as interactive
+	list.append ("try (deviceIsInteractive(name=\"rk.screen.device\"))\n");
 
 	return list;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.