Merge lp:~julien-spautz/cable/away-back-message into lp:cable

Proposed by Julien Spautz
Status: Merged
Merged at revision: 109
Proposed branch: lp:~julien-spautz/cable/away-back-message
Merge into: lp:cable
Diff against target: 62 lines (+16/-7)
3 files modified
src/Controller/Server.vala (+6/-2)
src/View/Channel.vala (+6/-5)
src/Widgets/Channel.vala (+4/-0)
To merge this branch: bzr merge lp:~julien-spautz/cable/away-back-message
Reviewer Review Type Date Requested Status
Cable Developers Pending
Review via email: mp+179822@code.launchpad.net

Description of the change

Show away and back messages in chat, for example

johndoe is away
johndoe is back

using a neutral light gray color.

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/Controller/Server.vala'
2--- src/Controller/Server.vala 2013-08-11 08:55:59 +0000
3+++ src/Controller/Server.vala 2013-08-12 22:11:32 +0000
4@@ -9,8 +9,7 @@
5 internal string name;
6
7 internal Gee.HashMap <string, Channel> channels {
8- get; set;
9- default = new Gee.HashMap <string, Channel> ();
10+ get; set; default = new Gee.HashMap <string, Channel> ();
11 }
12
13 internal Server (string address, string nick, Window window) {
14@@ -53,6 +52,11 @@
15 if (backend.is_me (from)) {
16 view.away = away;
17 }
18+
19+ var nick = from.split("!")[0];
20+
21+ foreach (var channel in channels.values)
22+ channel.view.set_away_status (nick, away);
23 });
24
25 backend.event_quit.connect ((from, message) => {
26
27=== modified file 'src/View/Channel.vala'
28--- src/View/Channel.vala 2013-08-06 15:32:12 +0000
29+++ src/View/Channel.vala 2013-08-12 22:11:32 +0000
30@@ -28,11 +28,12 @@
31
32 public abstract void list_users (string[] nicks, string[] prefixes);
33
34- public abstract void add_user (string name, UserType type, bool silent = false);
35-
36- public abstract bool remove_user (string name, string message, bool silent = false);
37-
38- public abstract void rename_user (string? old_name, string new_name, UserType type, bool silent = false);
39+ public abstract void add_user (string nick, UserType type, bool silent = false);
40+
41+ public abstract bool remove_user (string nick, string message, bool silent = false);
42+
43+ public abstract void rename_user (string? old_nick, string new_nick, UserType type, bool silent = false);
44+ public abstract void set_away_status (string nick, bool is_away);
45
46 public abstract void message (owned string from, string message, MessageType type = MessageType.NORMAL);
47 }
48
49=== modified file 'src/Widgets/Channel.vala'
50--- src/Widgets/Channel.vala 2013-08-06 15:32:12 +0000
51+++ src/Widgets/Channel.vala 2013-08-12 22:11:32 +0000
52@@ -110,6 +110,10 @@
53 public void rename_user (string? old_name, string new_name, UserType type, bool silent = false) {
54 room.rename_user (old_name, new_name, type, silent);
55 }
56+
57+ public void set_away_status (string nick, bool away) {
58+ room.chat.message_away (nick, away);
59+ }
60
61 public void message (owned string from, string message, MessageType type = MessageType.NORMAL) {
62 room.chat.add_message (from, message, type);

Subscribers

People subscribed via source and target branches

to all changes: