1
=== modified file 'src/scopes/internal/OnlineAccountClientImpl.cpp'
2
--- src/scopes/internal/OnlineAccountClientImpl.cpp	2016-03-16 12:08:16 +0000
3
+++ src/scopes/internal/OnlineAccountClientImpl.cpp	2016-08-02 13:28:57 +0000
4
@@ -545,12 +545,15 @@
5
545
    // (ensures that accounts_ is up to date)
545
    // (ensures that accounts_ is up to date)
6
546
    std::shared_ptr<GMainLoop> event_loop;
546
    std::shared_ptr<GMainLoop> event_loop;
7
547
    event_loop.reset(g_main_loop_new(main_loop_context_.get(), true), g_main_loop_unref);
547
    event_loop.reset(g_main_loop_new(main_loop_context_.get(), true), g_main_loop_unref);
9
548
    while(info->session)
548
10
549
    int ms_elapsed = 0;
11
550
    while (info->session && ms_elapsed < 5000)
12
549
    {
551
    {
13
550
        // We need to wait inside an event loop to allow for the main application loop to
552
        // We need to wait inside an event loop to allow for the main application loop to
14
551
        // process its pending events
553
        // process its pending events
15
552
        std::shared_ptr<GSource> source;
554
        std::shared_ptr<GSource> source;
16
553
        source.reset(g_timeout_source_new(10), g_source_unref);
555
        source.reset(g_timeout_source_new(10), g_source_unref);
17
556
        ms_elapsed += 10;
18
554
        g_source_set_callback(source.get(), wake_up_event_loop_cb, event_loop.get(), NULL);
557
        g_source_set_callback(source.get(), wake_up_event_loop_cb, event_loop.get(), NULL);
19
555
        g_source_attach(source.get(), main_loop_context_.get());
558
        g_source_attach(source.get(), main_loop_context_.get());
20
556
559
21
@@ -560,6 +563,15 @@
22
560
        lock.lock();
563
        lock.lock();
23
561
        info_lock.lock();
564
        info_lock.lock();
24
562
    }
565
    }
25
566
26
567
    // If the login session is still not responding, we cancel it
27
568
    if (info->session)
28
569
    {
29
570
        std::cerr << "OnlineAccountClientImpl::flush_pending_session(): login for account: "
30
571
                  << info->account_id << " is not responding. Canceling session." << std::endl;
31
572
        signon_auth_session_cancel(info->session.get());
32
573
        info->session = nullptr;
33
574
    }
34
563
}
575
}
35
564
576
36
565
void OnlineAccountClientImpl::main_loop_state_notify(bool is_running)
577
void OnlineAccountClientImpl::main_loop_state_notify(bool is_running)
Status:	Merged
Approved by:	Michi Henning on 2016-08-02
Approved revision:	686
Merged at revision:	686
Proposed branch:	lp:~marcustomlinson/unity-scopes-api/oa-test-fix
Merge into:	lp:unity-scopes-api/devel
Prerequisite:	lp:~michihenning/unity-scopes-api/fix-crossbuild
Diff against target:	36 lines (+13/-1) 1 file modified src/scopes/internal/OnlineAccountClientImpl.cpp (+13/-1)
To merge this branch:	bzr merge lp:~marcustomlinson/unity-scopes-api/oa-test-fix
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2016-09-07
Michi Henning (community)		2016-08-02	Approve on 2016-08-02
Review via email: mp+301777@code.launchpad.net
1	=== modified file 'src/scopes/internal/OnlineAccountClientImpl.cpp'
2	--- src/scopes/internal/OnlineAccountClientImpl.cpp 2016-03-16 12:08:16 +0000
3	+++ src/scopes/internal/OnlineAccountClientImpl.cpp 2016-08-02 13:28:57 +0000
4	@@ -545,12 +545,15 @@
5	545	// (ensures that accounts_ is up to date)	545	// (ensures that accounts_ is up to date)
6	546	std::shared_ptr<GMainLoop> event_loop;	546	std::shared_ptr<GMainLoop> event_loop;
7	547	event_loop.reset(g_main_loop_new(main_loop_context_.get(), true), g_main_loop_unref);	547	event_loop.reset(g_main_loop_new(main_loop_context_.get(), true), g_main_loop_unref);
9	548	while(info->session)	548
10			549	int ms_elapsed = 0;
11			550	while (info->session && ms_elapsed < 5000)
12	549	{	551	{
13	550	// We need to wait inside an event loop to allow for the main application loop to	552	// We need to wait inside an event loop to allow for the main application loop to
14	551	// process its pending events	553	// process its pending events
15	552	std::shared_ptr<GSource> source;	554	std::shared_ptr<GSource> source;
16	553	source.reset(g_timeout_source_new(10), g_source_unref);	555	source.reset(g_timeout_source_new(10), g_source_unref);
17			556	ms_elapsed += 10;
18	554	g_source_set_callback(source.get(), wake_up_event_loop_cb, event_loop.get(), NULL);	557	g_source_set_callback(source.get(), wake_up_event_loop_cb, event_loop.get(), NULL);
19	555	g_source_attach(source.get(), main_loop_context_.get());	558	g_source_attach(source.get(), main_loop_context_.get());
20	556		559
21	@@ -560,6 +563,15 @@
22	560	lock.lock();	563	lock.lock();
23	561	info_lock.lock();	564	info_lock.lock();
24	562	}	565	}
25			566
26			567	// If the login session is still not responding, we cancel it
27			568	if (info->session)
28			569	{
29			570	std::cerr << "OnlineAccountClientImpl::flush_pending_session(): login for account: "
30			571	<< info->account_id << " is not responding. Canceling session." << std::endl;
31			572	signon_auth_session_cancel(info->session.get());
32			573	info->session = nullptr;
33			574	}
34	563	}	575	}
35	564		576
36	565	void OnlineAccountClientImpl::main_loop_state_notify(bool is_running)	577	void OnlineAccountClientImpl::main_loop_state_notify(bool is_running)