Hello community,
here is the log from the commit of package sax2
checked in at Mon Feb 18 01:13:09 CET 2008.
--------
--- sax2/sax2.changes 2008-02-15 15:03:27.000000000 +0100
+++ /mounts/work_src_done/STABLE/sax2/sax2.changes 2008-02-17 17:19:03.097839000 +0100
@@ -1,0 +2,10 @@
+Sun Feb 17 17:15:11 CET 2008 - ms@suse.de
+
+- added vboxmouse and vmmouse for _manual_ selection (bnc #358460)
+
+-------------------------------------------------------------------
+Sat Feb 16 18:28:56 CET 2008 - ms@suse.de
+
+- fixed xfine for qt4
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sax2.spec ++++++
--- /var/tmp/diff_new_pack.R16756/_old 2008-02-18 01:12:54.000000000 +0100
+++ /var/tmp/diff_new_pack.R16756/_new 2008-02-18 01:12:54.000000000 +0100
@@ -46,7 +46,7 @@
%endif
Summary: SuSE advanced X Window System-configuration
Version: 8.1
-Release: 352
+Release: 353
Group: System/X11/Utilities
License: GPL v2 or later
Source: sax2.tar.bz2
@@ -491,6 +491,10 @@
%endif
%changelog
+* Sun Feb 17 2008 ms@suse.de
+- added vboxmouse and vmmouse for _manual_ selection (bnc #358460)
+* Sat Feb 16 2008 ms@suse.de
+- fixed xfine for qt4
* Fri Feb 15 2008 ms@suse.de
- disabled hp-virt_man_dev.diff (bnc #355911, comment #8)
- hp-virt_man_dev.diff
++++++ sax2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/api/data/cdb/Pointers new/sax/api/data/cdb/Pointers
--- old/sax/api/data/cdb/Pointers 2008-02-15 14:44:22.000000000 +0100
+++ new/sax/api/data/cdb/Pointers 2008-02-17 17:04:23.000000000 +0100
@@ -481,6 +481,22 @@
}
# =========================================
+# Virtualbox vboxmouse
+# -----------------------------------------
+VirtualBox:vboxmouse {
+ Driver = vboxmouse
+ Device = /dev/input/mice
+}
+
+# =========================================
+# VMware vmmouse
+# -----------------------------------------
+VMware:vmmouse {
+ Driver = vmmouse
+ Device = /dev/input/mice
+}
+
+# =========================================
# Touchpads (NoteBooks)
# -----------------------------------------
Synaptics:Touchpad {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/svnbuild new/sax/svnbuild
--- old/sax/svnbuild 2008-02-15 15:03:08.000000000 +0100
+++ new/sax/svnbuild 2008-02-17 17:17:50.000000000 +0100
@@ -1 +1 @@
-1512
+1515
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/xfine/file.cpp new/sax/xfine/file.cpp
--- old/sax/xfine/file.cpp 2008-01-24 13:01:14.000000000 +0100
+++ new/sax/xfine/file.cpp 2008-02-16 18:17:21.000000000 +0100
@@ -78,11 +78,12 @@
//------------------------------------
Q3Dict<char> XFile::gtxRead (void) {
fileOpen ();
- char* line = 0;
+
+ char line[MAX_LINE_LENGTH];
QString *qVal;
char* key = NULL;
char* val = NULL;
- while ((mHandle->readLine(line,4096)) != 0) {
+ while ((mHandle->readLine(line,MAX_LINE_LENGTH)) != 0) {
QString string_line(line);
string_line.truncate(string_line.length()-1);
if ((string_line[0] == '#') || (string_line.isEmpty())) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/xfine/file.h new/sax/xfine/file.h
--- old/sax/xfine/file.h 2008-01-24 13:01:14.000000000 +0100
+++ new/sax/xfine/file.h 2008-02-16 18:17:21.000000000 +0100
@@ -29,6 +29,8 @@
#include "../api/common/log.h"
#include "config.h"
+#define MAX_LINE_LENGTH 8192
+
class XFile : public QFile {
private:
QString* mFileName;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/xfine/frame.cpp new/sax/xfine/frame.cpp
--- old/sax/xfine/frame.cpp 2008-01-24 13:01:14.000000000 +0100
+++ new/sax/xfine/frame.cpp 2008-02-16 18:17:21.000000000 +0100
@@ -61,7 +61,7 @@
// language support
// ---
mAdjustable = true;
- mTextPtr = new Q3Dict<char>;
+ mTextPtr = new Q3Dict<QString>;
loadText ();
// ...
@@ -108,7 +108,7 @@
void XFineWindow::setFrame (
int x,int y, bool adjustable,bool has3D
) {
- XWrapText< Q3Dict<char> > mText (mTextPtr);
+ XWrapText< Q3Dict<QString> > mText (mTextPtr);
setCaption ("XFine2");
setGeometry (
x - 225, y - 150, 450,300
@@ -321,7 +321,7 @@
// XFineWindow setup screen...
//-------------------------------------
void XFineWindow::initScreen (bool startup, bool adjustable) {
- XWrapText< Q3Dict<char> > mText (mTextPtr);
+ XWrapText< Q3Dict<QString> > mText (mTextPtr);
XQuery frq;
frq.setOption ("-f");
@@ -605,9 +605,10 @@
gtx = gtxHandle.gtxRead();
Q3DictIterator<char> it(gtx);
for (; it.current(); ++it) {
- mTextPtr -> insert (
- it.currentKey(),gettext((char*)it.current())
- );
+ QString* translation = new QString(
+ gettext((const char*)it.current())
+ );
+ mTextPtr->insert (it.currentKey(),translation);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/xfine/frame.h new/sax/xfine/frame.h
--- old/sax/xfine/frame.h 2008-01-24 13:01:14.000000000 +0100
+++ new/sax/xfine/frame.h 2008-02-16 18:17:21.000000000 +0100
@@ -77,7 +77,7 @@
int mVSyncStart,mVSyncStartSave;
int mVSyncEnd,mVSyncEndSave;
int mVTotal,mVTotalSave;
- Q3Dict<char>* mTextPtr;
+ Q3Dict<QString>* mTextPtr;
int mScreen;
int mStep;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/xfine/xfine.h new/sax/xfine/xfine.h
--- old/sax/xfine/xfine.h 2006-03-08 15:15:38.000000000 +0100
+++ new/sax/xfine/xfine.h 2008-02-16 18:17:20.000000000 +0100
@@ -47,8 +47,14 @@
void init (T* typ) {
pM = typ;
}
- QString operator[] (const char* key) {
- return(QString::fromLocal8Bit(pM->operator[](key)));
+ QString operator[] (const QString& key) {
+ if (pM->operator[](key)) {
+ return(QString::fromLocal8Bit( *pM->operator[](key) ));
+ }
+ return QString("");
+ }
+ void insert (const QString & key,QString* val) {
+ pM->insert (key,val);
}
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/sax/xfine/xquery.cpp new/sax/xfine/xquery.cpp
--- old/sax/xfine/xquery.cpp 2008-01-24 13:01:14.000000000 +0100
+++ new/sax/xfine/xquery.cpp 2008-02-16 18:17:21.000000000 +0100
@@ -112,18 +112,18 @@
//-------------------------------------
QList