This commit was generated by cvs2svn to compensate for changes in r146,

which included commits to RCS files with non-trunk default branches.

diff --git a/Docs/CREDITS b/Docs/CREDITS
index 8232bd3..7193775 100644 (file)
--- a/Docs/CREDITS
+++ b/Docs/CREDITS
@@ -89,7 +89,7 @@ Thank you to, in no particular order...
    
 *  Balazs Nagy for frames list and long hacker's work...
 
-*  Ladislav Michl & Manfred Jonsson\r for support for various AT phones...
+*  Ladislav Michl & Manfred Jonsson for support for various AT phones...
 
 *  Manfred Jonsson for idea of programming, which looks for me good
 

diff --git a/common/gsm-networks.c b/common/gsm-networks.c
index b36bcf5..4101a38 100644 (file)
--- a/common/gsm-networks.c
+++ b/common/gsm-networks.c
@@ -269,49 +269,49 @@ GSM_Network GSM_Networks[] =
   { "400 01", "AZERCELL GSM" },
   { "400 02", "Bakcell GSM 2000" },
 
-  { "404 01", "AIRCELL"},\r
-  { "404 02", "Evergrowth"},\r
-  { "404 03", "Bharthi Telenet"},\r
-  { "404 05", "Fascel"},\r
-  { "404 07", "Tata Cell"},\r //TATA Cellular
+  { "404 01", "AIRCELL"},
+  { "404 02", "Evergrowth"},
+  { "404 03", "Bharthi Telenet"},
+  { "404 05", "Fascel"},
+  { "404 07", "Tata Cell"}, //TATA Cellular
   { "404 08", "Koshika"},
-  { "404 09", "Reliance"},\r
-  { "404 10", "AIRTEL"},\r //AirTel
-  { "404 11", "Essar"},\r //Essar Cellphone
-  { "404 12", "Escotel"},\r
-  { "404 14", "Spice"},\r //Modicom
-  { "404 15", "AIRCELL"},\r //Essar Cellphone
-  { "404 18", "Reliance"},\r
-  { "404 19", "Escotel"},\r
-  { "404 20", "Orange"},\r //Max Touch
-  { "404 21", "BPL Mobile"},\r //BPL - Mobile
-  { "404 22", "Birla AT&T"},\r
-  { "404 24", "Birla AT&T"},\r
-  { "404 26", "Koshika"},\r
-  { "404 27", "BPL Mobile"},\r //BPL USWEST Cellular
-  { "404 30", "Usha"},\r //Command
-  { "404 31", "AIRCELL"},\r //?
-  { "404 31", "Command"},\r //?
-  { "404 32", "Koshika"},\r
-  { "404 34", "Koshika"},\r
-  { "404 36", "Reliance"},\r
-  { "404 40", "SkyCell"},\r
+  { "404 09", "Reliance"},
+  { "404 10", "AIRTEL"}, //AirTel
+  { "404 11", "Essar"}, //Essar Cellphone
+  { "404 12", "Escotel"},
+  { "404 14", "Spice"}, //Modicom
+  { "404 15", "AIRCELL"}, //Essar Cellphone
+  { "404 18", "Reliance"},
+  { "404 19", "Escotel"},
+  { "404 20", "Orange"}, //Max Touch
+  { "404 21", "BPL Mobile"}, //BPL - Mobile
+  { "404 22", "Birla AT&T"},
+  { "404 24", "Birla AT&T"},
+  { "404 26", "Koshika"},
+  { "404 27", "BPL Mobile"}, //BPL USWEST Cellular
+  { "404 30", "Usha"}, //Command
+  { "404 31", "AIRCELL"}, //?
+  { "404 31", "Command"}, //?
+  { "404 32", "Koshika"},
+  { "404 34", "Koshika"},
+  { "404 36", "Reliance"},
+  { "404 40", "SkyCell"},
   { "404 41", "RPG"}, //RPG Cellular
-  { "404 42", "AIRCELL"},\r //AIRCEL
-  { "404 43", "BPL Mobile"},\r
-  { "404 44", "Spice"},\r
-  { "404 45", "AIRTEL-blr"},\r
-  { "404 46", "BPL Moibile"},\r
+  { "404 42", "AIRCELL"}, //AIRCEL
+  { "404 43", "BPL Mobile"},
+  { "404 44", "Spice"},
+  { "404 45", "AIRTEL-blr"},
+  { "404 46", "BPL Moibile"},
   { "404 49", "AIRTEL"},
-  { "404 50", "Reliance"},\r
+  { "404 50", "Reliance"},
   { "404 52", "Reliance"},
   { "404 56", "Escotel"},
