:pserver:cvs@pserver.samba.org:/cvsroot - gnokii - Tue Dec 4 22:45 CET 2001

[gnokii.git] / smsd / lowlevel.c

diff --git a/smsd/lowlevel.c b/smsd/lowlevel.c
index 8a665f3..ea1c394 100644 (file)
--- a/smsd/lowlevel.c
+++ b/smsd/lowlevel.c
@@ -11,8 +11,11 @@
   $Id$
   
   $Log$
-  Revision 1.1.1.1  2001/11/25 21:59:23  short
-  :pserver:cvs@pserver.samba.org:/cvsroot - gnokii - Sun Nov 25 22:56 CET 2001
+  Revision 1.1.1.2  2001/12/05 03:16:54  short
+  :pserver:cvs@pserver.samba.org:/cvsroot - gnokii - Tue Dec  4 22:45 CET 2001
+
+  Revision 1.5  2001/12/03 15:34:54  pkot
+  Update to libsms and new structure
 
   Revision 1.4  2001/05/30 14:36:47  pkot
   Fix smsd to use StateMachine and let it compile.
@@ -33,8 +36,10 @@
 #include "misc.h"
 #include "gsm-common.h"
 #include "gsm-api.h"
-#include "fbus-6110.h"
-#include "fbus-3810.h"
+#include "phones/nk7110.h"
+#include "phones/nk6100.h"
+#include "phones/nk3110.h"
+#include "phones/nk2110.h"
 #include "smsd.h"
 #include "lowlevel.h"
 
@@ -221,7 +226,7 @@ static void RefreshSMS (const gint number)
   {
     msg = g_malloc (sizeof (GSM_SMSMessage));
     msg->MemoryType = GMT_SM;
-    msg->Location = ++i;
+    msg->Number = ++i;
 
     if ((error = GSM->GetSMSMessage (msg)) == GE_NONE)
     {
@@ -304,7 +309,7 @@ gint (*DoAction[])(gpointer) = {
 
 void *Connect (void *a)
 {
-  GSM_SMSStatus SMSStatus = {0, 0};
+  GSM_SMSMemoryStatus SMSStatus = {0, 0};
   PhoneEvent *event;
   GSM_Error error;
 
@@ -326,7 +331,7 @@ void *Connect (void *a)
 
     if (GSM->GetSMSStatus (&SMSStatus) == GE_NONE)
     {
-      if (phoneMonitor.sms.unRead != SMSStatus.UnRead ||
+      if (phoneMonitor.sms.unRead != SMSStatus.Unread ||
           phoneMonitor.sms.number != SMSStatus.Number)
       {
         phoneMonitor.working = TRUE;
@@ -334,7 +339,7 @@ void *Connect (void *a)
         phoneMonitor.working = FALSE;
       }
 
-      phoneMonitor.sms.unRead = SMSStatus.UnRead;
+      phoneMonitor.sms.unRead = SMSStatus.Unread;
     }
 
     while ((event = RemoveEvent ()) != NULL)