From 79587644b486bb42301535882e5d967f0045a738 Mon Sep 17 00:00:00 2001
From: Teja <mail@tejaphilipp.de>
Date: Tue, 14 Jul 2015 21:33:13 +0200
Subject: [PATCH] fixed update source and deprecation warnings

---
 src/octoprint/plugins/laser_safety_notes/__init__.py | 2 +-
 src/octoprint/plugins/softwareupdate/__init__.py     | 5 +++--
 src/octoprint/plugins/svgtogcode/__init__.py         | 2 +-
 src/octoprint/templates/dialogs/settings.jinja2      | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/octoprint/plugins/laser_safety_notes/__init__.py b/src/octoprint/plugins/laser_safety_notes/__init__.py
index 511e8370..0bdab8b1 100644
--- a/src/octoprint/plugins/laser_safety_notes/__init__.py
+++ b/src/octoprint/plugins/laser_safety_notes/__init__.py
@@ -55,7 +55,7 @@ class LaserSafetyNotesPlugin(octoprint.plugin.SettingsPlugin,
 	def on_settings_save(self, data):
 		if "has_agreed" in data:
 			has_agreed = data["has_agreed"] in octoprint.settings.valid_boolean_trues
-			s.setBoolean(["agreed_to_safety_notes"], has_agreed)
+			s.set_boolean(["agreed_to_safety_notes"], has_agreed)
 
 	##~~ TemplatePlugin API
 
diff --git a/src/octoprint/plugins/softwareupdate/__init__.py b/src/octoprint/plugins/softwareupdate/__init__.py
index 157f671b..e691f8ea 100644
--- a/src/octoprint/plugins/softwareupdate/__init__.py
+++ b/src/octoprint/plugins/softwareupdate/__init__.py
@@ -127,8 +127,9 @@ class SoftwareUpdatePlugin(octoprint.plugin.BlueprintPlugin,
 		return {
 			"checks": {
 				"octoprint": {
-					"type": "github_release",
-					"user": "foosel",
+					#"type": "github_release",
+					"type": "github_commit",
+					"user": "mrbeam",
 					"repo": "OctoPrint",
 					"update_script": "{{python}} \"{update_script}\" --python=\"{{python}}\" \"{{folder}}\" {{target}}".format(update_script=os.path.join(self._basefolder, "scripts", "update-octoprint.py")),
 					"restart": "octoprint"
diff --git a/src/octoprint/plugins/svgtogcode/__init__.py b/src/octoprint/plugins/svgtogcode/__init__.py
index 0e8c8d12..828646e0 100644
--- a/src/octoprint/plugins/svgtogcode/__init__.py
+++ b/src/octoprint/plugins/svgtogcode/__init__.py
@@ -279,7 +279,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
 					self._svgtogcode_logger.setLevel(logging.DEBUG)
 				else:
 					self._svgtogcode_logger.setLevel(logging.CRITICAL)
-			s.setBoolean(["debug_logging"], new_debug_logging)
+			s.set_boolean(["debug_logging"], new_debug_logging)
 
 	##~~ TemplatePlugin API
 
diff --git a/src/octoprint/templates/dialogs/settings.jinja2 b/src/octoprint/templates/dialogs/settings.jinja2
index 40f3b931..cd86487b 100644
--- a/src/octoprint/templates/dialogs/settings.jinja2
+++ b/src/octoprint/templates/dialogs/settings.jinja2
@@ -7,7 +7,7 @@
     <div class="modal-body">
         <div class="full-sized-box">
             <div class="tabbable row-fluid">
-                <div class="span3 scrollable" id="settings_dialog_menu">
+                <div class="span3" id="settings_dialog_menu">
                     <ul class="nav nav-list" id="settingsTabs">
                         {% set mark_active = True %}
                         {% for key in templates.settings.order %}