many phonesync fixes

2 files changed, 35 insertions, 8 deletions

diff --git a/gammu/emb/common/service/gsmcal.c b/gammu/emb/common/service/gsmcal.c
index 598292c..ddf9790 100644
--- a/gammu/emb/common/service/gsmcal.c
+++ b/gammu/emb/common/service/gsmcal.c
@@ -143,5 +143,5 @@ GSM_Error GSM_EncodeVCALENDAR(char *Buffer, int *Length, GSM_CalendarEntry *note
                                 SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "DALARM");
                         } else {
-                                SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "AALARM");
+                                SaveVCALDateTime(Buffer, Length, &note->Entries[Alarm].Date, "DALARM");
                         }
                 }
diff --git a/gammu/emb/gammu/gammu.c b/gammu/emb/gammu/gammu.c
index 5163d81..a3b93a8 100644
--- a/gammu/emb/gammu/gammu.c
+++ b/gammu/emb/gammu/gammu.c
@@ -8242,9 +8242,10 @@ int main(int argc, char *argv[])
 
                 /* Is first parameter numeric? If so treat it as config that should be loaded. */
-        if (isdigit(argv[1][0])) {
-                only_config = atoi(argv[1]);
-                if (only_config >= 0) start++; else only_config = -1;
-        }
-
+        //if (isdigit(argv[1][0])) {
+    //only_config = atoi(argv[1]);
+    //if (only_config >= 0) start++; else only_config = -1;
+        //}
+    only_config = 0;;
+#if 0
     GSM_ReadConfig(NULL, &s.Config[0], 0);
                 s.ConfigNum = 1;
@@ -8270,5 +8271,5 @@ int main(int argc, char *argv[])
      }
     argc = argc-3;
-#if 0
+    //#if 0
     if ( ! mConnection.isEmpty() ) {
         cfg->Connection = strdup(mConnection.latin1());
@@ -8291,5 +8292,5 @@ int main(int argc, char *argv[])
 #endif
 
-#if 0
+
         cfg=GSM_FindGammuRC();
         for (i = 0; i <= MAX_CONFIG_NUM; i++) {
@@ -8316,4 +8317,5 @@ int main(int argc, char *argv[])
 
                 /* Wanted user specific configuration? */
+
                 if (only_config != -1) {
                         /* Here we get only in first for loop */
@@ -8351,5 +8353,29 @@ int main(int argc, char *argv[])
                 if (only_config != -1) {break;}
          }
+#if 0
+ 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;
+     }
 #endif
+    argc = argc-3;
+
+
         /* Do we have enough parameters? */
          if (argc == 1 + start) {
@@ -8370,4 +8396,5 @@ int main(int argc, char *argv[])
                 if (mystrncasecmp(Parameters[z].parameter,argv[1+start], 0)) {
                         if (argc-2-start >= Parameters[z].min_arg && argc-2-start <= Parameters[z].max_arg) {
+                fprintf(stderr,"Executing  \n");        
                                 Parameters[z].Function(argc - start, argv + start);
                                 break;