pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 478843 from GNOME:Next

Browse Source 
- Drop ibus-vala-0.36.patch: No longer needed, since vala 0.36
  re-introduced the compatibility layer.

OBS-URL: https://build.opensuse.org/request/show/478843
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=160
This commit is contained in:
Marguerite Su 2017-03-13 13:17:53 +00:00 committed by Git OBS Bridge
parent 0f76521279
commit 655095f7d3
3 changed files with 6 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ibus-vala-0.36.patch
View File

@ -1,62 +0,0 @@
diff --git a/ui/gtk3/indicator.vala b/ui/gtk3/indicator.vala
index dac72b49..7da0fa92 100644
--- a/ui/gtk3/indicator.vala
+++ b/ui/gtk3/indicator.vala
@@ -139,12 +139,17 @@ class Indicator : IBus.Service
m_watcher_interface_info =
m_watcher_node_info.lookup_interface(
NOTIFICATION_WATCHER_DBUS_IFACE);
- check_connect();
+ try {
+ check_connect();
+ } catch (GLib.IOError e) {
+ warning("Failed to call dbus proxy: " + e.message);
+ return;
+ }
}
- private void check_connect() {
+ private async void check_connect() throws IOError {
if (m_proxy == null) {
- GLib.DBusProxy.new.begin(
+ m_proxy = yield new GLib.DBusProxy(
connection,
GLib.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES |
GLib.DBusProxyFlags.DO_NOT_CONNECT_SIGNALS,
@@ -152,23 +157,7 @@ class Indicator : IBus.Service
NOTIFICATION_WATCHER_DBUS_ADDR,
NOTIFICATION_WATCHER_DBUS_OBJ,
NOTIFICATION_WATCHER_DBUS_IFACE,
- null,
- (obj, res) => {
- bus_watcher_ready(obj, res);
- });
- } else {
- bus_watcher_ready(null, null);
- }
- }
-
- private void bus_watcher_ready(GLib.Object? obj, GLib.AsyncResult? res) {
- if (res != null) {
- try {
- m_proxy = GLib.DBusProxy.new.end(res);
- } catch (GLib.IOError e) {
- warning("Failed to call dbus proxy: " + e.message);
- return;
- }
+ null);
m_proxy.notify["g-name-owner"].connect((obj, pspec) => {
var name = m_proxy.get_name_owner();
@@ -176,7 +165,10 @@ class Indicator : IBus.Service
check_connect();
});
}
+ bus_watcher_ready();
+ }
+ private void bus_watcher_ready() {
var name = m_proxy.get_name_owner();
// KDE panel does not run yet if name == null
if (name == null)

6
ibus.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Mar 12 14:41:40 UTC 2017 - dimstar@opensuse.org
- Drop ibus-vala-0.36.patch: No longer needed, since vala 0.36
re-introduced the compatibility layer.
-------------------------------------------------------------------
Wed Mar 1 14:25:29 UTC 2017 - zaitor@opensuse.org

5
ibus.spec
View File

@ -70,8 +70,6 @@ Patch10: hide-setup-menu.patch
# PATCH-FIX-SLE setup-switch-im.patch bnc#899259 qzhao@suse.com
# switch to ibus when ibus not running.
Patch11: setup-switch-im.patch
# PATCH-FIX-UPSTREAM ibus-vala-0.36.patch dimstar@opensuse.org -- Fix build with vala 0.36
Patch12: ibus-vala-0.36.patch
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel >= 0.83.0
BuildRequires: dconf-devel >= 0.7.5
@ -260,9 +258,6 @@ sed -i \
%patch10 -p1
%patch11 -p1
%endif
if pkg-config --atleast-version 0.35 vapigen; then
%patch12 -p1
fi
cp -r %{SOURCE2} .
cp -r %{SOURCE3} .