recipes/keyring/keyring-0.6.8/keyring-0.6.8-datatype.patch

   1 diff -Naru Keyring.orig/accountlist.cpp Keyring/accountlist.cpp
   2 --- Keyring.orig/accountlist.cpp        2002-09-29 17:24:09.000000000 +0200
   3 +++ Keyring/accountlist.cpp     2007-06-05 15:46:59.000000000 +0200
   4 @@ -314,7 +314,7 @@
   5   */
   6  void AccountList::resetTimer(){
   7         mSeconds=mTimerStart;
   8 -       mStartTime = time(NULL);
   9 +       mStartTime = (time_t*)time(NULL);
  10         wLCD->display(mSeconds);
  11  }
  12
  13 @@ -390,20 +390,20 @@
  14         //if so and it has expired, lock keyring.
  15         if(mTimerViewingAC && mTimerEnabled){
  16                         //Timer has expired
  17 -                       if((time(NULL)-mStartTime) > mTimerStart){
  18 +                       if((time(NULL)-(time_t)mStartTime) > mTimerStart){
  19                                         lock();
  20                         } else {
  21                                         //Timer needs to be updated
  22                                         time_t diff=time(NULL)-viewtime;
  23                                         mSeconds=mSeconds-diff;
  24 -                                       mStartTime = time(NULL)-(mTimerStart-mSeconds);
  25 +                                       mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
  26                                         mUpdateTimer->start(500,false);
  27                                         wLCD->display(mSeconds);
  28                         }
  29         } else {
  30                         if(mTimerEnabled){
  31                                         mUpdateTimer->start(500,false);
  32 -                                       mStartTime = time(NULL)-(mTimerStart-mSeconds);
  33 +                                       mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
  34                         }
  35         }
  36
  37 @@ -432,7 +432,7 @@
  38                 if(mTimerEnabled)
  39                         mUpdateTimer->start(500,false);
  40                 mSeconds=mTimerStart;
  41 -               mStartTime = time(NULL);
  42 +               mStartTime = (time_t*)time(NULL);
  43                 updateCountDown();
  44
  45                 //Let's be a bastard and bitch if the
  46 @@ -463,11 +463,11 @@
  47  void AccountList::updateCountDown(){
  48         wLCD->display(mSeconds);
  49         if(mSeconds==0 ||
  50 -                       (((time(NULL)-mStartTime) > mTimerStart) && mTimerPowerOff)){
  51 +                       (((time(NULL)-(time_t)mStartTime) > mTimerStart) && mTimerPowerOff)){
  52                 lock();
  53                 return;
  54         }
  55 -       mSeconds=mTimerStart-(time(NULL)-mStartTime);
  56 +       mSeconds=mTimerStart-(time(NULL)-(time_t)mStartTime);
  57  }
  58
  59  void AccountList::selectionChanged(QListViewItem *item){
  60 @@ -548,20 +548,20 @@
  61                 //if so and it has expired, lock keyring.
  62                 if(mTimerViewingAC && mTimerEnabled){
  63                         //Timer has expired
  64 -                       if((time(NULL)-mStartTime) > mTimerStart){
  65 +                       if((time(NULL)-(time_t)mStartTime) > mTimerStart){
  66                                 lock();
  67                         } else {
  68                                 //Timer needs to be updated
  69 -                               time_t diff=time(NULL)-viewtime;
  70 +                               time_t diff = time(NULL)-(time_t)viewtime;
  71                                 mSeconds=mSeconds-diff;
  72 -                               mStartTime = time(NULL)-(mTimerStart-mSeconds);
  73 +                               mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
  74                                 mUpdateTimer->start(500,false);
  75                                 wLCD->display(mSeconds);
  76                         }
  77                 } else {
  78                         if(mTimerEnabled){
  79                                 mUpdateTimer->start(500,false);
  80 -                               mStartTime = time(NULL)-(mTimerStart-mSeconds);
  81 +                               mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
  82                         }
  83                 }
  84                 delete qd;
  85 @@ -627,7 +627,7 @@
  86
  87         if(mTimerEnabled){
  88                         mUpdateTimer->start(500,false);
  89 -                       mStartTime = time(NULL)-(mTimerStart-mSeconds);
  90 +                       mStartTime = (time_t*)time(NULL)-(mTimerStart-mSeconds);
  91         }
  92
  93         showAccountList();