Messaging Menu

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

  1. fix-817504
  2. Merge into trunk
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
1=== modified file 'src/status-provider-emesene.c'
2--- src/status-provider-emesene.c 2011-07-02 12:15:22 +0000
3+++ src/status-provider-emesene.c 2011-07-29 12:31:17 +0000
4@@ -31,25 +31,27 @@
5
6 typedef enum {
7 EM_STATUS_ONLINE,
8- EM_STATUS_OFFLINE,
9+ EM_STATUS_INVISIBLE,
10 EM_STATUS_BUSY,
11 EM_STATUS_AWAY,
12- EM_STATUS_IDLE
13+ EM_STATUS_IDLE,
14+ EM_STATUS_OFFLINE
15 } em_status_t;
16
17 static const StatusProviderStatus em_to_sp_map[] = {
18 /* EM_STATUS_ONLINE, */ STATUS_PROVIDER_STATUS_ONLINE,
19- /* EM_STATUS_OFFLINE, */ STATUS_PROVIDER_STATUS_OFFLINE,
20+ /* EM_STATUS_INVISIBLE, */ STATUS_PROVIDER_STATUS_INVISIBLE,
21 /* EM_STATUS_BUSY, */ STATUS_PROVIDER_STATUS_DND,
22 /* EM_STATUS_AWAY, */ STATUS_PROVIDER_STATUS_AWAY,
23- /* EM_STATUS_IDLE, */ STATUS_PROVIDER_STATUS_AWAY
24+ /* EM_STATUS_IDLE, */ STATUS_PROVIDER_STATUS_AWAY,
25+ /* EM_STATUS_OFFLINE, */ STATUS_PROVIDER_STATUS_OFFLINE
26 };
27
28 static const em_status_t sp_to_em_map[STATUS_PROVIDER_STATUS_LAST] = {
29 /* STATUS_PROVIDER_STATUS_ONLINE, */ EM_STATUS_ONLINE,
30 /* STATUS_PROVIDER_STATUS_AWAY, */ EM_STATUS_AWAY,
31 /* STATUS_PROVIDER_STATUS_DND */ EM_STATUS_BUSY,
32- /* STATUS_PROVIDER_STATUS_INVISIBLE*/ EM_STATUS_OFFLINE,
33+ /* STATUS_PROVIDER_STATUS_INVISIBLE*/ EM_STATUS_INVISIBLE,
34 /* STATUS_PROVIDER_STATUS_OFFLINE */ EM_STATUS_OFFLINE,
35 /* STATUS_PROVIDER_STATUS_DISCONNECTED*/ EM_STATUS_OFFLINE
36 };

Subscribers

People subscribed via source and target branches