Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb48473_drop_legacy_backup' into 'master'
Multiuser support related D-Bus changes

See merge request mer-core/timed!18
  • Loading branch information
spiiroin committed Feb 7, 2020
2 parents 22704bf + acc4762 commit fc298b0
Show file tree
Hide file tree
Showing 20 changed files with 12 additions and 514 deletions.
4 changes: 0 additions & 4 deletions rpm/timed-qt5.spec
Expand Up @@ -3,7 +3,6 @@ Name: timed-qt5
Summary: Time daemon
Version: 3.6
Release: 1
Group: System/System Control
License: LGPLv2
URL: https://git.sailfishos.org/mer-core/timed
Source0: %{name}-%{version}.tar.bz2
Expand Down Expand Up @@ -33,7 +32,6 @@ executing actions at given time and managing the event queue.

%package tests
Summary: Test cases for %{name}
Group: Development/System
Requires: %{name} = %{version}-%{release}
Requires: testrunner-lite

Expand All @@ -42,15 +40,13 @@ Simple automated test cases, to be executed in cita.

%package tools
Summary: Command line tools for communication with the time daemon
Group: Development/Tools
Requires: %{name} = %{version}-%{release}

%description tools
timedclient - add, modify, remove, and query alarms.

%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig(Qt5Core)

Expand Down
4 changes: 0 additions & 4 deletions src/lib/timed.pc

This file was deleted.

2 changes: 0 additions & 2 deletions src/lib/timed.prf

This file was deleted.

210 changes: 0 additions & 210 deletions src/server/backup.cpp

This file was deleted.

113 changes: 0 additions & 113 deletions src/server/backup.h

This file was deleted.

20 changes: 3 additions & 17 deletions src/server/machine.cpp
@@ -1,8 +1,8 @@
/***************************************************************************
** **
** Copyright (C) 2009-2011 Nokia Corporation. **
** Copyright (C) 2013-2019 Jolla Ltd. **
** Copyright (c) 2019 Open Mobile Platform LLC. **
** Copyright (c) 2009 - 2011 Nokia Corporation. **
** Copyright (c) 2013 - 2020 Jolla Ltd. **
** Copyright (c) 2019 - 2020 Open Mobile Platform LLC. **
** **
** Author: Ilya Dogolazky <ilya.dogolazky@nokia.com> **
** Author: Simo Piiroinen <simo.piiroinen@nokia.com> **
Expand Down Expand Up @@ -764,20 +764,6 @@ void machine_t::load_events(const iodata::array *events_data, bool trusted_sourc
}
}

void machine_t::cancel_backup_events()
{
// TODO: assert (queue is paused)
vector<event_t*> backup ;
for(map<cookie_t, event_t*>::const_iterator it=events.begin(); it!=events.end(); ++it)
if (it->second->flags & EventFlags::Backup)
backup.push_back(it->second) ;

for(vector<event_t*>::const_iterator it=backup.begin(); it!=backup.end(); ++it)
cancel_event(*it) ;

log_debug("cancelled all the bacjup events") ;
}

abstract_state_t *machine_t::state_by_name(const string &name)
{
for (set<abstract_state_t*>::iterator it=states.begin(); it!=states.end(); ++it)
Expand Down

0 comments on commit fc298b0

Please sign in to comment.