Merge lp:~lanoxx/indicator-keyboard/indicator-keyboard into lp:indicator-keyboard

Proposed by Sebastian Geiger
Status: Merged
Approved by: Dmitry Shachnev
Approved revision: 2211
Merged at revision: 2211
Proposed branch: lp:~lanoxx/indicator-keyboard/indicator-keyboard
Merge into: lp:indicator-keyboard
Diff against target: 31 lines (+2/-2)
2 files modified
lib/main.vala (+2/-1)
lib/source.vala (+0/-1)
To merge this branch: bzr merge lp:~lanoxx/indicator-keyboard/indicator-keyboard
Reviewer Review Type Date Requested Status
Alberts Muktupāvels Approve
Review via email: mp+473774@code.launchpad.net

Commit message

This fixes a memory leak

Fixes #2055388
Fixes #1384384

To post a comment you must log in.
Revision history for this message
Alberts Muktupāvels (muktupavels) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/main.vala'
2--- lib/main.vala 2022-08-03 17:18:48 +0000
3+++ lib/main.vala 2024-09-24 20:24:19 +0000
4@@ -100,6 +100,8 @@
5 Gdk.init (ref args);
6 }
7
8+ IBus.init ();
9+
10 if (is_login_user ()) {
11 var name = Environment.get_variable ("UNITY_GREETER_DBUS_NAME");
12
13@@ -188,7 +190,6 @@
14 [DBus (visible = false)]
15 private IBus.Bus get_ibus () {
16 if (ibus == null) {
17- IBus.init ();
18
19 var proxy = new IBus.Bus ();
20
21
22=== modified file 'lib/source.vala'
23--- lib/source.vala 2016-08-03 16:41:07 +0000
24+++ lib/source.vala 2024-09-24 20:24:19 +0000
25@@ -127,7 +127,6 @@
26
27 private static IBus.Bus get_ibus_bus () {
28 if (ibus_bus == null) {
29- IBus.init ();
30 ibus_bus = new IBus.Bus ();
31 }
32

Subscribers

People subscribed via source and target branches

to all changes: