Merge lp:~sbte/indicator-messages/fix-817504 into lp:indicator-messages/0.5

Proposed by Sven Baars
Status: Merged
Approved by: Ted Gould
Approved revision: 223
Merged at revision: 226
Proposed branch: lp:~sbte/indicator-messages/fix-817504
Merge into: lp:indicator-messages/0.5
Diff against target: 36 lines (+7/-5)
1 file modified
src/status-provider-emesene.c (+7/-5)
To merge this branch: bzr merge lp:~sbte/indicator-messages/fix-817504
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+69775@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/status-provider-emesene.c'
--- src/status-provider-emesene.c 2011-07-02 12:15:22 +0000
+++ src/status-provider-emesene.c 2011-07-29 12:31:17 +0000
@@ -31,25 +31,27 @@
3131
32typedef enum {32typedef enum {
33 EM_STATUS_ONLINE,33 EM_STATUS_ONLINE,
34 EM_STATUS_OFFLINE,34 EM_STATUS_INVISIBLE,
35 EM_STATUS_BUSY,35 EM_STATUS_BUSY,
36 EM_STATUS_AWAY,36 EM_STATUS_AWAY,
37 EM_STATUS_IDLE37 EM_STATUS_IDLE,
38 EM_STATUS_OFFLINE
38} em_status_t;39} em_status_t;
3940
40static const StatusProviderStatus em_to_sp_map[] = {41static const StatusProviderStatus em_to_sp_map[] = {
41 /* EM_STATUS_ONLINE, */ STATUS_PROVIDER_STATUS_ONLINE,42 /* EM_STATUS_ONLINE, */ STATUS_PROVIDER_STATUS_ONLINE,
42 /* EM_STATUS_OFFLINE, */ STATUS_PROVIDER_STATUS_OFFLINE,43 /* EM_STATUS_INVISIBLE, */ STATUS_PROVIDER_STATUS_INVISIBLE,
43 /* EM_STATUS_BUSY, */ STATUS_PROVIDER_STATUS_DND,44 /* EM_STATUS_BUSY, */ STATUS_PROVIDER_STATUS_DND,
44 /* EM_STATUS_AWAY, */ STATUS_PROVIDER_STATUS_AWAY,45 /* EM_STATUS_AWAY, */ STATUS_PROVIDER_STATUS_AWAY,
45 /* EM_STATUS_IDLE, */ STATUS_PROVIDER_STATUS_AWAY46 /* EM_STATUS_IDLE, */ STATUS_PROVIDER_STATUS_AWAY,
47 /* EM_STATUS_OFFLINE, */ STATUS_PROVIDER_STATUS_OFFLINE
46};48};
4749
48static const em_status_t sp_to_em_map[STATUS_PROVIDER_STATUS_LAST] = {50static const em_status_t sp_to_em_map[STATUS_PROVIDER_STATUS_LAST] = {
49 /* STATUS_PROVIDER_STATUS_ONLINE, */ EM_STATUS_ONLINE,51 /* STATUS_PROVIDER_STATUS_ONLINE, */ EM_STATUS_ONLINE,
50 /* STATUS_PROVIDER_STATUS_AWAY, */ EM_STATUS_AWAY,52 /* STATUS_PROVIDER_STATUS_AWAY, */ EM_STATUS_AWAY,
51 /* STATUS_PROVIDER_STATUS_DND */ EM_STATUS_BUSY,53 /* STATUS_PROVIDER_STATUS_DND */ EM_STATUS_BUSY,
52 /* STATUS_PROVIDER_STATUS_INVISIBLE*/ EM_STATUS_OFFLINE,54 /* STATUS_PROVIDER_STATUS_INVISIBLE*/ EM_STATUS_INVISIBLE,
53 /* STATUS_PROVIDER_STATUS_OFFLINE */ EM_STATUS_OFFLINE,55 /* STATUS_PROVIDER_STATUS_OFFLINE */ EM_STATUS_OFFLINE,
54 /* STATUS_PROVIDER_STATUS_DISCONNECTED*/ EM_STATUS_OFFLINE56 /* STATUS_PROVIDER_STATUS_DISCONNECTED*/ EM_STATUS_OFFLINE
55};57};

Subscribers

People subscribed via source and target branches