From 51ffb4f5da328ef4f65b705f6e9824bcbcdc6e80 Mon Sep 17 00:00:00 2001
From: George Secrieru <george.secrieru@gmail.com>
Date: Sat, 17 Oct 2015 10:05:36 -0300
Subject: [PATCH] Providing access to settings subscription in order to setup
 client-side upload objects

---
 packages/rocketchat-lib/package.js                        | 2 --
 packages/rocketchat-lib/settings/client/rocketchat.coffee | 3 ++-
 packages/rocketchat-lib/settings/client/startup.coffee    | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)
 delete mode 100644 packages/rocketchat-lib/settings/client/startup.coffee

diff --git a/packages/rocketchat-lib/package.js b/packages/rocketchat-lib/package.js
index cd20abff3c4..6df34893079 100644
--- a/packages/rocketchat-lib/package.js
+++ b/packages/rocketchat-lib/package.js
@@ -44,13 +44,11 @@ Package.onUse(function(api) {
 
 	api.addFiles('settings/lib/settings.coffee');
 
-
 	// CLIENT
 	api.addFiles('client/Notifications.coffee', 'client');
 	api.addFiles('client/TabBar.coffee', 'client');
 	api.addFiles('client/MessageAction.coffee', 'client');
 
-	api.addFiles('settings/client/startup.coffee', 'client');
 	api.addFiles('settings/client/rocketchat.coffee', 'client');
 
 	// SERVER
diff --git a/packages/rocketchat-lib/settings/client/rocketchat.coffee b/packages/rocketchat-lib/settings/client/rocketchat.coffee
index 3e30a004cb4..4fff6096b2d 100644
--- a/packages/rocketchat-lib/settings/client/rocketchat.coffee
+++ b/packages/rocketchat-lib/settings/client/rocketchat.coffee
@@ -5,8 +5,9 @@
 
 settingsDict = new ReactiveDict('settings')
 
+RocketChat.settings.subscription = Meteor.subscribe 'settings'
 RocketChat.settings.get = (_id) ->
 	return settingsDict.get(_id)
 
 RocketChat.settings.onload '*', (key, value) ->
-	return settingsDict.set key, value
+	return settingsDict.set key, value
\ No newline at end of file
diff --git a/packages/rocketchat-lib/settings/client/startup.coffee b/packages/rocketchat-lib/settings/client/startup.coffee
deleted file mode 100644
index 9e4f4b080ae..00000000000
--- a/packages/rocketchat-lib/settings/client/startup.coffee
+++ /dev/null
@@ -1,2 +0,0 @@
-Meteor.startup ->
-	Meteor.subscribe 'settings'