Kammu fixes

2 files changed, 50 insertions, 3 deletions

diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index 1d53fb0..5163d81 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -8248,2 +8248,47 @@ int main(int argc, char *argv[])
 
+    GSM_ReadConfig(NULL, &s.Config[0], 0);
+                s.ConfigNum = 1;
+    GSM_Config *con = &s.Config[0];
+
+    char* tempC;
+    tempC = argv[argc-1]+2;
+    if ( *tempC != 0 ) {
+        fprintf(stderr,"Using model %s \n",tempC);
+                strcpy(con->Model,tempC );
+     }
+    tempC = argv[argc-2]+2;
+    if ( *tempC != 0 ) {
+        fprintf(stderr,"Using device %s \n",tempC);
+        con->Device = strdup(tempC);
+                con->DefaultDevice = false;
+     }
+    tempC = argv[argc-3]+2;
+    if ( *tempC != 0 ) {
+        fprintf(stderr,"Using connection %s \n",tempC);
+        con->Connection = strdup(tempC);
+                con->DefaultConnection = false;
+     }
+    argc = argc-3;
+#if 0
+    if ( ! mConnection.isEmpty() ) {
+        cfg->Connection = strdup(mConnection.latin1());
+                cfg->DefaultConnection = false;
+        qDebug("Connection set %s ", cfg->Connection );
+
+    }
+    if ( ! mDevice.isEmpty() ) {
+        cfg->Device = strdup(mDevice.latin1());
+                cfg->DefaultDevice = false;
+        qDebug("Device  set %s ", cfg->Device);
+
+    }
+    if ( ! mModel.isEmpty() ) {
+                strcpy(cfg->Model,mModel.latin1() );
+                cfg->DefaultModel = false;
+        qDebug("Model  set %s ",cfg->Model );
+    }
+
+#endif
+
+#if 0
         cfg=GSM_FindGammuRC();
@@ -8307,3 +8352,3 @@ int main(int argc, char *argv[])
          }
- 
+#endif
         /* Do we have enough parameters? */
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 0bc9125..2ad1b5a 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -286,3 +286,4 @@ bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
 #endif
-    QString command ="./kammu --backup " + fileName + " -yes";
+    QString command ="./kammu --backup " + fileName + " -yes -C" + 
+        mConnection +" -D" + mDevice +" -M" + mModel;
     int ret = system (  command.latin1() );
@@ -490,3 +491,4 @@ bool PhoneFormat::save( Calendar *calendar)
     // 4 call kammu
-    QString command ="./kammu --restore " + fileName ;
+    QString command ="./kammu --restore " + fileName + "  -C" + 
+        mConnection +" -D" + mDevice +" -M" + mModel;;
     int ret = system (  command.latin1() );