Imported Upstream version 1.27.93

3 files changed, 38 insertions, 0 deletions

diff --git a/helper/message-cmdline.c b/helper/message-cmdline.c
index cddb68b..13da03d 100644
--- a/helper/message-cmdline.c
+++ b/helper/message-cmdline.c
@@ -562,6 +562,17 @@ GSM_Error CreateMessage(GSM_Message_Type *type, GSM_MultiSMSMessage *sms, int ar
 		}
 		startarg += 3;
 		break;
+#else
+	case COMPOSE_BOOKMARK:
+	case COMPOSE_WAPSETTINGS:
+	case COMPOSE_MMSSETTINGS:
+	case COMPOSE_CALENDAR:
+	case COMPOSE_TODO:
+	case COMPOSE_VCARD10:
+	case COMPOSE_VCARD21:
+		printf("%s\n", _("Backup functionality not compiled in!"));
+		exit(100 + ERR_DISABLED);
+		break;
 #endif
 	case COMPOSE_PROFILE:
 		SMSInfo.Entries[0].ID = SMS_NokiaProfileLong;
diff --git a/helper/message-display.c b/helper/message-display.c
index 60a7ad0..bea4080 100644
--- a/helper/message-display.c
+++ b/helper/message-display.c
@@ -79,15 +79,22 @@ const GSM_MemoryEntry *SearchPhoneNumber(const unsigned char *number, const GSM_
 /**
  * Prints single phone number optionally showing name of contact from backup data.
  */
+#ifdef GSM_ENABLE_BACKUP
 void PrintPhoneNumber(const unsigned char *number, const GSM_Backup *Info)
+#else
+void PrintPhoneNumber(const unsigned char *number, const void *Info)
+#endif
 {
+#ifdef GSM_ENABLE_BACKUP
 	const GSM_MemoryEntry *pbk;
 	int pos;
+#endif
 
 	printf("\"%s\"", DecodeUnicodeConsole(number));
 
 	if (Info == NULL) return;
 
+#ifdef GSM_ENABLE_BACKUP
 	/* First try phone phonebook */
 	pbk = SearchPhoneNumber(number, (const GSM_MemoryEntry **)Info->PhonePhonebook, &pos);
 	if (pbk == NULL) {
@@ -124,9 +131,14 @@ void PrintPhoneNumber(const unsigned char *number, const GSM_Backup *Info)
 		default:
 			break;
 	}
+#endif
 }
 
+#ifdef GSM_ENABLE_BACKUP
 void DisplaySingleSMSInfo(GSM_SMSMessage sms, gboolean displaytext, gboolean displayudh, const GSM_Backup *Info)
+#else
+void DisplaySingleSMSInfo(GSM_SMSMessage sms, gboolean displaytext, gboolean displayudh, const void *Info)
+#endif
 {
 	GSM_SiemensOTASMSInfo 	SiemensOTA;
 	int			i;
@@ -324,7 +336,11 @@ void DisplaySingleSMSInfo(GSM_SMSMessage sms, gboolean displaytext, gboolean dis
 	fflush(stdout);
 }
 
+#ifdef GSM_ENABLE_BACKUP
 void DisplayMultiSMSInfo (GSM_MultiSMSMessage *sms, gboolean eachsms, gboolean ems, const GSM_Backup *Info, GSM_StateMachine *sm)
+#else
+void DisplayMultiSMSInfo (GSM_MultiSMSMessage *sms, gboolean eachsms, gboolean ems, const void *Info, GSM_StateMachine *sm)
+#endif
 {
 	GSM_SiemensOTASMSInfo 	SiemensOTA;
 	GSM_MultiPartSMSInfo	SMSInfo;
diff --git a/helper/message-display.h b/helper/message-display.h
index eb6e381..7d44f97 100644
--- a/helper/message-display.h
+++ b/helper/message-display.h
@@ -10,12 +10,23 @@
  */
 void PrintSMSLocation(const GSM_SMSMessage *sms, const GSM_SMSFolders *folders);
 
+#ifdef GSM_ENABLE_BACKUP
 /**
  * Prints single phone number optionally showing name of contact from backup data.
  */
 void PrintPhoneNumber(const unsigned char *number, const GSM_Backup *Info);
+#else
+/**
+ * Prints single phone number optionally showing name of contact from backup data.
+ */
+void PrintPhoneNumber(const unsigned char *number, const void *Info);
+#endif
 
+#ifdef GSM_ENABLE_BACKUP
 void DisplayMultiSMSInfo (GSM_MultiSMSMessage *sms, gboolean eachsms, gboolean ems, const GSM_Backup *Info, GSM_StateMachine *sm);
+#else
+void DisplayMultiSMSInfo (GSM_MultiSMSMessage *sms, gboolean eachsms, gboolean ems, const void *Info, GSM_StateMachine *sm);
+#endif
 
 void DisplaySMSFrame(GSM_SMSMessage *SMS, GSM_StateMachine *sm);
 #endif