-  { "404 60", "AIRCELL"},\r
+  { "404 60", "AIRCELL"},
   { "404 67", "Reliance"},
-  { "404 70", "Hexacom"},\r
-  { "404 78", "RPG"},\r
-  { "404 85", "Reliance"},\r
-\r
+  { "404 70", "Hexacom"},
+  { "404 78", "RPG"},
+  { "404 85", "Reliance"},
+
   { "410 01", "Mobilink" },
   { "413 02", "DIALOG GSM" },
   { "415 01", "CELLIS" },

diff --git a/common/gsm-ringtones.c b/common/gsm-ringtones.c
index 588ddad..3db43b6 100644 (file)
--- a/common/gsm-ringtones.c
+++ b/common/gsm-ringtones.c
@@ -223,62 +223,62 @@ u8 GSM_PackRingtone(GSM_Ringtone *ringtone, unsigned char *package, int *maxleng
   int DefNoteTempo=63;
   u8 DefNoteStyle=NaturalStyle;
   
-  int buffer[6];\r              /* Used to find default ringtone parameters */
-  int i,j,k=0,thisnote,thisnotelong;\r
+  int buffer[6];              /* Used to find default ringtone parameters */
+  int i,j,k=0,thisnote,thisnotelong;
   
-  /* Find the most frequently used duration and use this for the default */\r
- \r for (i=0;i<6;i++) buffer[i]=0;\r
-  for (i=0;i<ringtone->NrNotes;i++) {\r
-    switch (ringtone->notes[i].duration) {\r
-      case 192: buffer[0]++; break;\r
-      case 128: buffer[0]++; break;\r
-      case  96:        buffer[1]++; break;\r
-      case  64: buffer[1]++; break;\r
-      case  48: buffer[2]++; break;\r
-      case  32: buffer[2]++; break;\r
-      case  24: buffer[3]++; break;\r
-      case  16: buffer[3]++; break;\r
-      case  12: buffer[4]++; break;\r
-      case   8: buffer[4]++; break;\r
-      case   6: buffer[5]++; break;\r
-      case   4: buffer[5]++; break;\r
-    }\r
-  }\r
-\r
-  /* Now find the most frequently used */\r
-  j=0;\r
-  for (i=0;i<6;i++) {\r
-    if (buffer[i]>j) {\r
-      k=i; \r
-      j=buffer[i];\r
-    }\r
-  }\r
-\r
-  /* Finally convert the default duration */\r
-  switch (k) {\r
-      case 0: DefNoteDuration=128; break;      \r
-      case 1: DefNoteDuration= 64; break;      \r
-      case 2: DefNoteDuration= 32; break;      \r
-      case 3: DefNoteDuration= 16; break;      \r
-      case 4: DefNoteDuration=  8; break;      \r
-      case 5: DefNoteDuration=  4; break;      \r
-     default: DefNoteDuration= 16; break;      \r
-  }  \r
-\r
-  /* Find the most frequently used scale and use this for the default */\r\r
-  for (i=0;i<6;i++) buffer[i]=0;\r
-  for (i=0;i<ringtone->NrNotes;i++) {\r
-    if (ringtone->notes[i].note!=255) {\r
-      buffer[ringtone->notes[i].note/14]++;\r
-    }\r
-  }\r
-  j=0;\r
-  for (i=0;i<6;i++) {\r
-    if (buffer[i]>j) {\r
-      DefNoteScale=i;\r
-      j=buffer[i];\r
-    }\r
-  }\r
+  /* Find the most frequently used duration and use this for the default */
+  for (i=0;i<6;i++) buffer[i]=0;
+  for (i=0;i<ringtone->NrNotes;i++) {
+    switch (ringtone->notes[i].duration) {
+      case 192: buffer[0]++; break;
+      case 128: buffer[0]++; break;
+      case  96:        buffer[1]++; break;
+      case  64: buffer[1]++; break;
+      case  48: buffer[2]++; break;
+      case  32: buffer[2]++; break;
+      case  24: buffer[3]++; break;
+      case  16: buffer[3]++; break;
+      case  12: buffer[4]++; break;
+      case   8: buffer[4]++; break;
+      case   6: buffer[5]++; break;
+      case   4: buffer[5]++; break;
+    }
+  }
+
+  /* Now find the most frequently used */
+  j=0;
+  for (i=0;i<6;i++) {
+    if (buffer[i]>j) {
+      k=i; 
+      j=buffer[i];
+    }
+  }
+
+  /* Finally convert the default duration */
+  switch (k) {
+      case 0: DefNoteDuration=128; break;      
+      case 1: DefNoteDuration= 64; break;      
+      case 2: DefNoteDuration= 32; break;      
+      case 3: DefNoteDuration= 16; break;      
+      case 4: DefNoteDuration=  8; break;      
+      case 5: DefNoteDuration=  4; break;      
+     default: DefNoteDuration= 16; break;      
+  }  
+
+  /* Find the most frequently used scale and use this for the default */
+  for (i=0;i<6;i++) buffer[i]=0;
+  for (i=0;i<ringtone->NrNotes;i++) {
+    if (ringtone->notes[i].note!=255) {
+      buffer[ringtone->notes[i].note/14]++;
+    }
+  }
+  j=0;
+  for (i=0;i<6;i++) {
+    if (buffer[i]>j) {
+      DefNoteScale=i;
+      j=buffer[i];
+    }
+  }
 
   StartBit=BitPackByte(package, StartBit, CommandLength, 8);
   StartBit=BitPackByte(package, StartBit, RingingToneProgramming, 7);

diff --git a/common/misc.c b/common/misc.c
index 46f8958..1adf9c8 100644 (file)
--- a/common/misc.c
+++ b/common/misc.c
@@ -8,9 +8,9 @@
 
 */
 
-#include <string.h>\r
-#include <ctype.h>\r
-#include <time.h>\r
+#include <string.h>
+#include <ctype.h>
+#include <time.h>
 
 #ifndef WIN32
   #include <sys/types.h>
@@ -20,10 +20,10 @@
   #include <signal.h>
   #include <unistd.h>
   #include <errno.h>
-#endif\r
-\r
-#include "misc.h"\r
-#include "gsm-common.h"\r
+#endif
+
+#include "misc.h"
+#include "gsm-common.h"
 
 #ifndef HAVE_TIMEOPS
 

diff --git a/gnokii/gnokii.c b/gnokii/gnokii.c
index 87943ec..65d8227 100644 (file)
--- a/gnokii/gnokii.c
+++ b/gnokii/gnokii.c
@@ -7652,32 +7652,32 @@ int binringtoneconvert(int argc, char *argv[])
            w=w*2;
            if (w>z && (w/2)<=z) {
              switch (m) {
-               case 1:fprintf(file,_("16"));break;\r
-               case 2:fprintf(file,_("8"));break;\r
-               case 3:fprintf(file,_("4"));break;\r
-               case 4:fprintf(file,_("2"));break;\r
-               case 5:fprintf(file,_("1"));break;\r
+               case 1:fprintf(file,_("16"));break;
+               case 2:fprintf(file,_("8"));break;
+               case 3:fprintf(file,_("4"));break;
+               case 4:fprintf(file,_("2"));break;
+               case 5:fprintf(file,_("1"));break;
              }
              break;
            }
          }
          if (z>w) fprintf(file,_("1"));
          pause=false;
-          switch (GSM_GetNote(j)) {\r
-            case Note_C  :fprintf(file,_("c"));break;\r
-            case Note_Cis:fprintf(file,_("c#"));break;\r
-            case Note_D  :fprintf(file,_("d"));break;\r
-            case Note_Dis:fprintf(file,_("d#"));break;\r
-            case Note_E  :fprintf(file,_("e"));break;\r
-            case Note_F  :fprintf(file,_("f"));break;\r
-            case Note_Fis:fprintf(file,_("f#"));break;\r
-            case Note_G  :fprintf(file,_("g"));break;\r
-            case Note_Gis:fprintf(file,_("g#"));break;\r
-            case Note_A  :fprintf(file,_("a"));break;\r
-            case Note_Ais:fprintf(file,_("a#"));break;\r
-            case Note_H  :fprintf(file,_("h"));break;\r
-            default      :pause=true;fprintf(file,_("p"));break; //Pause ?\r
-          }\r
+          switch (GSM_GetNote(j)) {
+            case Note_C  :fprintf(file,_("c"));break;
+            case Note_Cis:fprintf(file,_("c#"));break;
+            case Note_D  :fprintf(file,_("d"));break;
+            case Note_Dis:fprintf(file,_("d#"));break;
+            case Note_E  :fprintf(file,_("e"));break;
+            case Note_F  :fprintf(file,_("f"));break;
+            case Note_Fis:fprintf(file,_("f#"));break;
+            case Note_G  :fprintf(file,_("g"));break;
+            case Note_Gis:fprintf(file,_("g#"));break;
+            case Note_A  :fprintf(file,_("a"));break;
+            case Note_Ais:fprintf(file,_("a#"));break;
+            case Note_H  :fprintf(file,_("h"));break;
+            default      :pause=true;fprintf(file,_("p"));break; //Pause ?
+          }
          w=deflen*1.5;
          for (m=0;m<6;m++) {
            w=w*2;
@@ -7816,11 +7816,11 @@ int setsimlock()
     fprintf(stderr,_("Error getting simlock info\n"));GSM->Terminate();return -1;
   }
   /* Opening all locks (we must check, if we can open them) */
-  NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer0);
-  openbuffer[4]=1;NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=2;NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=4;NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=8;NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer0);
+  openbuffer[4]=1;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=2;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=4;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=8;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
   if (GSM->SimlockInfo(&siml)!=GE_NONE) {
     fprintf(stderr,_("Error getting simlock info\n"));GSM->Terminate();return -1;
   }
@@ -7869,13 +7869,13 @@ int setsimlock()
   }  
   /* Closing simlock with given values */
   closebuffer[4]=1+2+4+8;
-  NULL_SendMessageSequence\r(50, &CurrentMagicError, 20, 0x40,closebuffer);  
+  NULL_SendMessageSequence(50, &CurrentMagicError, 20, 0x40,closebuffer);  
   /* Opening all locks */
-  NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer0);
-  openbuffer[4]=1;NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=2;NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=4;NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer);
-  openbuffer[4]=8;NULL_SendMessageSequence\r(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer0);
+  openbuffer[4]=1;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=2;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=4;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
+  openbuffer[4]=8;NULL_SendMessageSequence(50, &CurrentMagicError, 10, 0x40,openbuffer);
   GSM->Reset(0x03);
   GSM->Terminate();
   return 0;
@@ -7975,7 +7975,7 @@ int geteeprom()
     
     if ((i/256)!=((i-1)/256)) fprintf(stderr,_("."));
     
-    if (NULL_SendMessageSequence(50, &CurrentMagicError, 9, 0x40,buffer)!=GE_NONE)\r      break;
+    if (NULL_SendMessageSequence(50, &CurrentMagicError, 9, 0x40,buffer)!=GE_NONE)       break;
 
     i=i+0x10;
   }

diff --git a/include/gsm-common.h b/include/gsm-common.h
index 9433499..dbbe24a 100644 (file)
--- a/include/gsm-common.h
+++ b/include/gsm-common.h
@@ -69,8 +69,8 @@
 #define GSM_MAX_REVISION_LENGTH (20)
 #define GSM_MAX_MODEL_LENGTH    (10)
 
-/* In 6210 test 57 there seems to be 75 chars */\r
-#define NM_MAX_SCREEN_WIDTH 75\r
+/* In 6210 test 57 there seems to be 75 chars */
+#define NM_MAX_SCREEN_WIDTH 75
 
 /* Power source types */
 typedef enum {

diff --git a/xgnokii/xgnokii_sms.c b/xgnokii/xgnokii_sms.c
index d5da1f4..a9726b9 100644 (file)
--- a/xgnokii/xgnokii_sms.c
+++ b/xgnokii/xgnokii_sms.c
@@ -1005,7 +1005,7 @@ static void SendSMS (void)
 
       if (GTK_TOGGLE_BUTTON (sendSMS.report)->active) Multisms.SMS[j].Type = GST_DR;
 
-      if (GTK_TOGGLE_BUTTON (sendSMS.class)->active)\r Multisms.SMS[j].Class = 0;\r
+      if (GTK_TOGGLE_BUTTON (sendSMS.class)->active) Multisms.SMS[j].Class = 0;
 
       Multisms.SMS[j].Validity = Multisms.SMS[j].MessageCenter.Validity;
 
@@ -1226,9 +1226,9 @@ static void CreateSMSSendWindow (void)
   gtk_box_pack_start (GTK_BOX (vbox), sendSMS.longSMS, FALSE, FALSE, 3);
   gtk_widget_show (sendSMS.longSMS);
 
-  sendSMS.class = gtk_check_button_new_with_label (_("Send as Flash SMS (Class 0)"));\r
-  gtk_box_pack_start (GTK_BOX (vbox), sendSMS.class, FALSE, FALSE, 3);\r
-  gtk_widget_show (sendSMS.class);\r
+  sendSMS.class = gtk_check_button_new_with_label (_("Send as Flash SMS (Class 0)"));
+  gtk_box_pack_start (GTK_BOX (vbox), sendSMS.class, FALSE, FALSE, 3);
+  gtk_widget_show (sendSMS.class);
 
   label = gtk_label_new (_("SMS Center:"));
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 1);