3 files changed, 14 insertions, 62 deletions

diff --git a/bin/kdepim/LICENCE.TXT b/bin/kdepim/LICENCE.TXT
index 4d564f3..10e09f7 100644
--- a/bin/kdepim/LICENCE.TXT
+++ b/bin/kdepim/LICENCE.TXT
@@ -89,253 +89,194 @@
  
    2. You may modify your copy or copies of the Program or any portion
  of it, thus forming a work based on the Program, and copy and
  distribute such modifications or work under the terms of Section 1
  above, provided that you also meet all of these conditions:
  
      a) You must cause the modified files to carry prominent notices
      stating that you changed the files and the date of any change.
  
      b) You must cause any work that you distribute or publish, that in
      whole or in part contains or is derived from the Program or any
      part thereof, to be licensed as a whole at no charge to all third
      parties under the terms of this License.
  
      c) If the modified program normally reads commands interactively
      when run, you must cause it, when started running for such
      interactive use in the most ordinary way, to print or display an
      announcement including an appropriate copyright notice and a
      notice that there is no warranty (or else, saying that you provide
      a warranty) and that users may redistribute the program under
      these conditions, and telling the user how to view a copy of this
      License.  (Exception: if the Program itself is interactive but
      does not normally print such an announcement, your work based on
      the Program is not required to print an announcement.)
  
  These requirements apply to the modified work as a whole.  If
  identifiable sections of that work are not derived from the Program,
  and can be reasonably considered independent and separate works in
  themselves, then this License, and its terms, do not apply to those
  sections when you distribute them as separate works.  But when you
  distribute the same sections as part of a whole which is a work based
  on the Program, the distribution of the whole must be on the terms of
  this License, whose permissions for other licensees extend to the
  entire whole, and thus to each and every part regardless of who wrote it.
  
  Thus, it is not the intent of this section to claim rights or contest
  your rights to work written entirely by you; rather, the intent is to
  exercise the right to control the distribution of derivative or
  collective works based on the Program.
  
  In addition, mere aggregation of another work not based on the Program
  with the Program (or with a work based on the Program) on a volume of
  a storage or distribution medium does not bring the other work under
  the scope of this License.
  
    3. You may copy and distribute the Program (or a work based on it,
  under Section 2) in object code or executable form under the terms of
  Sections 1 and 2 above provided that you also do one of the following:
  
      a) Accompany it with the complete corresponding machine-readable
      source code, which must be distributed under the terms of Sections
      1 and 2 above on a medium customarily used for software interchange; or,
  
      b) Accompany it with a written offer, valid for at least three
      years, to give any third party, for a charge no more than your
      cost of physically performing source distribution, a complete
      machine-readable copy of the corresponding source code, to be
      distributed under the terms of Sections 1 and 2 above on a medium
      customarily used for software interchange; or,
  
      c) Accompany it with the information you received as to the offer
      to distribute corresponding source code.  (This alternative is
      allowed only for noncommercial distribution and only if you
      received the program in object code or executable form with such
      an offer, in accord with Subsection b above.)
  
  The source code for a work means the preferred form of the work for
  making modifications to it.  For an executable work, complete source
  code means all the source code for all modules it contains, plus any
  associated interface definition files, plus the scripts used to
  control compilation and installation of the executable.  However, as a
  special exception, the source code distributed need not include
  anything that is normally distributed (in either source or binary
  form) with the major components (compiler, kernel, and so on) of the
  operating system on which the executable runs, unless that component
  itself accompanies the executable.
  
  If distribution of executable or object code is made by offering
  access to copy from a designated place, then offering equivalent
  access to copy the source code from the same place counts as
  distribution of the source code, even though third parties are not
  compelled to copy the source along with the object code.
  
    4. You may not copy, modify, sublicense, or distribute the Program
  except as expressly provided under this License.  Any attempt
  otherwise to copy, modify, sublicense or distribute the Program is
  void, and will automatically terminate your rights under this License.
  However, parties who have received copies, or rights, from you under
  this License will not have their licenses terminated so long as such
  parties remain in full compliance.
  
    5. You are not required to accept this License, since you have not
  signed it.  However, nothing else grants you permission to modify or
  distribute the Program or its derivative works.  These actions are
  prohibited by law if you do not accept this License.  Therefore, by
  modifying or distributing the Program (or any work based on the
  Program), you indicate your acceptance of this License to do so, and
  all its terms and conditions for copying, distributing or modifying
  the Program or works based on it.
  
    6. Each time you redistribute the Program (or any work based on the
  Program), the recipient automatically receives a license from the
  original licensor to copy, distribute or modify the Program subject to
  these terms and conditions.  You may not impose any further
  restrictions on the recipients' exercise of the rights granted herein.
  You are not responsible for enforcing compliance by third parties to
  this License.
  
    7. If, as a consequence of a court judgment or allegation of patent
  infringement or for any other reason (not limited to patent issues),
  conditions are imposed on you (whether by court order, agreement or
  otherwise) that contradict the conditions of this License, they do not
  excuse you from the conditions of this License.  If you cannot
  distribute so as to satisfy simultaneously your obligations under this
  License and any other pertinent obligations, then as a consequence you
  may not distribute the Program at all.  For example, if a patent
  license would not permit royalty-free redistribution of the Program by
  all those who receive copies directly or indirectly through you, then
  the only way you could satisfy both it and this License would be to
  refrain entirely from distribution of the Program.
  
  If any portion of this section is held invalid or unenforceable under
  any particular circumstance, the balance of the section is intended to
  apply and the section as a whole is intended to apply in other
  circumstances.
  
  It is not the purpose of this section to induce you to infringe any
  patents or other property right claims or to contest validity of any
  such claims; this section has the sole purpose of protecting the
  integrity of the free software distribution system, which is
  implemented by public license practices.  Many people have made
  generous contributions to the wide range of software distributed
  through that system in reliance on consistent application of that
  system; it is up to the author/donor to decide if he or she is willing
  to distribute software through any other system and a licensee cannot
  impose that choice.
  
  This section is intended to make thoroughly clear what is believed to
  be a consequence of the rest of this License.
  
    8. If the distribution and/or use of the Program is restricted in
  certain countries either by patents or by copyrighted interfaces, the
  original copyright holder who places the Program under this License
  may add an explicit geographical distribution limitation excluding
  those countries, so that distribution is permitted only in or among
  countries not thus excluded.  In such case, this License incorporates
  the limitation as if written in the body of this License.
  
    9. The Free Software Foundation may publish revised and/or new versions
  of the General Public License from time to time.  Such new versions will
  be similar in spirit to the present version, but may differ in detail to
  address new problems or concerns.
  
  Each version is given a distinguishing version number.  If the Program
  specifies a version number of this License which applies to it and "any
  later version", you have the option of following the terms and conditions
  either of that version or of any later version published by the Free
  Software Foundation.  If the Program does not specify a version number of
  this License, you may choose any version ever published by the Free Software
  Foundation.
  
    10. If you wish to incorporate parts of the Program into other free
  programs whose distribution conditions are different, write to the author
  to ask for permission.  For software which is copyrighted by the Free
  Software Foundation, write to the Free Software Foundation; we sometimes
  make exceptions for this.  Our decision will be guided by the two goals
  of preserving the free status of all derivatives of our free software and
  of promoting the sharing and reuse of software generally.
  
                             NO WARRANTY
  
    11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
  FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
  OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
  PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
  OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
  TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
  PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
  REPAIR OR CORRECTION.
  
    12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
  WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
  REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
  INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
  OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
  TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
  YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
  PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGES.
  
                      END OF TERMS AND CONDITIONS
- 
-             How to Apply These Terms to Your New Programs
- 
-   If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
- free software which everyone can redistribute and change under these terms.
- 
-   To do so, attach the following notices to the program.  It is safest
- to attach them to the start of each source file to most effectively
- convey the exclusion of warranty; and each file should have at least
- the "copyright" line and a pointer to where the full notice is found.
- 
-     <one line to give the program's name and a brief idea of what it does.>
-     Copyright (C) <year>  <name of author>
- 
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; either version 2 of the License, or
-     (at your option) any later version.
- 
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
- 
-     You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- 
- Also add information on how to contact you by electronic and paper mail.
- 
- If the program is interactive, make it output a short notice like this
- when it starts in an interactive mode:
- 
-     Gnomovision version 69, Copyright (C) year name of author
-     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-     This is free software, and you are welcome to redistribute it
-     under certain conditions; type `show c' for details.
- 
- The hypothetical commands `show w' and `show c' should show the appropriate
- parts of the General Public License.  Of course, the commands you use may
- be called something other than `show w' and `show c'; they could even be
- mouse-clicks or menu items--whatever suits your program.
- 
- You should also get your employer (if you work as a programmer) or your
- school, if any, to sign a "copyright disclaimer" for the program, if
- necessary.  Here is a sample; alter the names:
- 
-   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-   `Gnomovision' (which makes passes at compilers) written by James Hacker.
- 
-   <signature of Ty Coon>, 1 April 1989
-   Ty Coon, President of Vice
  
- This General Public License does not permit incorporating your program into
- proprietary programs.  If your program is a subroutine library, you may
- consider it more useful to permit linking proprietary applications with the
- library.  If this is what you want to do, use the GNU Library General
- Public License instead of this License.
  
\ No newline at end of file
diff --git a/gammu/emb/gammu/gammu.pro b/gammu/emb/gammu/gammu.pro
index 299de7f..22476a1 100644
--- a/gammu/emb/gammu/gammu.pro
+++ b/gammu/emb/gammu/gammu.pro
@@ -1,52 +1,62 @@
 ######################################################################
 # Automatically generated by qmake (1.07a) Fri Jul 30 22:22:02 2004
 ######################################################################
 
 TEMPLATE = app
 DEPENDPATH += msvc06.mak \
               msvc2003.mak \
               smsd \
               depend/nokia \
               depend/siemens \
               depend/nokia/dct3trac
 INCLUDEPATH += . smsd depend/nokia depend/nokia/dct3trac depend/siemens
         CONFIG          =  warn_off release console
 # Input
 
 HEADERS += gammu.h \
            sniff.h \
            smsd/s_files.h \
            smsd/s_mysql.h \
            smsd/smsdcore.h \
            depend/nokia/dct3.h \
            depend/nokia/dct4.h \
            depend/siemens/chiffre.h \
            depend/siemens/dsiemens.h \
            depend/nokia/dct3trac/type-cc.h \
            depend/nokia/dct3trac/type-mm.h \
            depend/nokia/dct3trac/type-rr.h \
            depend/nokia/dct3trac/type-sms.h \
            depend/nokia/dct3trac/type-ss.h \
            depend/nokia/dct3trac/wmx-gsm.h \
            depend/nokia/dct3trac/wmx-list.h \
            depend/nokia/dct3trac/wmx-sim.h \
            depend/nokia/dct3trac/wmx-util.h \
            depend/nokia/dct3trac/wmx.h
 SOURCES += gammu.c \
            sniff.c \
            smsd/s_files.c \
            smsd/smsdcore.c \
            depend/nokia/dct3.c \
            depend/nokia/dct4.c \
            depend/siemens/chiffre.c \
            depend/siemens/dsiemens.c \
            depend/nokia/dct3trac/wmx-gsm.c \
            depend/nokia/dct3trac/wmx-list.c \
            depend/nokia/dct3trac/wmx-sim.c \
            depend/nokia/dct3trac/wmx-util.c \
            depend/nokia/dct3trac/wmx.c
-
+unix : {
 LIBS +=      ../../../bin/libmicrogammu.so /usr/lib/libbluetooth.so  /usr/lib/libsdp.so  /usr/lib/libpthread.so
-DESTDIR = ../../../bin
 OBJECTS_DIR = obj/unix
-TARGET = kammu
\ No newline at end of file
+}
+win32 : {
+        CONFIG  = qt warn_on 
+#LIBS += mfc71u.lib
+LIBS += libc.lib
+#LIBS += msvcrt.lib
+QMAKE_LINK += /NODEFAULTLIB:msvcrt
+LIBS +=      ../../../bin/microgammu.lib
+OBJECTS_DIR = obj/win
+}
+DESTDIR = ../../../bin
+TARGET = kammu
diff --git a/kaddressbook/mainembedded.cpp b/kaddressbook/mainembedded.cpp
index 4230c07..4f48850 100644
--- a/kaddressbook/mainembedded.cpp
+++ b/kaddressbook/mainembedded.cpp
@@ -1,203 +1,204 @@
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #include <stdlib.h>
 #else
 #include <qapplication.h>
 #include <qwindowsstyle.h>
 #include <qplatinumstyle.h>
 #include <qmainwindow.h>
 #endif
 
 #include <kstandarddirs.h>
+#include <qregexp.h>
 #include <kglobal.h>
 #include <stdio.h>
 #include <qdir.h>
 #include "kaddressbookmain.h"
 #include "externalapphandler.h"
 
 int main( int argc, char **argv )
 {
 #ifndef DESKTOP_VERSION
   QPEApplication a( argc, argv );
   a.setKeepRunning ();
 #else
   QApplication a( argc, argv );
   QApplication::setStyle( new QPlatinumStyle ());
   QString hdir = QDir::homeDirPath();
   // there is a bug when creating dirs for WIN 98
   // it is difficult to fix, because we have no WIN 98 runnung
   // such that we try it to create the dirs at startup here
   if ( hdir == "C:\\" ) { // win 98 or ME
        QDir app_dir;
        if ( !app_dir.exists("C:\\kdepim") )
            app_dir.mkdir ("C:\\kdepim");
        if ( !app_dir.exists("C:\\kdepim\\apps") )
            app_dir.mkdir ("C:\\kdepim\\apps");
        if ( !app_dir.exists("C:\\kdepim\\config") )
            app_dir.mkdir ("C:\\kdepim\\config");
        if ( !app_dir.exists("C:\\kdepim\\apps\\kaddressbook") )
            app_dir.mkdir ("C:\\kdepim\\apps\\kaddressbook");
   }
 #endif
 
   bool exitHelp = false;
   if ( argc > 1 ) {
       QString command = argv[1];
       if (  command == "-help" ){
           printf("KA/E command line commands:\n");
           printf("  no command: Start KA/E in usual way\n");
           printf("  -help: This output\n");
           printf(" KA/E is exiting now. Bye!\n");
           exitHelp = true;
       }
   }
   if ( ! exitHelp ) {
 
     KGlobal::setAppName( "kaddressbook" );
 #ifndef DESKTOP_VERSION
     if ( QApplication::desktop()->width() > 320 )
         KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons22/");
     else
         KGlobal::iconLoader()->setIconPath(QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/icons16/");
 #else
       QString fileName ;
       fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/icons22/";
       KGlobal::iconLoader()->setIconPath(QDir::convertSeparators(fileName));
       QApplication::addLibraryPath ( qApp->applicationDirPath () );
 
 #endif
       KStandardDirs::setAppDir( QDir::convertSeparators(locateLocal("data", "kaddressbook")));
        KAddressBookMain m ;
 //US      MainWindow m;
       QObject::connect(&a, SIGNAL (appMessage ( const QCString &, const QByteArray & )), ExternalAppHandler::instance(), SLOT (appMessage ( const QCString &, const QByteArray & )));
 
       {
           KConfig kon ( locateLocal( "config", "korganizerrc" ) );
           kon.setGroup("Locale"); 
           KGlobal::locale()->setIntDateFormat( (KLocale::IntDateFormat)kon.readNumEntry( "PreferredDate",0) );
           QString dummy = kon.readEntry( "UserDateFormatShort","%aK %d.%m.%y" );//  kon.readEntry( "");
           KGlobal::locale()->setHore24Format( !kon.readBoolEntry( "PreferredTime",0 ) );
           KGlobal::locale()->setDateFormatShort(dummy.replace( QRegExp("K"), QString(",") ));
           dummy =  kon.readEntry( "UserDateFormatLong","%A %d %b %y" );
           KGlobal::locale()->setDateFormat(dummy.replace( QRegExp("K"), QString(",") ));
           kon.setGroup("Time & Date");
           KGlobal::locale()->setDaylightSaving( kon.readBoolEntry( "UseDaylightsaving", true ),
                                                 kon.readNumEntry( "DaylightsavingStart", 90),
                                                 kon.readNumEntry( "DaylightsavingEnd",304) );
           KGlobal::locale()->setTimezone( kon.readEntry( "TimeZoneName" ," 00:00 Europe/London(UTC)") );
       }
 #ifndef DESKTOP_VERSION
        a.showMainWidget( &m );
 #else
       a.setMainWidget( &m );
       m.resize (640, 480 );
       m.show();
 #endif
       a.exec();
 
   }
   qDebug("KA: Bye! ");
 }
 
 /*
 #include <stdlib.h>
 
 #include <qstring.h>
 
 #include <kabc/stdaddressbook.h>
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <kcrash.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstartupinfo.h>
 #include <kuniqueapplication.h>
 #include <kwin.h>
 
 #include "kaddressbookmain.h"
 #include "kabcore.h"
 
 extern "C" {
 
 void crashHandler( int )
 {
   KABC::StdAddressBook::handleCrash();
   ::exit( 0 );
 }
 
 }
 
 class KAddressBookApp : public KUniqueApplication {
   public:
     KAddressBookApp() : mMainWin( 0 ) {}
     ~KAddressBookApp() {}
 
     int newInstance();
 
   private:
     KAddressBookMain *mMainWin;
 };
 
 int KAddressBookApp::newInstance()
 {
   if ( isRestored() ) {
     // There can only be one main window
     if ( KMainWindow::canBeRestored( 1 ) ) {
       mMainWin = new KAddressBookMain;
       mMainWin->show();
       mMainWin->restore( 1 );
     }
   } else {
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
     QCString addrStr = args->getOption( "addr" );
     QCString uidStr = args->getOption( "uid" );
     QString addr;
     QString uid;
     if ( !addrStr.isEmpty() )
       addr = QString::fromLocal8Bit( addrStr );
     if ( !uidStr.isEmpty() )
       uid = QString::fromLocal8Bit( uidStr );
 
 
     if ( args->isSet( "editor-only" ) ) {
       if ( !mMainWin )
         mMainWin = new KAddressBookMain;
         KStartupInfo::appStarted();
         mMainWin->hide();
     } else {
       if ( mMainWin ) {
         mMainWin->show();
         KWin::setActiveWindow( mMainWin->winId() );
       } else {
         mMainWin = new KAddressBookMain;
         mMainWin->show();
       }
     }
     // Can not see why anyone would pass both a uid and an email address, so I'll leave it that two contact editors will show if they do
     if ( !addr.isEmpty() )
       mMainWin->addEmail( addr );
 
     if ( !uid.isEmpty() )
       mMainWin->showContactEditor( uid );
     if ( args->isSet( "new-contact" ) ) {
       mMainWin->newContact();
     }
   }
 
   KCrash::setEmergencySaveFunction( crashHandler );
 
   return 0;
 }
 
 // the dummy argument is required, because KMail apparently sends an empty
 // argument.
 static KCmdLineOptions kmoptions[] =
 {
   { "a", 0 , 0 },
   { "addr <email>", I18N_NOOP( "Shows contact editor with given email address" ), 0 },
   { "uid <uid>", I18N_NOOP( "Shows contact editor with given uid" ), 0 },
   { "editor-only", I18N_NOOP( "Launches in editor only mode" ), 0 },
   { "new-contact", I18N_NOOP( "Launches editor for the new contact" ), 0 },
   { "+[argument]", I18N_NOOP( "dummy argument" ), 0},
   { 0, 0, 0}