[polari] Remove MessageDialog
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] Remove MessageDialog
- Date: Tue, 23 Feb 2016 17:08:00 +0000 (UTC)
commit 06bd9b0199a30a751577f31c4bb63bd7f8957d14
Author: Florian Müllner <fmuellner gnome org>
Date: Sat Jan 30 01:43:56 2016 +0100
Remove MessageDialog
While in theory it is nice to have a place to start a conversation
without locating the other person in some chatroom first, the dialog
never actually provided that in practice, provided that telepathy will
happily open channels to /dev/null. In the end it is much more useful
to start conversations from the user list (or even the /query command),
so stop dragging the dialog along ...
data/org.gnome.Polari.data.gresource.xml | 1 -
data/resources/help-overlay.ui | 6 -
data/resources/main-window.ui | 4 -
data/resources/message-user-dialog.ui | 139 ----------------------
po/POTFILES.in | 2 -
src/application.js | 16 ---
src/mainWindow.js | 6 -
src/messageDialog.js | 183 ------------------------------
src/org.gnome.Polari.src.gresource.xml | 1 -
9 files changed, 0 insertions(+), 358 deletions(-)
---
diff --git a/data/org.gnome.Polari.data.gresource.xml b/data/org.gnome.Polari.data.gresource.xml
index 5fc4fcf..542288e 100644
--- a/data/org.gnome.Polari.data.gresource.xml
+++ b/data/org.gnome.Polari.data.gresource.xml
@@ -10,7 +10,6 @@
<file alias="ui/entry-area.ui" preprocess="xml-stripblanks">resources/entry-area.ui</file>
<file alias="ui/join-room-dialog.ui" preprocess="xml-stripblanks">resources/join-room-dialog.ui</file>
<file alias="ui/main-window.ui" preprocess="xml-stripblanks">resources/main-window.ui</file>
- <file alias="ui/message-user-dialog.ui"
preprocess="xml-stripblanks">resources/message-user-dialog.ui</file>
<file alias="ui/room-list-header.ui" preprocess="xml-stripblanks">resources/room-list-header.ui</file>
<file alias="ui/room-list-row.ui" preprocess="xml-stripblanks">resources/room-list-row.ui</file>
<file alias="ui/user-list-details.ui" preprocess="xml-stripblanks">resources/user-list-details.ui</file>
diff --git a/data/resources/help-overlay.ui b/data/resources/help-overlay.ui
index 019f418..d6faa22 100644
--- a/data/resources/help-overlay.ui
+++ b/data/resources/help-overlay.ui
@@ -21,12 +21,6 @@
<child>
<object class="GtkShortcutsShortcut">
<property name="visible">True</property>
- <property name="title" translatable="yes" context="shortcut window">Message User</property>
- <property name="accelerator"><Primary>m</property>
- </object>
- </child>
- <child>
- <object class="GtkShortcutsShortcut">
<property name="visible">True</property>
<property name="title" translatable="yes" context="shortcut window">Leave Room</property>
<property name="accelerator"><Primary>w</property>
diff --git a/data/resources/main-window.ui b/data/resources/main-window.ui
index 4489643..c7a18f2 100644
--- a/data/resources/main-window.ui
+++ b/data/resources/main-window.ui
@@ -6,10 +6,6 @@
<attribute name="label" translatable="yes">Join a Room</attribute>
<attribute name="action">app.show-join-dialog</attribute>
</item>
- <item>
- <attribute name="label" translatable="yes">Message a User</attribute>
- <attribute name="action">app.show-message-user-dialog</attribute>
- </item>
</section>
</menu>
<object class="Gjs_UserListPopover" id="userListPopover">
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5324e01..cd8c721 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,7 +8,6 @@ data/org.gnome.Polari.gschema.xml
[type: gettext/glade]data/resources/join-room-dialog.ui
[type: gettext/glade]data/resources/main-window.ui
[type: gettext/glade]data/resources/menus.ui
-[type: gettext/glade]data/resources/message-user-dialog.ui
[type: gettext/glade]data/resources/room-list-header.ui
[type: gettext/glade]data/resources/user-list-details.ui
src/application.js
@@ -19,7 +18,6 @@ src/entryArea.js
src/ircParser.js
src/joinDialog.js
src/mainWindow.js
-src/messageDialog.js
src/pasteManager.js
src/roomList.js
src/roomStack.js
diff --git a/src/application.js b/src/application.js
index 925577d..72b6102 100644
--- a/src/application.js
+++ b/src/application.js
@@ -58,10 +58,6 @@ const Application = new Lang.Class({
{ name: 'show-join-dialog',
activate: Lang.bind(this, this._onShowJoinDialog),
accels: ['<Primary>n'] },
- { name: 'show-message-user-dialog',
- activate: Lang.bind(this, this._onShowMessageUserDialog),
- create_hook: Lang.bind(this, this._accountActionsCreateHook),
- accels: ['<Primary>m'] },
{ name: 'join-room',
activate: Lang.bind(this, this._onJoinRoom),
parameter_type: GLib.VariantType.new('(ssu)') },
@@ -160,14 +156,6 @@ const Application = new Lang.Class({
}).length > 0;
},
- _accountActionsCreateHook: function(action) {
- this._accountsMonitor.connect('accounts-changed', Lang.bind(this,
- function() {
- this._updateAccountAction(action);
- }));
- this._updateAccountAction(action);
- },
-
_leaveRoomCreateHook: function(action) {
this._chatroomManager.connect('active-changed', Lang.bind(this,
function() {
@@ -197,10 +185,6 @@ const Application = new Lang.Class({
this._window.showJoinRoomDialog();
},
- _onShowMessageUserDialog: function() {
- this._window.showMessageUserDialog();
- },
-
_savedChannelIndex: function(savedChannels, account, channel) {
let accountPath = account.get_object_path();
let matchChannel = channel.toLowerCase();
diff --git a/src/mainWindow.js b/src/mainWindow.js
index 136ba81..7700786 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -11,7 +11,6 @@ const ChatroomManager = imports.chatroomManager;
const JoinDialog = imports.joinDialog;
const Lang = imports.lang;
const Mainloop = imports.mainloop;
-const MessageDialog = imports.messageDialog;
const RoomList = imports.roomList;
const RoomStack = imports.roomStack;
const UserList = imports.userList;
@@ -299,11 +298,6 @@ const MainWindow = new Lang.Class({
dialog.show();
},
- showMessageUserDialog: function() {
- let dialog = new MessageDialog.MessageDialog({ transient_for: this });
- dialog.show();
- },
-
_updateUserListLabel: function() {
let numMembers = 0;
diff --git a/src/org.gnome.Polari.src.gresource.xml b/src/org.gnome.Polari.src.gresource.xml
index 685306f..6acfd23 100644
--- a/src/org.gnome.Polari.src.gresource.xml
+++ b/src/org.gnome.Polari.src.gresource.xml
@@ -12,7 +12,6 @@
<file>joinDialog.js</file>
<file>main.js</file>
<file>mainWindow.js</file>
- <file>messageDialog.js</file>
<file>networksManager.js</file>
<file>pasteManager.js</file>
<file>roomList.js</file>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]