Merge branch 'mer-without-keepalive' into 'master'

[msyncd] Fix compilation when USE_KEEPALIVE is not given See merge request mer-core/buteo-syncfw!67
sailfishos · May 24, 2021 · 4553308 · 4553308
2 parents bb85bcf + c7c7f23
commit 4553308
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/msyncd/SyncScheduler.cpp b/msyncd/SyncScheduler.cpp
@@ -170,14 +170,14 @@ void SyncScheduler::syncStatusChanged(const QString &aProfileName, int aStatus,
         iActiveBackgroundSyncProfiles.remove(aProfileName);
 #ifdef USE_KEEPALIVE
         iBackgroundActivity->onBackgroundSyncCompleted(aProfileName);
-#endif
 
         // and schedule the next background sync if necessary.
         SyncProfile *profile = iProfileManager.syncProfile(aProfileName);
         if (profile) {
             setNextAlarm(profile);
             delete profile;
         }
+#endif
     }
 }
 

diff --git a/msyncd/SyncScheduler.h b/msyncd/SyncScheduler.h
@@ -183,11 +183,11 @@ private slots:
 
 private: // data
 
+    QSet<QString> iActiveBackgroundSyncProfiles;
 #ifdef USE_KEEPALIVE
     /// BackgroundSync management object
     BackgroundSync *iBackgroundActivity;
     ProfileManager iProfileManager;
-    QSet<QString> iActiveBackgroundSyncProfiles;
 #else
     /// A list of sync schedule profiles
     QMap<QString, int> iSyncScheduleProfiles;