[polari/wip/fmuellner/nickserv: 14/28] chatroomManager: Rename to TelepathyClient



commit a5e0db986fea975582f160b26946cc062f43090a
Author: Florian Müllner <fmuellner gnome org>
Date:   Sat Jul 30 22:11:08 2016 +0200

    chatroomManager: Rename to TelepathyClient
    
    With room management now moved to its own module, the existing name
    becomes a relict that doesn't make sense anymore. As the primary
    functions are now registering as a channel observer and handler with
    and requesting channels from mission control, TelepathyClient looks like
    a reasonable pick.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=769655

 po/POTFILES.in                                 |    2 +-
 src/application.js                             |    6 +++---
 src/org.gnome.Polari.src.gresource.xml         |    2 +-
 src/{chatroomManager.js => telepathyClient.js} |    6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 5ea0453..8531aa0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,6 @@ data/resources/room-list-header.ui
 data/resources/user-list-details.ui
 src/application.js
 src/appNotifications.js
-src/chatroomManager.js
 src/chatView.js
 src/connections.js
 src/entryArea.js
@@ -22,5 +21,6 @@ src/mainWindow.js
 src/pasteManager.js
 src/roomList.js
 src/roomStack.js
+src/telepathyClient.js
 src/userList.js
 src/utils.js
diff --git a/src/application.js b/src/application.js
index 9addb0b..9c35ea5 100644
--- a/src/application.js
+++ b/src/application.js
@@ -6,12 +6,12 @@ const Tp = imports.gi.TelepathyGLib;
 
 const AccountsMonitor = imports.accountsMonitor;
 const AppNotifications = imports.appNotifications;
-const ChatroomManager = imports.chatroomManager;
 const Connections = imports.connections;
 const Lang = imports.lang;
 const MainWindow = imports.mainWindow;
 const PasteManager = imports.pasteManager;
 const RoomManager = imports.roomManager;
+const TelepathyClient = imports.telepathyClient;
 const Utils = imports.utils;
 const NetworksManager = imports.networksManager;
 
@@ -119,7 +119,7 @@ const Application = new Lang.Class({
             this.set_accels_for_action('app.nth-room(%d)'.format(i), ['<Alt>' + i]);
 
         this._roomManager = RoomManager.getDefault();
-        this._chatroomManager = ChatroomManager.getDefault();
+        this._client = TelepathyClient.getDefault();
         this._accountsMonitor = AccountsMonitor.getDefault();
         this._networksManager = NetworksManager.getDefault();
 
@@ -138,7 +138,7 @@ const Application = new Lang.Class({
                                  () => { this.emit('prepare-shutdown'); });
             this._window.show_all();
 
-            this._chatroomManager.lateInit();
+            this._client.lateInit();
         }
         this._window.present();
     },
diff --git a/src/org.gnome.Polari.src.gresource.xml b/src/org.gnome.Polari.src.gresource.xml
index ec4d5a9..4e3a0ec 100644
--- a/src/org.gnome.Polari.src.gresource.xml
+++ b/src/org.gnome.Polari.src.gresource.xml
@@ -4,7 +4,6 @@
     <file>accountsMonitor.js</file>
     <file>application.js</file>
     <file>appNotifications.js</file>
-    <file>chatroomManager.js</file>
     <file>chatView.js</file>
     <file>connections.js</file>
     <file>entryArea.js</file>
@@ -18,6 +17,7 @@
     <file>roomManager.js</file>
     <file>roomStack.js</file>
     <file>tabCompletion.js</file>
+    <file>telepathyClient.js</file>
     <file>userList.js</file>
     <file>utils.js</file>
   </gresource>
diff --git a/src/chatroomManager.js b/src/telepathyClient.js
similarity index 99%
rename from src/chatroomManager.js
rename to src/telepathyClient.js
index 9e8a5bc..02242a6 100644
--- a/src/chatroomManager.js
+++ b/src/telepathyClient.js
@@ -33,7 +33,7 @@ let _singleton = null;
 
 function getDefault() {
     if (_singleton == null)
-        _singleton = new _ChatroomManager();
+        _singleton = new _TelepathyClient();
     return _singleton;
 }
 
@@ -142,8 +142,8 @@ const Client = new Lang.Class({
     }
 });
 
-const _ChatroomManager = new Lang.Class({
-    Name: '_ChatroomManager',
+const _TelepathyClient = new Lang.Class({
+    Name: '_TelepathyClient',
 
     _init: function() {
         this._app = Gio.Application.get_default();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]