@@ -61,15 +61,6 @@ function init(event) { // Only preload SamePlace if there's no other window around with // an active SamePlace instance, and if this isn't a popup.' - try { - Components - .classes['@hyperstruct.net/sameplace/connectors/service;1'] - .getService(Components.interfaces.nsIXMPPPresenceNotificationService); - - } catch(exp) { - Components.utils.reportError(exp); // report the error and continue execution - } - if(!isActiveSomewhere() && !isPopupWindow()) loadAreas(); chrome/content/overlay_impl.js @@ -49,28 +49,11 @@ src="chrome://sameplace/content/preferences/preferences_sameplace.xul" onpaneload="sameplacePrefs.init();"/> - <prefpane id="notifyme-pane" - insertafter="sameplace-pane" - label="Notify me" - image="chrome://sameplace/skin/logo_nm.png" - src="chrome://sameplace/content/preferences/preferences_notifyme.xul" - onpaneload="notifymePrefs.init();"/> - <!-- - <prefpane id="roomsautojoin-pane" - insertafter="notifyme-pane" - label="Rooms Auto-join" - image="chrome://sameplace/skin/logo_nm.png" - src="chrome://sameplace/content/preferences/preferences_roomsautojoin.xul" - onpaneload="notifymeRoomsAutojoin.init();" - /> - --> <!-- These need be down here or pane order in Firefox2 will be wrong. --> <script type="application/x-javascript;version=1.7" src="chrome://xmpp4moz/content/xmpp.js"/> <script type="application/x-javascript;version=1.7" src="../lib/getElementsBySelector.js"/> <script type="application/x-javascript;version=1.7" src="preferences_accounts.js"/> <script type="application/x-javascript;version=1.7" src="preferences_sameplace.js"/> - <script type="application/x-javascript;version=1.7" src="preferences_notifyme.js"/> - <script type="application/x-javascript;version=1.7" src="preferences_roomsautojoin.js"/> </prefwindow> chrome/content/preferences/preferences.xul @@ -7,10 +7,4 @@ pref("extensions.sameplace.toggleContactsKey", pref("extensions.sameplace@hyperstruct.net.description", "chrome://sameplace/locale/sameplace.properties"); pref("extensions.sameplace.branch", "devel"); pref("extensions.sameplace.chatArea", ""); -pref("extensions.sameplace.addToolbarButton", true); -pref("extensions.sameplace.popup", true); -pref("extensions.sameplace.roomspopup", true); -pref("extensions.sameplace.sound", true); -pref("extensions.sameplace.autorec", true); -pref("extensions.sameplace.autojoin", false); -pref("extensions.sameplace.usersArray", "[]"); \ No newline at end of file +pref("extensions.sameplace.addToolbarButton", true); \ No newline at end of file defaults/preferences/sameplace.js 1e85cf700fe1097609974e5da463171b44f08970 Massimiliano Mirra bard@hyperstruct.net http://github.com/bard/sameplace/commit/e128787d7f0a7a3b2ccf828d35b61b5e8fa37c69 e128787d7f0a7a3b2ccf828d35b61b5e8fa37c69 2008-09-26T04:18:55-07:00 2008-09-26T04:18:55-07:00 Revert "Sameplace: NotifyMe features integration" This reverts commit c0001c3c624729bc8cd9d7be7b482cb9eef78fea. 4823f5782708f31e92423fb3606d9637baead5c9 Massimiliano Mirra bard@hyperstruct.net