[polari] flatpak: Poke holes for TpRoomList
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] flatpak: Poke holes for TpRoomList
- Date: Sat, 25 Feb 2017 15:39:12 +0000 (UTC)
commit 0ac15fce2b6368c89a23a034521b81e60710d44f
Author: Florian Müllner <fmuellner gnome org>
Date: Fri Feb 17 09:20:23 2017 +0100
flatpak: Poke holes for TpRoomList
For some reason, room lists require their own (uniquified) telepathy
client. Flatpak allows us to use a wildcard for the last name element,
so with a small patch to make telepathy-glib append only a single name
element when uniquifying names, we can poke the necessary hole in the
sandbox.
https://bugzilla.gnome.org/show_bug.cgi?id=778850
build-aux/flatpak/tp-change-uniquify.patch | 25 +++++++++++++++++++++++++
org.gnome.Polari.json | 5 +++++
2 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/build-aux/flatpak/tp-change-uniquify.patch b/build-aux/flatpak/tp-change-uniquify.patch
new file mode 100644
index 0000000..98e9b0b
--- /dev/null
+++ b/build-aux/flatpak/tp-change-uniquify.patch
@@ -0,0 +1,25 @@
+From fd733c82ba71201ab7793a38e8fc2fb47a9062f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner gnome org>
+Date: Sun, 19 Feb 2017 00:40:05 +0100
+Subject: [PATCH] base-client: Append a single element when uniquifying name
+
+---
+ telepathy-glib/base-client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
+index 600f292..7f5c155 100644
+--- a/telepathy-glib/base-client.c
++++ b/telepathy-glib/base-client.c
+@@ -1347,7 +1347,7 @@ tp_base_client_constructed (GObject *object)
+ unique = tp_escape_as_identifier (tp_dbus_daemon_get_unique_name (
+ self->priv->dbus));
+
+- g_string_append_printf (string, ".%s.n%u", unique, unique_counter++);
++ g_string_append_printf (string, ".%sn%u", unique, unique_counter++);
+ g_free (unique);
+ }
+
+--
+2.9.3
+
diff --git a/org.gnome.Polari.json b/org.gnome.Polari.json
index 5f7f2b2..260c1a9 100644
--- a/org.gnome.Polari.json
+++ b/org.gnome.Polari.json
@@ -19,6 +19,7 @@
"--talk-name=org.freedesktop.Telepathy.AccountManager",
"--talk-name=org.freedesktop.Telepathy.ChannelDispatcher",
"--talk-name=org.freedesktop.Telepathy.Connection.idle.irc.*",
+ "--own-name=org.freedesktop.Telepathy.Client.TpGLibRequestAndHandle.*",
/* Keyring */
"--talk-name=org.freedesktop.secrets",
/* log files written by tp-logger outside the sandbox */
@@ -55,6 +56,10 @@
"type": "archive",
"url":
"http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.1.tar.gz",
"sha256": "9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb"
+ },
+ {
+ "type": "patch",
+ "path": "build-aux/flatpak/tp-change-uniquify.patch"
}
]
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]