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
@@ -7865,492 +7865,537 @@ static GSM_Parameters Parameters[] = {
                 {"--sendsms",                   2,30, SendSaveDisplaySMS,       {H_SMS,H_ToDo,0},       "TODO destination file location " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
                 {"--sendsms",                   2,30, SendSaveDisplaySMS,       {H_SMS,H_Memory,0},     "VCARD10|VCARD21 destination file SM|ME location [-nokia]" SMS_SEND_OPTIONS SMS_COMMON_OPTIONS},
 #endif
                 {"--sendsms",                   2,30, SendSaveDisplaySMS,       {H_SMS,H_Settings,0},   "PROFILE destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS ""SMS_PROFILE_OPTIONS},
                 {"--sendsms",                   2,30, SendSaveDisplaySMS,       {H_SMS,0},              "EMS destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_EMS_OPTIONS},
                 {"--sendsms",                   2,30, SendSaveDisplaySMS,       {H_SMS,0},              "SMSTEMPLATE destination " SMS_SEND_OPTIONS SMS_COMMON_OPTIONS SMS_SMSTEMPLATE_OPTIONS},
 
                 {"--displaysms",                2,30, SendSaveDisplaySMS,       {H_SMS,0},              "... (options like in sendsms)"},
 
                 {"--addsmsfolder",              1, 1, AddSMSFolder,             {H_SMS,0},              "name"},
 #ifdef HAVE_MYSQL_MYSQL_H
                 {"--smsd",                      2, 2, SMSDaemon,                {H_SMS,H_Other,0},      "MYSQL configfile"},
 #endif
                 {"--smsd",                      2, 2, SMSDaemon,                {H_SMS,H_Other,0},      "FILES configfile"},
                 {"--sendsmsdsms",               2,30, SendSaveDisplaySMS,       {H_SMS,H_Other,0},      "TEXT|WAPSETTINGS|... destination FILES|MYSQL configfile ... (options like in sendsms)"},
                 {"--getringtone",               1, 2, GetRingtone,              {H_Ringtone,0},                 "location [file]"},
                 {"--getphoneringtone",          1, 2, GetRingtone,              {H_Ringtone,0},                 "location [file]"},
                 {"--getringtoneslist",          0, 0, GetRingtonesList,                 {H_Ringtone,0},                 ""},
                 {"--setringtone",               1, 6, SetRingtone,              {H_Ringtone,0},                 "file [-location location][-scale][-name name]"},
                 {"--nokiacomposer",             1, 1, NokiaComposer,            {H_Ringtone,H_Nokia,0},         "file"},
                 {"--copyringtone",              2, 3, CopyRingtone,             {H_Ringtone,0},                 "source destination [RTTL|BINARY]"},
                 {"--getussd",                   1, 1, GetUSSD,                  {H_Call,0},             "code"},
                 {"--dialvoice",                         1, 2, DialVoice,                {H_Call,0},             "number [show|hide]"},
                 {"--getspeeddial",              1, 2, GetSpeedDial,             {H_Call,H_Memory,0},    "start [stop]"},
                 {"--cancelcall",                0, 1, CancelCall,               {H_Call,0},             "[ID]"},
                 {"--answercall",                0, 1, AnswerCall,               {H_Call,0},             "[ID]"},
                 {"--unholdcall",                1, 1, UnholdCall,               {H_Call,0},             "ID"},
                 {"--holdcall",                  1, 1, HoldCall,                         {H_Call,0},             "ID"},
                 {"--conferencecall",            1, 1, ConferenceCall,           {H_Call,0},             "ID"},
                 {"--splitcall",                         1, 1, SplitCall,                {H_Call,0},             "ID"},
                 {"--switchcall",                0, 1, SwitchCall,               {H_Call,0},             "[ID]"},
                 {"--transfercall",              0, 1, TransferCall,             {H_Call,0},             "[ID]"},
                 {"--divert",                    3, 5, CallDivert,               {H_Call,0},             "get|set all|busy|noans|outofreach all|voice|fax|data [number timeout]"},
                 {"--canceldiverts",             0, 0, CancelAllDiverts,                 {H_Call,0},             ""},
                 {"--senddtmf",                  1, 1, SendDTMF,                         {H_Call,0},             "sequence"},
                 {"--getcalendarsettings",       0, 0, GetCalendarSettings,      {H_Calendar,H_Settings,0},""},
                 {"--getalltodo",                0, 0, GetAllToDo,               {H_ToDo,0},             ""},
                 {"--listtodocategory",          1, 1, ListToDoCategory,                 {H_ToDo, H_Category,0},         "text|number"},
                 {"--gettodo",                   1, 2, GetToDo,                  {H_ToDo,0},             "start [stop]"},
                 {"--deletetodo",                1, 2, DeleteToDo,               {H_ToDo,0},             "start [stop]"},
                 {"--getnote",                   1, 2, GetNote,                  {H_Note,0},             "start [stop]"},
                 {"--deletecalendar",            1, 2, DeleteCalendar,           {H_Calendar,0},                 "start [stop]"},
                 {"--getallcalendar",            0, 0, GetAllCalendar,           {H_Calendar,0},                 ""},
                 {"--getcalendar",               1, 2, GetCalendar,              {H_Calendar,0},                 "start [stop]"},
                 {"--getcategory",               2, 3, GetCategory,              {H_Category,H_ToDo,H_Memory,0},"TODO|PHONEBOOK start [stop]"},
                 {"--getallcategory",            1, 1, GetAllCategories,         {H_Category,H_ToDo,H_Memory,0},"TODO|PHONEBOOK"},
                 {"--reset",                     1, 1, Reset,                    {H_Other,0},            "SOFT|HARD"},
                 {"--getprofile",                1, 2, GetProfile,               {H_Settings,0},                 "start [stop]"},
                 {"--getsecuritystatus",                 0, 0, GetSecurityStatus,        {H_Info,0},             ""},
                 {"--entersecuritycode",                 2, 2, EnterSecurityCode,        {H_Other,0},            "PIN|PUK|PIN2|PUK2 code"},
                 {"--deletewapbookmark",         1, 2, DeleteWAPBookmark,        {H_WAP,0},              "start [stop]"},
                 {"--getwapbookmark",            1, 2, GetWAPBookmark,           {H_WAP,0},              "start [stop]"},
                 {"--getwapsettings",            1, 2, GetWAPMMSSettings,        {H_WAP,0},              "start [stop]"},
                 {"--getmmssettings",            1, 2, GetWAPMMSSettings,        {H_MMS,0},              "start [stop]"},
                 {"--getsyncmlsettings",                 1, 2, GetSyncMLSettings,        {H_WAP,0},              "start [stop]"},
                 {"--getchatsettings",           1, 2, GetChatSettings,          {H_WAP,0},              "start [stop]"},
                 {"--savemmsfile",               3, 15,SaveMMSFile,              {H_MMS,0},              "file [-subject text][-text text]"},
                 {"--getbitmap",                         1, 3, GetBitmap,                {H_Logo,0},             "STARTUP [file]"},
                 {"--getbitmap",                         1, 3, GetBitmap,                {H_Logo,0},             "CALLER location [file]"},
                 {"--getbitmap",                         1, 3, GetBitmap,                {H_Logo,0},             "OPERATOR [file]"},
                 {"--getbitmap",                         1, 3, GetBitmap,                {H_Logo,0},             "PICTURE location [file]"},
                 {"--getbitmap",                         1, 3, GetBitmap,                {H_Logo,0},             "TEXT"},
                 {"--getbitmap",                         1, 3, GetBitmap,                {H_Logo,0},             "DEALER"},
                 {"--setbitmap",                         1, 4, SetBitmap,                {H_Logo,0},             "STARTUP file|1|2|3"},
                 {"--setbitmap",                         1, 4, SetBitmap,                {H_Logo,0},             "COLOURSTARTUP [fileID]"},
                 {"--setbitmap",                         1, 4, SetBitmap,                {H_Logo,0},             "WALLPAPER fileID"},
                 {"--setbitmap",                         1, 4, SetBitmap,                {H_Logo,0},             "CALLER location [file]"},
                 {"--setbitmap",                         1, 4, SetBitmap,                {H_Logo,0},             "OPERATOR [file [netcode]]"},
                 {"--setbitmap",                         1, 4, SetBitmap,                {H_Logo,0},             "COLOUROPERATOR [fileID [netcode]]"},
                 {"--setbitmap",                         1, 4, SetBitmap,                {H_Logo,0},             "PICTURE file location [text]"},
                 {"--setbitmap",                         1, 4, SetBitmap,                {H_Logo,0},             "TEXT text"},
                 {"--setbitmap",                         1, 4, SetBitmap,                {H_Logo,0},             "DEALER text"},
                 {"--copybitmap",                1, 3, CopyBitmap,               {H_Logo,0},             "inputfile [outputfile [OPERATOR|PICTURE|STARTUP|CALLER]]"},
                 {"--presskeysequence",          1, 1, PressKeySequence,                 {H_Other,0},            "mMnNpPuUdD+-123456789*0#gGrRwW"},
 #if defined(WIN32) || defined(HAVE_PTHREAD)
                 {"--searchphone",               0, 1, SearchPhone,              {H_Other,0},            "[-debug]"},
 #endif
 #ifdef GSM_ENABLE_BACKUP
                 {"--savefile",                  4, 5, SaveFile,                         {H_Backup,H_Calendar,0},"CALENDAR target.vcs file location"},
                 {"--savefile",                  4, 5, SaveFile,                         {H_Backup,H_ToDo,0},    "TODO target.vcs file location"},
                 {"--savefile",                  4, 5, SaveFile,                         {H_Backup,H_Memory,0},  "VCARD10|VCARD21 target.vcf file SM|ME location"},
                 {"--savefile",                  4, 5, SaveFile,                         {H_Backup,H_WAP,0},     "BOOKMARK target.url file location"},
                 {"--backup",                    1, 2, Backup,                   {H_Backup,H_Memory,H_Calendar,H_ToDo,H_Category,H_Ringtone,H_WAP,H_FM,0},               "file [-yes]"},
                 {"--backupsms",                         1, 1, BackupSMS,                {H_Backup,H_SMS,0},     "file"},
                 {"--restore",                   1, 1, Restore,                  {H_Backup,H_Memory,H_Calendar,H_ToDo,H_Category,H_Ringtone,H_WAP,H_FM,0},               "file"},
                 {"--addnew",                    1, 1, AddNew,                   {H_Backup,H_Memory,H_Calendar,H_ToDo,H_Category,H_Ringtone,H_WAP,H_FM,0},               "file"},
                 {"--restoresms",                1, 1, RestoreSMS,               {H_Backup,H_SMS,0},     "file"},
                 {"--addsms",                    2, 2, AddSMS,                   {H_Backup,H_SMS,0},     "folder file"},
 #endif
                 {"--clearall",                  0, 0, ClearAll,                         {H_Memory,H_Calendar,H_ToDo,H_Category,H_Ringtone,H_WAP,H_FM,0},""},
                 {"--networkinfo",               0, 0, NetworkInfo,              {H_Network,0},          ""},
         #ifdef GSM_ENABLE_AT
                 {"--siemenssatnetmon",          0, 0, ATSIEMENSSATNetmon,       {H_Siemens,H_Network,0},""},
                 {"--siemensnetmonact",          1, 1, ATSIEMENSActivateNetmon,  {H_Siemens,H_Network,0},        "netmon_type (1-full, 2-simple)"},
                 {"--siemensnetmonitor",                 1, 1, ATSIEMENSNetmonitor,      {H_Siemens,H_Network,0},"test"},
         #endif
 #ifdef GSM_ENABLE_NOKIA6110
                 {"--nokiagetoperatorname",      0, 0, DCT3GetOperatorName,      {H_Nokia,H_Network,0},  ""},
                 {"--nokiasetoperatorname",      0, 2, DCT3SetOperatorName,      {H_Nokia,H_Network,0},  "[networkcode name]"},
                 {"--nokiadisplayoutput",        0, 0, DCT3DisplayOutput,        {H_Nokia,0},            ""},
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT3
                 {"--nokianetmonitor",           1, 1, DCT3netmonitor,           {H_Nokia,H_Network,0},  "test"},
                 {"--nokianetmonitor36",                 0, 0, DCT3ResetTest36,          {H_Nokia,0},            ""},
                 {"--nokiadebug",                1, 2, DCT3SetDebug,             {H_Nokia,H_Network,0},  "filename [[v11-22][,v33-44]...]"},
 #endif
 #ifdef GSM_ENABLE_NOKIA_DCT4
                 {"--nokiasetvibralevel",        1, 1, DCT4SetVibraLevel,        {H_Nokia,H_Other,0},    "level"},
                 {"--nokiagetvoicerecord",       1, 1, DCT4GetVoiceRecord,       {H_Nokia,H_Other,0},    "location"},
                 {"--nokiasetlights",            2, 2, DCT4SetLight,             {H_Nokia,H_Tests,0},    "keypad|display|torch on|off"},
                 {"--nokiatuneradio",            0, 0, DCT4TuneRadio,            {H_Nokia,H_FM,0},       ""},
                 {"--nokiamakecamerashoot",      0, 0, DCT4MakeCameraShoot,      {H_Nokia,H_Other,0},    ""},
                 {"--nokiagetscreendump",        0, 0, DCT4GetScreenDump,        {H_Nokia,H_Other,0},    ""},
 #endif
 #if defined(GSM_ENABLE_NOKIA_DCT3) || defined(GSM_ENABLE_NOKIA_DCT4)
                 {"--nokiavibratest",            0, 0, NokiaVibraTest,           {H_Nokia,H_Tests,0},    ""},
                 {"--nokiagett9",                0, 0, NokiaGetT9,               {H_Nokia,H_SMS,0},      ""},
                 {"--nokiadisplaytest",          1, 1, NokiaDisplayTest,                 {H_Nokia,H_Tests,0},    "number"},
                 {"--nokiagetadc",               0, 0, NokiaGetADC,              {H_Nokia,H_Tests,0},    ""},
                 {"--nokiasecuritycode",                 0, 0, NokiaSecurityCode,        {H_Nokia,H_Info,0},     ""},
                 {"--nokiaselftests",            0, 0, NokiaSelfTests,           {H_Nokia,H_Tests,0},    ""},
                 {"--nokiasetphonemenus",        0, 0, NokiaSetPhoneMenus,       {H_Nokia,H_Other,0},    ""},
 #endif
 #ifdef DEBUG
                 {"--decodesniff",               2, 3, decodesniff,              {H_Decode,0},           "MBUS2|IRDA file [phonemodel]"},
                 {"--decodebinarydump",          1, 2, decodebinarydump,                 {H_Decode,0},           "file [phonemodel]"},
                 {"--makeconverttable",          1, 1, MakeConvertTable,                 {H_Decode,0},           "file"},
 #endif
                 {"",                            0, 0, NULL              }
 };
 
 static HelpCategoryDescriptions HelpDescriptions[] = {
                 {H_Call,        "call",         "Calls",},
                 {H_SMS,                 "sms",  "SMS and EMS"},
                 {H_Memory,      "memory","Memory (phonebooks and calls)"},
                 {H_Filesystem,  "filesystem","Filesystem"},
                 {H_Logo,        "logo",         "Logo and pictures"},
                 {H_Ringtone,    "ringtone","Ringtones"},
                 {H_Calendar,    "calendar","Calendar notes"},
                 {H_ToDo,        "todo",         "To do lists"},
                 {H_Note,        "note",         "Notes"},
                 {H_DateTime,    "datetime","Date, time and alarms"},
                 {H_Category,    "category","Categories"},
 #ifdef GSM_ENABLE_BACKUP
                 {H_Backup,      "backup","Backing up and restoring"},
 #endif
 #if defined(GSM_ENABLE_NOKIA_DCT3) || defined(GSM_ENABLE_NOKIA_DCT4)
                 {H_Nokia,       "nokia","Nokia specific"},
 #endif
 #ifdef GSM_ENABLE_AT
                 {H_Siemens,     "siemens","Siemens specific"},
 #endif
                 {H_Network,     "network","Network"},
                 {H_WAP,                 "wap",  "WAP settings and bookmarks"},
                 {H_MMS,                 "mms",  "MMS and MMS settings"},
                 {H_Tests,       "tests","Phone tests"},
                 {H_FM,          "fm",   "FM radio"},
                 {H_Info,        "info",         "Phone information"},
                 {H_Settings,    "settings","Phone settings"},
 #ifdef DEBUG
                 {H_Decode,      "decode","Dumps decoding"},
 #endif
                 {H_Other,       "other","Functions that don't fit elsewhere"},
                 {0,             NULL,   NULL}
 };
         
 
 void HelpHeader(void)
 {
         printmsg("[Gammu version %s built %s %s]\n\n",VERSION,__TIME__,__DATE__);
 }
 
 static void HelpGeneral(void)
 {
                 inti=0;
 
         HelpHeader();
 
          printmsg("Usage: gammu [confign] [nothing|text|textall|binary|errors] [options]\n\n");
          printmsg("First parameter optionally specifies which config section to use (by default are probed all).\n");
          printmsg("Second parameter optionally controls debug level, next specify actions.\n\n");
 
         /* We might want to put here some most used commands */
         printmsg("For more details call help on specific topic (gammu --help topic), topics are:\n\n");
 
         while (HelpDescriptions[i].category != 0) {
                 printf("%11s - %s\n", HelpDescriptions[i].option, HelpDescriptions[i].description);
                 i++;
         }
         printf("\n");
 }
 
 static void HelpSplit(int cols, int len, unsigned char *buff)
 {
                 int     l, len2, pos, split;
                 bool    in_opt,first=true;
                 char    *remain, spaces[50], buffer[500];
 
         if (cols == 0) {
                 printf(" %s\n", buff);
         } else {
                 printf(" ");
                 spaces[0] = 0;
                 len2 = strlen(buff);
                 if (len + len2 < cols) {
                         printf("%s\n", buff);
                 } else {
                         for(l = 0; l < len; l++) strcat(spaces, " "); 
 
                         remain = buff;
 
                         while (strlen(remain) > 0) {
                                         split= 0;
                                         pos= 0;
                                         in_opt= false;
                                 if (!first) printf(spaces);
                                 while (pos < cols - len && remain[pos] != 0) {
                                         if (in_opt && remain[pos] == ']') {
                                                 in_opt = false;
                                                 split  = pos;
                                         } else if (remain[pos] == '[') {
                                                 in_opt = true;
                                         } else if (!in_opt && remain[pos] == ' ') {
                                                 split = pos - 1;
                                         }
                                         pos++;
                                 }
                                 /* Can not be split */
                                 if (split == 0) {
                                         printf("%s\n", remain);
                                         remain += strlen(remain);
                                 } else {
                                         first = false;
                                         split++;
                                         strncpy(buffer, remain, split);
                                         buffer[split] = 0;
                                         printf("%s\n", buffer);
                                         remain += split;
                                         if (remain[0] == ' ') remain++;
                                 }
                         }
                 }
         }
 }
 
 static void Help(int argc, char *argv[])
 {
                 int                     i = 0, j = 0, k, cols;
                 bool                    disp;
 #ifdef TIOCGWINSZ
                 struct winsize          w;
 #endif
 #if defined(WIN32) || defined(DJGPP)
 #else
                 char                    *columns;
 #endif
 
         /* Just --help */
         if (argc == 2) {
                 HelpGeneral();
                 return;
         }
 
         if (!strcmp(argv[2],"all")) {
                 HelpHeader();
         } else {
                 while (HelpDescriptions[i].category != 0) {
                         if (strcmp(argv[2], HelpDescriptions[i].option) == 0) break;
                         i++;
                 }
                 if (HelpDescriptions[i].category == 0) {
                         HelpGeneral();
                         printmsg("Unknown help topic specified!\n");
                         return;
                 }
                 HelpHeader();
                 printmsg("Gammu parameters, topic: %s\n\n", HelpDescriptions[i].description);
         }
 
 #if defined(WIN32) || defined(DJGPP)
         cols = 80;
 #else
         cols = 0;
         /* If stdout is a tty, we will wrap to columns it has */
         if (isatty(1)) {
 #ifdef TIOCGWINSZ
                 if (ioctl(2, TIOCGWINSZ, &w) == 0) {
                         if (w.ws_col > 0) cols = w.ws_col;
                 }
 #endif
                 if (cols == 0) {
                         columns = getenv("COLUMNS");
                         if (columns != NULL) {
                                 cols = atoi(columns);
                                 if (cols <= 0) cols = 0;
                         }
                 }
                 
                 if (cols == 0) {
                         /* Fallback */
                         cols = 80;
                 }
         }
 #endif
 
         while (Parameters[j].Function != NULL) {
                         k = 0;
                         disp = false;
                 if (!strcmp(argv[2],"all")) {
                         if (j==0) disp = true;
                         if (j!=0) {
                                 if (strcmp(Parameters[j].help,Parameters[j-1].help)) {
                                         disp = true;
                                 } else {
                                         if (strcmp(Parameters[j].parameter,Parameters[j-1].parameter)) {
                                                 disp = true;
                                         }
                                 }
                         }
                 } else {
                         while (Parameters[j].help_cat[k] != 0) {
                                 if (Parameters[j].help_cat[k] == HelpDescriptions[i].category) {
                                         disp = true;
                                         break;
                                 }
                                 k++;
                         }
                 }
                 if (disp) {
                         printf("%s", Parameters[j].parameter);
                         if (Parameters[j].help[0] == 0) {
                                 printf("\n");
                         } else {
                                 HelpSplit(cols - 1, strlen(Parameters[j].parameter) + 1, Parameters[j].help);
                         }
                 }
                 j++;
         }
 }
 #if 0
 #endif // 0
 int main(int argc, char *argv[])
 {
  
     //fprintf(stderr,"HIIIIIIIIIIIII  \n");
     //#if 0
                 static int z ,start,i;
                 static intonly_config ;
 #if !defined(WIN32) && defined(LOCALE_PATH)
                 static char*locale, locale_file[201];
 #endif
             static      char*cp; 
                 static boolcount_failed;
         z = 0;
     start=0;only_config = -1;count_failed = false;
                 s.opened = false;
                 s.msg    = NULL;
                 s.ConfigNum = 0;
 
         setlocale(LC_ALL, "");
 #ifdef DEBUG
                 di.dl   = DL_TEXTALL;
                 di.df    = stdout;
 #endif
     //#if 0
          /* Any parameters? */
         if (argc == 1) {
                 HelpGeneral();
                 printmsg("Too few parameters!\n");
                 exit(1);
         }
 
          /* Help? */
         if (strncmp(argv[1 + start], "--help", 6) == 0) {
                 Help(argc - start, argv + start);
                 exit(1);
         }
 
                 /* 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;
         }
 
+    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();
         for (i = 0; i <= MAX_CONFIG_NUM; i++) {
                 if (cfg!=NULL) {
                         cp = INI_GetValue(cfg, "gammu", "gammucoding", false);
                         if (cp) di.coding = cp;
 
                         s.Config[i].Localize = INI_GetValue(cfg, "gammu", "gammuloc", false);
                         if (s.Config[i].Localize) {
                                 s.msg=INI_ReadFile(s.Config[i].Localize, true);
                         } else {
 #if !defined(WIN32) && defined(LOCALE_PATH)
                                 locale = setlocale(LC_MESSAGES, NULL);
                                 if (locale != NULL) {
                                         snprintf(locale_file, 200, "%s/gammu_%c%c.txt",
                                                         LOCALE_PATH,
                                                         tolower(locale[0]),
                                                         tolower(locale[1]));
                                         s.msg = INI_ReadFile(locale_file, true);
                                 }
 #endif
                         }
                 }
 
                 /* Wanted user specific configuration? */
                 if (only_config != -1) {
                         /* Here we get only in first for loop */
                         if (!GSM_ReadConfig(cfg, &s.Config[0], only_config)) break;
                 } else {
                         if (!GSM_ReadConfig(cfg, &s.Config[i], i) && i != 0) break;
                 }
                 s.ConfigNum++;
 
                 /* We want to use only one file descriptor for global and state machine debug output */
                     s.Config[i].UseGlobalDebugFile = true;
                 
                 /* It makes no sense to open several debug logs... */
                 if (i != 0) {
                         strcpy(s.Config[i].DebugLevel, s.Config[0].DebugLevel);
                         free(s.Config[i].DebugFile);
                         s.Config[i].DebugFile = strdup(s.Config[0].DebugFile);
                 } else {
                         /* Just for first config */
                         /* When user gave debug level on command line */
                         if (argc > 1 + start && GSM_SetDebugLevel(argv[1 + start], &di)) {
                                 /* Debug level from command line will be used with phone too */
                                 strcpy(s.Config[i].DebugLevel,argv[1 + start]);
                                 start++;
                         } else {
                                 /* Try to set debug level from config file */
                                 GSM_SetDebugLevel(s.Config[i].DebugLevel, &di);
                         }
                         /* If user gave debug file in gammurc, we will use it */
                         error=GSM_SetDebugFile(s.Config[i].DebugFile, &di);
                         Print_Error(error);
                 }
 
                 /* We wanted to read just user specified configuration. */
                 if (only_config != -1) {break;}
          }
- 
+#endif
         /* Do we have enough parameters? */
          if (argc == 1 + start) {
                 HelpGeneral();
                 printmsg("Too few parameters!\n");
                 exit(-2);
         }
 
         /* Check used version vs. compiled */
         if (!mystrncasecmp(GetGammuVersion(),VERSION,0)) {
                 printmsg("ERROR: version of installed libGammu.so (%s) is different to version of Gammu (%s)\n",
                                         GetGammuVersion(),VERSION);
                 exit(-1);
         }
 
         /* Check parameters */
         while (Parameters[z].Function != NULL) {
                 if (mystrncasecmp(Parameters[z].parameter,argv[1+start], 0)) {
                         if (argc-2-start >= Parameters[z].min_arg && argc-2-start <= Parameters[z].max_arg) {
                                 Parameters[z].Function(argc - start, argv + start);
                                 break;
                         } else {
                                 count_failed = true;
                         }
                 }
                 z++;
         }
 
         /* Tell user when we did nothing */
         if (Parameters[z].Function == NULL) {
                 HelpGeneral();
                 if (count_failed) {
                         printmsg("Bad parameter count!\n");
                 } else {
                         printmsg("Bad option!\n");
                 }
          }
 
              /* Close debug output if opened */
              if (di.df!=stdout) fclose(di.df);
         //#endif // 0
         fprintf(stderr,"kammu: Success. End.  \n");        
         exit(0);
 }
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
 
diff --git a/libkcal/phoneformat.cpp b/libkcal/phoneformat.cpp
index 0bc9125..2ad1b5a 100644
--- a/libkcal/phoneformat.cpp
+++ b/libkcal/phoneformat.cpp
@@ -1,581 +1,583 @@
 /*
     This file is part of libkcal.
 
     Copyright (c) 2004 Lutz Rogowski <rogowski@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library 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
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qapplication.h>
 #include <qptrlist.h>
 #include <qregexp.h>
 #include <qmessagebox.h>
 #include <qclipboard.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qtextcodec.h>
 #include <qxml.h>
 #include <qlabel.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 #include "calendar.h"
 #include "alarm.h"
 #include "recurrence.h"
 #include "calendarlocal.h"
 
 #include "phoneformat.h"
 #include "syncdefines.h"
 
 using namespace KCal;
 class PhoneParser : public QObject
 {
 public:
     PhoneParser(   )  {
         ;
     }
    
     static QString dtToString( const QDateTime& dti, bool useTZ = false )
     {
         QString datestr;
         QString timestr;
         int offset =  KGlobal::locale()->localTimeOffset( dti );
         QDateTime   dt;
         if (useTZ)
             dt =  dti.addSecs ( -(offset*60));
         else
             dt =  dti;
         if(dt.date().isValid()){
             const QDate& date = dt.date();
             datestr.sprintf("%04d%02d%02d",
                             date.year(), date.month(), date.day());
         }
         if(dt.time().isValid()){
             const QTime& time = dt.time();
             timestr.sprintf("T%02d%02d%02d",
                             time.hour(), time.minute(), time.second());
         }
         return datestr + timestr;
     }
 
 
 };
 
   
 
 PhoneFormat::PhoneFormat(QString profileName, QString device,QString connection, QString model )
 {
     mProfileName = profileName;
     mDevice = device;
     mConnection = connection;
     mModel = model; 
 }
 
 PhoneFormat::~PhoneFormat()
 {
 }
 #if 0
 int PhoneFormat::initDevice(GSM_StateMachine *s)
 {
     GSM_ReadConfig(NULL, &s->Config[0], 0);
                 s->ConfigNum = 1;
     GSM_Config *cfg = &s->Config[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 );
     }
     int error=GSM_InitConnection(s,3);
     return error;
 }
 #endif
 ulong PhoneFormat::getCsumTodo( Todo* todo )
 {
     QStringList  attList;
     if ( todo->hasDueDate() )
         attList << PhoneParser::dtToString ( todo->dtDue() );
     attList << todo->summary();
     QString completedString = "no";
     if ( todo->isCompleted() )
         completedString = "yes";
     attList << completedString; 
     attList << QString::number( todo->priority() ); 
     QString alarmString = "na";
     Alarm *alarm;
     if (  todo->alarms().count() > 0 ) {
         alarm = todo->alarms().first();
         if ( alarm->enabled() ) {
             alarmString = QString::number(alarm->startOffset().asSeconds()  );
         }
     }
     attList << alarmString;
     attList << todo->categoriesStr();
     attList << todo->secrecyStr(); 
     return PhoneFormat::getCsum(attList );  
 
 }
 ulong PhoneFormat::getCsumEvent( Event* event )
 {
     QStringList  attList;
     attList << PhoneParser::dtToString ( event->dtStart() );
     attList << PhoneParser::dtToString ( event->dtEnd() );
     attList <<  event->summary();
     attList <<  event->location();
     QString alarmString = "na";
     Alarm *alarm;
     if (  event->alarms().count() > 0 ) {
         alarm = event->alarms().first();
         if ( alarm->enabled() ) {
             alarmString = QString::number( alarm->startOffset().asSeconds() );
         }
     }
     attList <<  alarmString;
     Recurrence* rec = event->recurrence();
     QStringList  list;
     bool writeEndDate = false;
     switch ( rec->doesRecur() )
         {
         case Recurrence::rDaily: // 0
             list.append( "0" );
             list.append( QString::number( rec->frequency() ));//12
             list.append( "0" );
             list.append( "0" );
             writeEndDate = true;
             break;
         case Recurrence::rWeekly:// 1
             list.append( "1" );
             list.append( QString::number( rec->frequency()) );//12
             list.append( "0" );
             {
                 int days = 0;
                 QBitArray weekDays = rec->days(); 
                 int i;
                 for( i = 1; i <= 7; ++i ) {
                     if ( weekDays[i-1] ) {
                         days += 1 << (i-1);
                     }
                 }
                 list.append( QString::number( days ) );
             }
             //pending weekdays
             writeEndDate = true;
            
             break;
         case Recurrence::rMonthlyPos:// 2
             list.append( "2" );
             list.append( QString::number( rec->frequency()) );//12
            
             writeEndDate = true; 
             {
                 int count = 1;
                 QPtrList<Recurrence::rMonthPos> rmp;
                 rmp = rec->monthPositions();
                 if ( rmp.first()->negative )
                     count = 5 - rmp.first()->rPos - 1;
                 else
                     count = rmp.first()->rPos - 1;
                 list.append( QString::number( count ) );
            
             }
 
             list.append( "0" );
             break;
         case Recurrence::rMonthlyDay:// 3
             list.append( "3" );
             list.append( QString::number( rec->frequency()) );//12
             list.append( "0" );
             list.append( "0" );
             writeEndDate = true;
             break;
         case Recurrence::rYearlyMonth://4
             list.append( "4" );
             list.append( QString::number( rec->frequency()) );//12
             list.append( "0" );
             list.append( "0" );
             writeEndDate = true;
             break;
        
         default:
             list.append( "255" );
             list.append( QString() );
             list.append( "0" );
             list.append( QString() );
             list.append( "0" );
             list.append( "20991231T000000" );
             break;
         }
     if  ( writeEndDate ) {
         
         if ( rec->endDate().isValid() ) { // 15 + 16
             list.append( "1" );
             list.append( PhoneParser::dtToString( rec->endDate()) );
         } else {
             list.append( "0" );
             list.append( "20991231T000000" );
         }
         
     }
     attList << list.join("");
     attList << event->categoriesStr();
     attList << event->secrecyStr();
     return PhoneFormat::getCsum(attList );  
 }
 ulong PhoneFormat::getCsum( const QStringList &  attList)
 {
     int max = attList.count() -1;
     ulong cSum = 0;
     int j,k,i;
     int add;
     for ( i = 1; i < max ; ++i ) {
         QString s = attList[i];
         if ( ! s.isEmpty() ){
             j = s.length();
             for ( k = 0; k < j; ++k ) {
                 int mul = k +1;
                 add = s[k].unicode ();
                 if ( k < 16 )
                     mul = mul * mul;
                 add = add * mul *i*i*i;
                 cSum += add;
             }
         }
     }
     return cSum;
 
 }
 //extern "C" GSM_Error GSM_InitConnection(GSM_StateMachine *s, int ReplyNum);
 #include <stdlib.h>
 #define DEBUGMODE false
 bool PhoneFormat::load( Calendar *calendar, Calendar *existingCal)
 {
 
     QString fileName;
 #ifdef _WIN32_
     fileName = locateLocal("data", "korganizer") + "\\tempfile.vcs";
 #else
     fileName = "/tmp/kdepimtemp.vcs";
 #endif
-    QString command ="./kammu --backup " + fileName + " -yes";
+    QString command ="./kammu --backup " + fileName + " -yes -C" + 
+        mConnection +" -D" + mDevice +" -M" + mModel;
     int ret = system (  command.latin1() );
     if ( ret !=  0 )
         return false;
     VCalFormat vfload;
     vfload.setLocalTime ( true ); 
     if ( ! vfload.load( calendar, fileName ) )
         return false;
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     while ( ev ) {
         int id = ev->pilotId();
         Event *event;
         event = existingCal->event( mProfileName ,QString::number( id ) );
         if ( event ) {
             event = (Event*)event->clone();
             copyEvent( event,  ev );
             calendar->deleteEvent( ev );
             calendar->addEvent( event);
         }
         else
             event = ev;
         uint cSum;
         cSum = PhoneFormat::getCsumEvent( event );
         event->setCsum( mProfileName, QString::number( cSum ));
         event->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
         event->setID( mProfileName,QString::number( id ) );
         ev =  er.next();
     }
     {
         QPtrList<Todo> tr = calendar->rawTodos();
         Todo* ev = tr.first();  
         while ( ev ) {
 
             QStringList cat = ev->categories();
             if ( cat.contains( "MeetingDEF" )) {
                 ev->setCategories( QStringList() );
             }
             int id = ev->pilotId();
             Todo *event;
             event = existingCal->todo( mProfileName ,QString::number( id ) );
             if ( event ) {
                 event = (Todo*)event->clone();
                 copyTodo( event,  ev );
                 calendar->deleteTodo( ev );
                 calendar->addTodo( event);
             }
             else
                 event = ev;
             uint cSum;
             cSum = PhoneFormat::getCsumTodo( event );
             event->setCsum( mProfileName, QString::number( cSum ));
             event->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL );
             event->setID( mProfileName,QString::number( id ) );
             ev =  tr.next();
         }
     }
     return true;
 }
 void PhoneFormat::copyEvent( Event* to,  Event* from )
 {
     if ( from->dtStart().isValid() )
         to->setDtStart(  from->dtStart() );
     if ( from->dtEnd().isValid() )
         to->setDtEnd(  from->dtEnd() );
     if ( !from->location().isEmpty() )
         to->setLocation(  from->location() );
     if ( !from->description().isEmpty() )
         to->setDescription(  from->description() );
     if ( !from->summary().isEmpty() )
         to->setSummary(  from->summary() );
 
     QPtrListIterator<Alarm> it( from->alarms() );
     to->clearAlarms();
     const Alarm *a;
     while( (a = it.current()) ) {
         Alarm *b = new Alarm( *a );
         b->setParent( to );
         to->addAlarm( b );
         ++it;
     }
     QStringList cat = to->categories();
     QStringList catFrom = from->categories();
     QString nCat;
     int iii;
     for ( iii = 0; iii < catFrom.count();++iii ) {
         nCat = catFrom[iii];
         if ( !nCat.isEmpty() )
             if ( !cat.contains( nCat )) {
                 cat << nCat;
             }
     }
     to->setCategories( cat );
     Recurrence * r = new Recurrence( *from->recurrence(),to);
     to->setRecurrence( r ) ;
 
 
 }
 void PhoneFormat::copyTodo( Todo* to,  Todo* from )
 {
     if ( from->dtStart().isValid() )
         to->setDtStart(  from->dtStart() );
     if ( from->dtDue().isValid() )
         to->setDtDue(  from->dtDue() );
     if ( !from->location().isEmpty() )
         to->setLocation(  from->location() );
     if ( !from->description().isEmpty() )
         to->setDescription(  from->description() );
     if ( !from->summary().isEmpty() )
         to->setSummary(  from->summary() );
 
     QPtrListIterator<Alarm> it( from->alarms() );
     to->clearAlarms();
     const Alarm *a;
     while( (a = it.current()) ) {
         Alarm *b = new Alarm( *a );
         b->setParent( to );
         to->addAlarm( b );
         ++it;
     }
     QStringList cat = to->categories();
     QStringList catFrom = from->categories();
     QString nCat;
     int iii;
     for ( iii = 0; iii < catFrom.count();++iii ) {
         nCat = catFrom[iii];
         if ( !nCat.isEmpty() )
             if ( !cat.contains( nCat )) {
                 cat << nCat;
             }
     }
     to->setCategories( cat );
     if ( from->isCompleted() ) {
         to->setCompleted( true );
         if( from->completed().isValid() )
             to->setCompleted( from->completed() );
     } else {
         // set percentcomplete only, if to->isCompleted()
         if ( to->isCompleted() )
             to->setPercentComplete(from->percentComplete()); 
     }
     to->setPriority(from->priority());
 
 }
 #include <qcstring.h>
 
 void PhoneFormat::afterSave( Incidence* inc)
 {
     uint csum;
     inc->removeID( mProfileName );
     if ( inc->type() == "Event")
         csum = PhoneFormat::getCsumEvent( (Event*) inc );
     else
         csum = PhoneFormat::getCsumTodo( (Todo*) inc );
     inc->setCsum( mProfileName, QString::number( csum ));
     inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
 
 }
 bool PhoneFormat::save( Calendar *calendar)
 {
     QLabel status ( i18n(" Opening device ..."), 0 );
     int w = status.sizeHint().width()+20 ;
     if ( w < 200 ) w = 230;
     int h = status.sizeHint().height()+20 ;
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     status.setCaption(i18n("Writing to phone...") );
     status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     status.show();
     status.raise();
     qApp->processEvents();
     QString message;
 #ifdef _WIN32_
     QString  fileName = locateLocal("data", "korganizer") + "\\tempfile.vcs";
 #else
     QString  fileName = "/tmp/kdepimtemp.vcs";
 #endif
 
     // 1 remove events which should be deleted
     QPtrList<Event> er = calendar->rawEvents();
     Event* ev = er.first();  
     while ( ev ) {
         if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { 
             calendar->deleteEvent( ev );
         } else {
 
         }
         ev =  er.next();
     }
     //  2 remove todos which should be deleted
     QPtrList<Todo> tl = calendar->rawTodos(); 
     Todo* to = tl.first();
     while ( to ) {
         if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
             calendar->deleteTodo( to );   
         } 
         to = tl.next();
     }
     //  3 save file 
     VCalFormat vfsave;
     vfsave.setLocalTime ( true ); 
     if ( ! vfsave.save( calendar, fileName ) )
         return false;
     // 4 call kammu
-    QString command ="./kammu --restore " + fileName ;
+    QString command ="./kammu --restore " + fileName + "  -C" + 
+        mConnection +" -D" + mDevice +" -M" + mModel;;
     int ret = system (  command.latin1() );
     if ( ret !=  0 )
         return false;
     // 5 reread data
     message = i18n(" Rereading all data ... ");
     status.setText ( message  );
     qApp->processEvents();
     CalendarLocal* calendarTemp = new CalendarLocal(); 
     calendarTemp->setTimeZoneId( calendar->timeZoneId());
     if ( ! load( calendarTemp,calendar) ){
         qDebug("error reloading calendar ");
         delete calendarTemp;
         return false;
     }
     // 6 compare data
 
 //algo 6 compare event
     er = calendar->rawEvents();
     ev = er.first(); 
     message = i18n(" Comparing event # ");
     QPtrList<Event> er1 = calendarTemp->rawEvents();
     Event* ev1; 
     int procCount = 0;
     while ( ev ) {
             qDebug("event new ID "); 
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
             QString cSum = ev->getCsum(mProfileName);
             ev1 = er1.first(); 
             while ( ev1 ) {
                 if (  ev1->getCsum( mProfileName ) == cSum ) {
                     er1.remove( ev1 );
                     afterSave( ev );
                     ev->setID(mProfileName, ev1->getID(mProfileName) );
                     break;
                 }
                 ev1 =  er1.next();
             } 
             if ( ! ev1 ) {
                 ev->removeID(mProfileName);
                 qDebug("ERROR: No event found  on phone for %s ", ev->summary().latin1());
             }
             
         
         ev =  er.next();
     }
     //algo 6 compare todo
     to = tl.first();
     procCount = 0;
     QPtrList<Todo> tl1 = calendarTemp->rawTodos(); 
     Todo* to1 ;
     message = i18n(" Comparing todo # ");
     while ( to  ) {
         qDebug("todo2 %d ", procCount);
             status.setText ( message + QString::number ( ++procCount ) );
             qApp->processEvents();
             QString cSum = to->getCsum(mProfileName);
             Todo* to1 = tl1.first(); 
             while ( to1 ) {
                 if (  to1->getCsum( mProfileName ) == cSum ) {
                     tl1.remove( to1 );
                     afterSave( to );
                     to->setID(mProfileName, to1->getID(mProfileName) );
                     break;
                 }
                 to1 =  tl1.next();
             }
             if ( ! to1 ) {
                 to->removeID(mProfileName);
                 qDebug("ERROR: No todo found on phone for %s ", to->summary().latin1());
             }
         
         to = tl.next();
     }
     delete calendarTemp;
     return true;
 
 
 
 }
 
 
 QString PhoneFormat::toString( Calendar * )
 {
     return QString::null;
 }
 bool PhoneFormat::fromString( Calendar *calendar, const QString & text)
 {
     return false;
 }