diff -r 962e6306d9d2 -r 7ef16719d8cb smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp
--- a/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp	Fri Feb 19 23:59:33 2010 +0200
+++ b/smsprotocols/smsstack/gsmu/src/Gsmuelem.cpp	Fri Mar 12 15:49:38 2010 +0200
@@ -682,15 +682,12 @@
 			break;
 			}
 		default:
+		    LOGGSMU1("TSmsDataCodingScheme::Alphabet() WARNING! default case has been reached");
             break;
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-            // Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
-		}
+ 		}
 	return (TSmsAlphabet) alphabet;
 	} // TSmsDataCodingScheme::TSmsAlphabet
 
-
 void TSmsDataCodingScheme::SetAlphabet(TSmsAlphabet aAlphabet)
 	{
 	LOGGSMU1("TSmsDataCodingScheme::SetAlphabet()");
@@ -720,38 +717,40 @@
 			}
 		case (ESmsDCSMessageWaitingIndicationDiscardMessage):
 			{
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-			//if (aAlphabet!=ESmsAlphabet7Bit)
-				//Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
+            if (aAlphabet!=ESmsAlphabet7Bit)
+                {
+                LOGGSMU3("TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message  [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
+                }
 			break;
 			}
 		case (ESmsDCSMessageWaitingIndication7Bit):
 			{
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-			//if (aAlphabet==ESmsAlphabet8Bit)
-				//Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
-			if (aAlphabet==ESmsAlphabetUCS2)
+ 			if (aAlphabet==ESmsAlphabetUCS2)
+ 			    {
 				iValue=(TUint8) (ESmsDCSMessageWaitingIndicationUCS2|(iValue&(~ESmsDCSBits7To4Mask)));
+ 			    }
+ 			else 
+                {
+        		LOGGSMU3("TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message  [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
+			    }	     
 			break;
 			}
 		case (ESmsDCSMessageWaitingIndicationUCS2):
 			{
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-			//if (aAlphabet==ESmsAlphabet8Bit)
-				//Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
-			if (aAlphabet==ESmsAlphabet7Bit)
+  			if (aAlphabet==ESmsAlphabet7Bit)
+			    {
 				iValue=(TUint8) (ESmsDCSMessageWaitingIndication7Bit|(iValue&(~ESmsDCSBits7To4Mask)));
+			    }
+			else 
+			    {
+				LOGGSMU3("TSmsDataCodingScheme::SetAlphabet() WARNING! Not Supported With Discard Message  [Bits7To4=%d], [aAlphabet=%d]", bits7to4, aAlphabet);
+			    }
 			break;
 			}
 		default:
+		    LOGGSMU1("TSmsDataCodingScheme::SetAlphabet() WARNING! default case has been reached");
             break;
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-			//Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
-		}
+      		}
 	} // TSmsDataCodingScheme::SetAlphabet
 
 
@@ -814,10 +813,8 @@
 				break;
 				}
 			default:
+		        LOGGSMU1("WARNING! default case has been reached");
                 break;
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-				//Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
 			}
 		}
 	else
@@ -880,11 +877,9 @@
 			break;
 			}
 		default:
+		    LOGGSMU1("WARNING! default case has been reached");
             break;
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-			//Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
-		}
+  		}
 	return state;
 	} // TSmsDataCodingScheme::TSmsIndicationState
 
@@ -904,11 +899,9 @@
 			break;
 			}
 		default:
+		    LOGGSMU1("TSmsDataCodingScheme::SetIndicationState() WARNING! default case has been reached");
             break;
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-			//Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
-		}
+  		}
 	} // TSmsDataCodingScheme::SetIndicationState
 
 
@@ -928,10 +921,8 @@
 			break;
 			}
 		default:
+		    LOGGSMU1("TSmsDataCodingScheme::IndicationType() WARNING default case has been reached");
             break;
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-			//Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
 		}
 	return type;
 	} // TSmsDataCodingScheme::TSmsIndicationType
@@ -952,11 +943,9 @@
 			break;
 			}
 		default:
+		    LOGGSMU1("TSmsDataCodingScheme::SetIndicationType() WARNING! default case has been reached");
             break;
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-			//Panic(KGsmuPanicNotSupportedWithDCSBits7To4);
-		}
+ 		}
 	} // TSmsDataCodingScheme::SetIndicationType
 
 
@@ -2743,17 +2732,17 @@
 	{
 	LOGGSMU1("CSmsAddress::NewBufferL()");
 
-	HBufC* buffer=HBufC::NewL(aLength);
-	delete iBuffer;
-	iBuffer=buffer;
-	iBuffer->Des().SetLength(aLength);
-	iBuffer->Des().FillZ();
-	} // CSmsAddress::NewBufferL
+    HBufC* buffer=HBufC::NewL(aLength);
+    delete iBuffer;
+    iBuffer=buffer;
+    iBuffer->Des().SetLength(aLength);
+    iBuffer->Des().FillZ();
+	}
 
 
 void CSmsAddress::DoSetParsedAddressL(const TDesC& aAddress)
 	{
-	LOGGSMU1("CSmsAddress::DoSetParsedAddressL()");
+	LOGGSMU2("CSmsAddress::DoSetParsedAddressL() the length of the Address [Length = %d", aAddress.Length());
 
 	TInt length=aAddress.Length();
 	if ((iTypeOfAddress.TON()==EGsmSmsTONInternationalNumber) &&
@@ -3900,11 +3889,9 @@
 				break;
 				}
 			default:
+			    LOGGSMU1("CSmsUserData::MaxBodyLengthInChars() WARNING! default case has been reached");
                 break;
-            // TODO - ahe - Never Panic GSMU !!!
-            // has to be tested, what happens in this default case
-				//Panic(KGsmuPanicUnsupportedAlphabet);
-			}
+ 			}
 		}
 	return maxbodylengthinchars;
 	} // CSmsUserData::MaxBodyLengthInChars
@@ -4281,10 +4268,8 @@
 					break;
 					}
 				default:
+				    LOGGSMU1("CSmsUserData::TotalHeaderLengthInUDLUnits() WARNING default case has been reached");
                     break;
-                // TODO - ahe - Never Panic GSMU !!!
-                // has to be tested, what happens in this default case
-					//Panic(KGsmuPanicUnsupportedAlphabet);
 				}
 			}
 		}