Merge lp:~mefrio-g/cable/1198748 into lp:cable

Proposed by Mario Guerriero
Status: Merged
Merged at revision: 88
Proposed branch: lp:~mefrio-g/cable/1198748
Merge into: lp:cable
Diff against target: 52 lines (+11/-2)
3 files modified
CMakeLists.txt (+3/-1)
src/Cable.vala (+3/-1)
src/Widgets/Room.vala (+5/-0)
To merge this branch: bzr merge lp:~mefrio-g/cable/1198748
Reviewer Review Type Date Requested Status
Auroral Xylon (community) Approve
Review via email: mp+173810@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Auroral Xylon (avlabs314) wrote :

This works great!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-07-04 01:34:38 +0000
3+++ CMakeLists.txt 2013-07-09 20:37:27 +0000
4@@ -32,7 +32,8 @@
5 glib-2.0>=${TARGET_GLIB}.0
6 gio-2.0>=2.28.0
7 gtk+-3.0>=3.4.0
8- gee-1.0)
9+ gee-1.0
10+ libnotify)
11
12 add_definitions(${DEPS_CFLAGS})
13
14@@ -71,6 +72,7 @@
15 PACKAGES
16 gtk+-3.0
17 granite
18+ libnotify
19 #WebKit-3.0
20 OPTIONS
21 --target-glib=2.32
22
23=== modified file 'src/Cable.vala'
24--- src/Cable.vala 2013-07-02 16:28:42 +0000
25+++ src/Cable.vala 2013-07-09 20:37:27 +0000
26@@ -70,7 +70,9 @@
27 public static int main (string[] args) {
28 var context = new OptionContext ("File");
29 context.add_main_entries (entries, Constants.GETTEXT_PACKAGE);
30-
31+
32+ Notify.init ("Cable");
33+
34 try {
35 context.parse (ref args);
36 }
37
38=== modified file 'src/Widgets/Room.vala'
39--- src/Widgets/Room.vala 2013-07-04 01:34:38 +0000
40+++ src/Widgets/Room.vala 2013-07-09 20:37:27 +0000
41@@ -277,6 +277,11 @@
42 }
43 if (message.contains (server.identity.nick_name)) {
44 chat.add_message (@"<span color='#DA4D45'><b>$from</b></span>", @"<span color='#DA4D45'><b>$new_message</b></span>");
45+ // Send a notification...
46+ var notify = new Notify.Notification (from, new_message, "internet-chat");
47+ try {
48+ notify.show ();
49+ } catch (Error e) { warning (e.message); }
50 } else {
51 if (color_map.has_key (from)) {
52 chat.add_message ("<span color='"+color_map.get (from)+@"'>$from</span>", new_message);

Subscribers

People subscribed via source and target branches

to all changes: