[polari] roomListHeader: Set action-name after -target
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] roomListHeader: Set action-name after -target
- Date: Fri, 13 Jul 2018 09:05:30 +0000 (UTC)
commit 99bc738f683c48bc8f9d8957f8bd108d7dc054a6
Author: Florian Müllner <fmuellner gnome org>
Date: Sat Jun 16 00:09:07 2018 +0200
roomListHeader: Set action-name after -target
Otherwise we'll get a warning with recent GTK+/gjs that the action
cannot be activated due to a parameter type mismatch.
https://gitlab.gnome.org/GNOME/polari/merge_requests/48
data/resources/room-list-header.ui | 5 -----
src/roomList.js | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/data/resources/room-list-header.ui b/data/resources/room-list-header.ui
index b235c04..ad86be3 100644
--- a/data/resources/room-list-header.ui
+++ b/data/resources/room-list-header.ui
@@ -142,7 +142,6 @@
<object class="GtkModelButton" id="popoverConnect">
<property name="xalign">0</property>
<property name="visible">True</property>
- <property name="action-name">app.connect-account</property>
<property name="text" translatable="yes">Connect</property>
</object>
</child>
@@ -150,7 +149,6 @@
<object class="GtkModelButton" id="popoverReconnect">
<property name="xalign">0</property>
<property name="visible">True</property>
- <property name="action-name">app.reconnect-account</property>
<property name="text" translatable="yes">Reconnect</property>
</object>
</child>
@@ -158,7 +156,6 @@
<object class="GtkModelButton" id="popoverDisconnect">
<property name="xalign">0</property>
<property name="visible">True</property>
- <property name="action-name">app.disconnect-account</property>
<property name="text" translatable="yes">Disconnect</property>
</object>
</child>
@@ -166,7 +163,6 @@
<object class="GtkModelButton" id="popoverRemove">
<property name="xalign">0</property>
<property name="visible">True</property>
- <property name="action-name">app.remove-connection</property>
<property name="text" translatable="yes">Remove</property>
</object>
</child>
@@ -174,7 +170,6 @@
<object class="GtkModelButton" id="popoverProperties">
<property name="xalign">0</property>
<property name="visible">True</property>
- <property name="action-name">app.edit-connection</property>
<property name="text" translatable="yes">Properties</property>
</object>
</child>
diff --git a/src/roomList.js b/src/roomList.js
index 53a21c3..f96eb91 100644
--- a/src/roomList.js
+++ b/src/roomList.js
@@ -234,10 +234,15 @@ var RoomListHeader = GObject.registerClass({
let target = new GLib.Variant('o', this._account.get_object_path());
this._popoverConnect.action_target = target;
+ this._popoverConnect.action_name = 'app.connect-account';
this._popoverDisconnect.action_target = target;
+ this._popoverDisconnect.action_name = 'app.disconnect-account';
this._popoverReconnect.action_target = target;
+ this._popoverReconnect.action_name = 'app.reconnect-account';
this._popoverRemove.action_target = target;
+ this._popoverRemove.action_name = 'app.remove-connection';
this._popoverProperties.action_target = target;
+ this._popoverProperties.action_name = 'app.edit-connection';
this._popoverPassword.connect('activate', () => {
let action = this._app.lookup_action('authenticate-account');
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]