Terminal

Merge lp:~tintou/pantheon-terminal/no-libnotify into lp:~elementary-apps/pantheon-terminal/trunk

  1. no-libnotify
  2. Merge into trunk
Proposed by Corentin Noël
Status: Merged
Approved by: Danielle Foré
Approved revision: 806
Merged at revision: 806
Proposed branch: lp:~tintou/pantheon-terminal/no-libnotify
Merge into: lp:~elementary-apps/pantheon-terminal/trunk
Diff against target: 65 lines (+5/-14)
3 files modified
CMakeLists.txt (+1/-2)
src/PantheonTerminal.vala (+4/-8)
src/PantheonTerminalWindow.vala (+0/-4)
To merge this branch: bzr merge lp:~tintou/pantheon-terminal/no-libnotify
Reviewer Review Type Date Requested Status
elementary Apps team Pending
Review via email: mp+282365@code.launchpad.net

Commit message

Replace libnotify with native glib implementation found in 2.39

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 'CMakeLists.txt'
2--- CMakeLists.txt 2015-12-11 00:35:13 +0000
3+++ CMakeLists.txt 2016-01-12 20:10:58 +0000
4@@ -51,8 +51,8 @@
5 gthread-2.0
6 gtk+-3.0>=3.9.10
7 granite>=0.3.0
8+ glib-2.0>=2.39
9 vte-2.91
10- libnotify
11 gdk-3.0)
12
13 add_definitions (${DEPS_CFLAGS})
14@@ -84,7 +84,6 @@
15 vte-2.91
16 granite
17 gtk+-3.0
18- libnotify
19 gdk-3.0
20 posix
21 CUSTOM_VAPIS
22
23=== modified file 'src/PantheonTerminal.vala'
24--- src/PantheonTerminal.vala 2015-12-05 17:07:15 +0000
25+++ src/PantheonTerminal.vala 2016-01-12 20:10:58 +0000
26@@ -121,14 +121,10 @@
27 }
28
29 if ((window.get_window ().get_state () & Gdk.WindowState.FOCUSED) == 0) {
30- var notification = new Notify.Notification (_("Task finished"), process,
31- "utilities-terminal");
32-
33- try {
34- notification.show ();
35- } catch (Error e) {
36- warning (e.message);
37- }
38+ var notification = new Notification (_("Task finished"));
39+ notification.set_body (process);
40+ notification.set_icon (new ThemedIcon ("utilities-terminal"));
41+ send_notification ("finished", notification);
42 }
43 }
44
45
46=== modified file 'src/PantheonTerminalWindow.vala'
47--- src/PantheonTerminalWindow.vala 2015-12-07 23:57:11 +0000
48+++ src/PantheonTerminalWindow.vala 2016-01-12 20:10:58 +0000
49@@ -108,7 +108,6 @@
50
51 Gtk.Settings.get_default ().gtk_application_prefer_dark_theme = true;
52
53- Notify.init (app.program_name);
54 set_visual (Gdk.Screen.get_default ().get_rgba_visual ());
55
56 title = _("Terminal");
57@@ -131,9 +130,6 @@
58 error ("Couldn't load the UI: %s", e.message);
59 }
60
61- Notify.init ("pantheon-terminal");
62- //new Notify.Notification ("Bye Process", "p finished","utilities-terminal").show ();
63-
64 Gtk.AccelGroup accel_group = ui.get_accel_group ();
65 add_accel_group (accel_group);
66

Subscribers

People subscribed via source and target branches