gammu changes

5 files changed, 9 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index 1adfb2c..0b8997e 100644
--- a/Makefile
+++ b/Makefile
@@ -38,48 +38,49 @@ SUBDIRS_LDAP_PLUGIN = \
    kabc/plugins/ldap
 
 SUBDIRS_MICROMAIL = \
    kmicromail/libetpan \
    kmicromail/libmailwrapper \
    kmicromail
 
 SUBDIRS_GAMMU = \
    gammu/emb/common \
    gammu/emb/gammu
 
 SUBDIRS_PWMANAGER = \
    pwmanager/pwmanager
 
 SUBDIRS = \
    $(SUBDIRS_MICROKDE) \
    $(SUBDIRS_QTOPIA_PLUGIN) \
    $(SUBDIRS_OPIE_PLUGIN) \
    $(SUBDIRS_SHARP_PLUGIN) \
    $(SUBDIRS_LDAP_PLUGIN) \
    $(SUBDIRS_MICROMAIL) \
    $(SUBDIRS_GAMMU) \
    $(SUBDIRS_PWMANAGER) 
 
+
 all: build_microkde \
      build_qtopia_plugin \
      build_opie_plugin \
      build_sharp_plugin \
      build_ldap_plugin \
      build_micromail \
      build_gammu \
      build_pwmanager
 
 
 build_microkde: variable_test tmake
 	for i in $(SUBDIRS_MICROKDE); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 build_qtopia_plugin: build_microkde
 	for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \
           make -f Makefile$(PLATFORM) || exit 1; popd; \
           done
 
 build_opie_plugin: build_microkde
   ifdef BUILD_NO_OPIE_PLUGIN
 	@echo == opie plugin not build.
   else
