updated to latest gammu version

4 files changed, 23 insertions, 3 deletions

diff --git a/gammu/emb/common/service/sms/gsmmulti.c b/gammu/emb/common/service/sms/gsmmulti.c
index 6c1cdcd..bdb5ee9 100644
--- a/gammu/emb/common/service/sms/gsmmulti.c
+++ b/gammu/emb/common/service/sms/gsmmulti.c
@@ -478,24 +478,29 @@ GSM_Error GSM_EncodeMultiPartSMS(GSM_MultiPartSMSInfo		*Info,
                 for (i=0;i<Info->Entries[0].Bitmap->Number;i++) {
                         Buffer[Length++] = Info->Entries[0].Bitmap->Bitmap[i].BitmapWidth;
                         Buffer[Length++] = Info->Entries[0].Bitmap->Bitmap[i].BitmapHeight;
                         PHONE_EncodeBitmap(GSM_AlcatelBMMIPicture, Buffer+Length, &Info->Entries[0].Bitmap->Bitmap[i]);
                         Length += PHONE_GetBitmapSize(GSM_AlcatelBMMIPicture,Info->Entries[0].Bitmap->Bitmap[i].BitmapWidth,Info->Entries[0].Bitmap->Bitmap[i].BitmapHeight);
                 }
                 return GSM_EncodeAlcatelMultiPartSMS(SMS,Buffer,Length,Info->Entries[0].Bitmap->Bitmap[0].Text,ALCATELTDD_ANIMATION);
         case SMS_MMSIndicatorLong:
                         Class= 1;
                         UDH= UDH_MMSIndicatorLong;
                 GSM_EncodeMMSIndicatorSMSText(Buffer,&Length,*Info->Entries[0].MMSIndicator);
                 break;
+        case SMS_WAPIndicatorLong:
+                        Class= 1;
+                        UDH= UDH_MMSIndicatorLong;
+                GSM_EncodeWAPIndicatorSMSText(Buffer,&Length,Info->Entries[0].MMSIndicator->Title,Info->Entries[0].MMSIndicator->Address);
+                break;
         case SMS_NokiaRingtoneLong:
         case SMS_NokiaRingtone:
                         UDH= UDH_NokiaRingtone;
                         Class= 1;
                 /* 7 = length of UDH_NokiaRingtone UDH header */
                 Length  = GSM_MAX_8BIT_SMS_LENGTH-7;
                 Info->Entries[0].RingtoneNotes = GSM_EncodeNokiaRTTLRingtone(*Info->Entries[0].Ringtone,Buffer,&Length);
                 if (Info->Entries[0].ID == SMS_NokiaRingtone) break;
                 if (Info->Entries[0].RingtoneNotes != Info->Entries[0].Ringtone->NoteTone.NrCommands) {
                         UDH    = UDH_NokiaRingtoneLong;
                         Length = (GSM_MAX_8BIT_SMS_LENGTH-12)*3;
                         Info->Entries[0].RingtoneNotes = GSM_EncodeNokiaRTTLRingtone(*Info->Entries[0].Ringtone,Buffer,&Length);
diff --git a/gammu/emb/common/service/sms/gsmmulti.h b/gammu/emb/common/service/sms/gsmmulti.h
index c672261..3f70d81 100644
--- a/gammu/emb/common/service/sms/gsmmulti.h
+++ b/gammu/emb/common/service/sms/gsmmulti.h
@@ -1,17 +1,21 @@
 /* (c) 2002-2004 by Marcin Wiacek */
 
 #ifndef __gsm_multi_h
 #define __gsm_multi_h
 
+#if defined(_MSC_VER) && defined(__cplusplus)
+    extern "C" {
+#endif
+
 #include "../../gsmcomon.h"
 #include "../gsmlogo.h"
 #include "../gsmcal.h"
 #include "../gsmpbk.h"
 #include "../gsmdata.h"
 #include "../gsmring.h"
 #include "gsmsms.h"
 
 /* ---------------------- multi SMS --------------------------------------- */
 
 /* Identifiers for Smart Messaging 3.0 multipart SMS */
 
@@ -163,42 +167,43 @@ typedef enum {
         /**
          * IMelody 1.2
          */
         SMS_EMSSound12,
         /**
          * IMelody without header - SonyEricsson extension
          */
         SMS_EMSSonyEricssonSound,
         /**
          * IMelody 1.0 with UPI.
          */
         SMS_EMSSound10Long,
-        /***
+        /**
          * IMelody 1.2 with UPI.
          */
         SMS_EMSSound12Long,
         /**
          * IMelody without header with UPI.
          */
         SMS_EMSSonyEricssonSoundLong,
         SMS_EMSPredefinedSound,
         SMS_EMSPredefinedAnimation,
         SMS_EMSAnimation,
         /**
          * Fixed bitmap of size 16x16 or 32x32.
          */
         SMS_EMSFixedBitmap,
         SMS_EMSVariableBitmap,
         SMS_EMSVariableBitmapLong,
         SMS_MMSIndicatorLong,
+        SMS_WAPIndicatorLong,
         /**
          * Variable bitmap with black and white colors
          */
         SMS_AlcatelMonoBitmapLong,
         /**
          * Variable animation with black and white colors
          */
         SMS_AlcatelMonoAnimationLong,
         SMS_AlcatelSMSTemplateName
 } EncodeMultiPartSMSID;
 
 typedef struct {
@@ -255,17 +260,21 @@ bool GSM_DecodeMultiPartSMS (GSM_MultiPartSMSInfo *Info, GSM_MultiSMSMessage *SM
 void GSM_ClearMultiPartSMSInfo (GSM_MultiPartSMSInfo *Info);
 
 /**
  * Frees any allocated structures inside @ref GSM_MultiPartSMSInfo.
  */
 void GSM_FreeMultiPartSMSInfo (GSM_MultiPartSMSInfo *Info);
 
 /**
  * Links SMS messages according to IDs.
  */
 GSM_Error GSM_LinkSMS(GSM_MultiSMSMessage **INPUT, GSM_MultiSMSMessage **OUTPUT, bool ems);
 
+#if defined(_MSC_VER) && defined(__cplusplus)
+    }
+#endif
+
 #endif
 
 /* How should editor hadle tabs in this file? Add editor commands here.
  * vim: noexpandtab sw=8 ts=8 sts=8:
  */
diff --git a/gammu/emb/common/service/sms/gsmsms.c b/gammu/emb/common/service/sms/gsmsms.c
index 9920835..feceba4 100644
--- a/gammu/emb/common/service/sms/gsmsms.c
+++ b/gammu/emb/common/service/sms/gsmsms.c
@@ -1,14 +1,17 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* based on some work from Pawel Kot, others and Gnokii */
+/* Based on some Pawel Kot and others work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #include <ctype.h>
 #include <string.h>
 #include <time.h>
 
 #include "../../gsmcomon.h"
 #include "../../misc/coding/coding.h"
 #include "../gsmcal.h"
 #include "../gsmpbk.h"
 #include "../gsmlogo.h"
 #include "../gsmring.h"
 #include "../gsmdata.h"
diff --git a/gammu/emb/common/service/sms/gsmsms.h b/gammu/emb/common/service/sms/gsmsms.h
index d87ff60..0b950d3 100644
--- a/gammu/emb/common/service/sms/gsmsms.h
+++ b/gammu/emb/common/service/sms/gsmsms.h
@@ -1,14 +1,17 @@
 /* (c) 2001-2004 by Marcin Wiacek */
-/* based on some work from Pawel Kot, others and Gnokii */
+/* Based on some Pawel Kot and others work from Gnokii (www.gnokii.org)
+ * (C) 1999-2000 Hugh Blemings & Pavel Janik ml. (C) 2001-2004 Pawel Kot 
+ * GNU GPL version 2 or later
+ */
 
 #ifndef __gsm_sms_h
 #define __gsm_sms_h
 
 #include "../../gsmcomon.h"
 #include "../gsmlogo.h"
 #include "../gsmcal.h"
 #include "../gsmpbk.h"
 #include "../gsmdata.h"
 #include "../gsmring.h"
 
 /* --------------------- Some general definitions ------------------------- */