@@ -180,105 +181,104 @@ variable_test: variable_info
   ifndef SHARPDTMSDK
 	@echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK)
 	$(error SHARPDTMSDK is not defined)
   endif
   endif
   ifdef BUILD_NO_GAMMU
 	@echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU)
   endif
   ifdef BUILD_NO_PWMANAGER
 	@echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER)
   endif
 	@echo --------------------------------------
 
 
 objects:
 	for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done
 	for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done
 	mkdir -p libical/lib/$(PLATFORM)
 
 clean:
 	rm -rf libical/lib/$(PLATFORM)/*;
 	for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\
           rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \
           done 
+
 install:
-    
+
 	cd bin/kdepim; make install
 	cp -r Pim $(QPEDIR)/apps
 	cp db2file/db2file $(QPEDIR)/bin/db2file
 	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
 	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
 	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
 	cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
     
-dist:
+dist: 
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *~
 	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
 	./mkipks kmicrokdelibs.control
 	./mkipks korganizer.control
 	./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	./mkipks kopiemail.control
   endif
 	./mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
-	./mkipks kammu.control
+	./mkipks phoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
 	./mkipks pwmanager.control
   endif
 	./mkipks pim_TAB_icon.control
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kabc/plugins/qtopia/Makefile$(PLATFORM) \
        kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM) \
        kmicromail/Makefile$(PLATFORM) \
        kmicromail/libetpan/Makefile$(PLATFORM) \
        kmicromail/libmailwrapper/Makefile$(PLATFORM) \
        gammu/emb/common/Makefile$(PLATFORM) \
        gammu/emb/gammu/Makefile$(PLATFORM) \
        pwmanager/pwmanager/Makefile$(PLATFORM) \
 
-
-
 qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro
 	cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM)
 
 microkde/Makefile$(PLATFORM): microkde/microkdeE.pro
 	cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM)
 
 libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro
 	cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM)
 
 
 libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro
 	cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM)
 
 kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro
 	cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM)
 
 korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro
 	cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM)
 
 libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro
 	cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM)
 
 libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro
 	cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM)
@@ -306,24 +306,25 @@ kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro
 
 kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro
 	cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM)
 
 kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro
 	cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM)
 
 kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro
 	cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM)
 
 kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro
 	cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM)
 
 kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro
 	cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM)
 
 gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro
 	cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM)
 
 gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro
 	cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM)
 
 pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro
 	cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM)
+
diff --git a/Makefile.Embedded b/Makefile.Embedded
index 2e1651c..0b8997e 100644
--- a/Makefile.Embedded
+++ b/Makefile.Embedded
@@ -205,49 +205,49 @@ clean:
 
 install:
 
 	cd bin/kdepim; make install
 	cp -r Pim $(QPEDIR)/apps
 	cp db2file/db2file $(QPEDIR)/bin/db2file
 	cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop
 	cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop
 	cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop
 	cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop
     
 dist: 
 	@echo Dont forget to do "make install" before "make dist"
 	rm -f *arm.ipk
 	rm -f *~
 	cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia  kdepim
 	./mkipks kmicrokdelibs.control
 	./mkipks korganizer.control
 	./mkipks kaddressbook.control
   ifndef BUILD_NO_MICROMAIL
 	./mkipks kopiemail.control
   endif
 	./mkipks korganizer-alarm.control
   ifndef BUILD_NO_GAMMU
-	./mkipks kammu.control
+	./mkipks phoneaccess.control
   endif
   ifndef BUILD_NO_PWMANAGER
 	./mkipks pwmanager.control
   endif
 	./mkipks pim_TAB_icon.control
 
 tmake: objects \
        qtcompat/Makefile$(PLATFORM) \
        microkde/Makefile$(PLATFORM) \
        libkcal/Makefile$(PLATFORM) \
        libkdepim/Makefile$(PLATFORM) \
        korganizer/Makefile$(PLATFORM) \
        kalarmd/Makefile$(PLATFORM) \
        libical/src/libical/Makefile$(PLATFORM) \
        libical/src/libicalss/Makefile$(PLATFORM) \
        kabc/Makefile$(PLATFORM) \
        kabc/formats/binary/Makefile$(PLATFORM) \
        kabc/plugins/file/Makefile$(PLATFORM) \
        kabc/plugins/dir/Makefile$(PLATFORM) \
        kabc/plugins/ldap/Makefile$(PLATFORM) \
        kabc/plugins/opie/Makefile$(PLATFORM) \
        kabc/plugins/qtopia/Makefile$(PLATFORM) \
        kabc/plugins/sharpdtm/Makefile$(PLATFORM) \
        kaddressbook/Makefile$(PLATFORM) \
diff --git a/bin/kdepim/korganizer/howtoSYNC.txt b/bin/kdepim/korganizer/howtoSYNC.txt
index c4e80f5..3cab446 100644
--- a/bin/kdepim/korganizer/howtoSYNC.txt
+++ b/bin/kdepim/korganizer/howtoSYNC.txt
@@ -287,49 +287,49 @@ b) Pi-Sync (direct Kx/Pi to Kx/Pi sync)
    Fill in the needed values:
    - Password for remote access:
      The password you specified on the remote device.
    - Remote IP address:
      The IP address of the remote device.
    - Remote port number:
      The port number you specified on the remote device.
    
    Now you can syncronize your local device easily with your 
    remote device. This works well for all platforms KO/Pi is 
    running on, e.g. syncing a KO/Pi on Zaurus with KO/Pi on Windows
    is now very easy.  
 
 c) Remote file
    Syncing with the profile kind "Remote file" is performed in three steps:
    i) download the remote file to your local machine to a temp file
    ii) sync with this temp file
    iii) upload the synced file to the remote device
 
    The down-/uploading if i) and iii) is done via a command line command.
    Please specify the download/upload command ( like scp, ftp, ...) and the
    file name of the temp file in the corresponding fields.  
 
 d) Mobile device (cell phone)
-   Note: On the Zaurus you have to install the kammu_xxx_arm.ipk package
+   Note: On the Zaurus you have to install the phoneaccess_xxx_arm.ipk package
          to be able to access mobile phones.
    We mention here only KO/Pi, but the same is valid for KA/Pi.
    Note:
    It is only possible to sync a mobile phone with one particular device
    running KO/Pi. If you want to be able to write data of more than one device
    to the mobile phone (e.g. from your Zaurus and from your Windows Laptop)
    do not sync with the mobile phone at all, but use the 
    "Export to phone" functionality from the different devices.
    Using "Export to phone" makes it not possible to get back data from the
    phone, if it was changed there, of course.
    If you sync with the phone, do not use "Export to phone" from any device.
    (And do not sync, as mentioned above, from any other device with that phone). 
    It would delete the needed information for syncing with that phone!
 
    We are using Gammu (Version: 0.98.9) ( http://freshmeat.net/projects/gammu/ ) 
    for accessing the phones. 
    Note: You cannot use the original Gammu for syncing KDE-Pim/Pi, because 
    we have modified the original version to make it useable for syncing!
    Gammu allows access to many phones in many ways (Irda, Bluetooth, serial,...).
    The recommended phone access using Gammu with KDE-Pim/Pi is Irda (infrared).
    Bluetooth access is disabled on the Zaurus, but may work on Windows.
    Please look at the Gammu homepage and documentation about more details 
    configuring Gammu how to access your phone.
    If you have problems accessing your phone, start KO/Pi from the konsole
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index c436b90..8db9afb 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -4030,49 +4030,49 @@ static void Backup(int argc, char *argv[])
 			strcat(Backup.Model,s.Phone.Data.ModelInfo->model);
 		} else {
 			strcat(Backup.Model,s.Phone.Data.Model);
 		}
 		strcat(Backup.Model," ");
 		strcat(Backup.Model,s.Phone.Data.Version);
 	}
 	if (Info.IMEI) {
 		error=Phone->GetIMEI(&s);
 		if (error != ERR_NOTSUPPORTED) {
 			strcpy(Backup.IMEI, s.Phone.Data.IMEI);
 			Print_Error(error);
 		} else {
 			Backup.IMEI[0] = 0;
 		}
 	}
 	printf("\n");
 
 	DoBackup = false;
 	if (Info.PhonePhonebook) {
 		printmsg("Checking phone phonebook\n");
 		MemStatus.MemoryType = MEM_ME;
 		error=Phone->GetMemoryStatus(&s, &MemStatus);
 		if (error==ERR_NONE && MemStatus.MemoryUsed != 0) {
-			if (answer_yes("   Backup phone phonebook")) DoBackup = true;
+			/*LRif (answer_yes("   Backup phone phonebook")) */DoBackup = true;
 		}
 	}
 	if (DoBackup) {		
 		Pbk.MemoryType  = MEM_ME;
 		i		= 1;
 		used 		= 0;
 		while (used != MemStatus.MemoryUsed) {
 			Pbk.Location = i;
 			error=Phone->GetMemory(&s, &Pbk);
 			if (error != ERR_EMPTY) {
 				Print_Error(error);
 				if (used < GSM_BACKUP_MAX_PHONEPHONEBOOK) {
 					Backup.PhonePhonebook[used] = malloc(sizeof(GSM_MemoryEntry));
 				        if (Backup.PhonePhonebook[used] == NULL) Print_Error(ERR_MOREMEMORY);
 					Backup.PhonePhonebook[used+1] = NULL;
 				} else {
 					printmsg("   Increase %s\n" , "GSM_BACKUP_MAX_PHONEPHONEBOOK");
 					GSM_Terminate();
 					exit(-1);
 				}
 				*Backup.PhonePhonebook[used]=Pbk;
 				used++;
 			}
 			printmsgerr("%c   Reading: %i percent",13,used*100/MemStatus.MemoryUsed);
diff --git a/kammu.control b/phoneaccess.control
index 07559e7..07559e7 100644
--- a/kammu.control
+++ b/phoneaccess.control