diff --git a/src/Conf.defaults b/src/Conf.defaults index 962b18a8..24d034dc 100644 --- a/src/Conf.defaults +++ b/src/Conf.defaults @@ -25,7 +25,6 @@ current_soundpack = string(default="default") indicate_audio = boolean(default=True) indicate_geo = boolean(default=True) indicate_img = boolean(default=True) -sndup_api_key = string(default="") [other_buffers] timelines = list(default=list()) diff --git a/src/controller/settings.py b/src/controller/settings.py index af49fb1d..79dc51b1 100644 --- a/src/controller/settings.py +++ b/src/controller/settings.py @@ -164,13 +164,7 @@ class accountSettingsController(globalSettingsController): self.dialog.set_value("sound", "indicate_audio", self.config["sound"]["indicate_audio"]) self.dialog.set_value("sound", "indicate_geo", self.config["sound"]["indicate_geo"]) self.dialog.set_value("sound", "indicate_img", self.config["sound"]["indicate_img"]) - self.dialog.create_services() -# if self.config["services"]["pocket_access_token"] == "": -# self.dialog.services.set_pocket(False) -# else: -# self.dialog.services.set_pocket(True) -# widgetUtils.connect_event(self.dialog.services.pocketBtn, widgetUtils.BUTTON_PRESSED, self.manage_pocket) - self.dialog.set_value("services", "apiKey", self.config["sound"]["sndup_api_key"]) + self.dialog.create_extras() self.dialog.realize() self.dialog.set_title(_(u"Account settings for %s") % (self.user,)) self.response = self.dialog.get_response() @@ -245,7 +239,7 @@ class accountSettingsController(globalSettingsController): self.config["sound"]["indicate_img"] = self.dialog.get_value("sound", "indicate_img") self.buffer.session.sound.config = self.config["sound"] self.buffer.session.sound.check_soundpack() - self.config["sound"]["sndup_api_key"] = self.dialog.get_value("services", "apiKey") + self.config.write() def toggle_state(self,*args,**kwargs): diff --git a/src/extra/AudioUploader/audioUploader.py b/src/extra/AudioUploader/audioUploader.py index d49c1046..6f6518f4 100644 --- a/src/extra/AudioUploader/audioUploader.py +++ b/src/extra/AudioUploader/audioUploader.py @@ -52,11 +52,7 @@ class audioUploader(object): self.uploaderDialog = wx_transfer_dialogs.UploadDialog(self.file) output.speak(_(u"Attaching...")) if self.dialog.get("services") == "SNDUp": - base_url = "http://sndup.net/post.php" - if len(self.config["sound"]["sndup_api_key"]) > 0: - url = base_url + '?apikey=' + self.config['sound']['sndup_api_key'] - else: - url = base_url + url = "http://sndup.net/post.php" elif self.dialog.get("services") == "TwUp": url = "http://api.twup.me/post.json" self.uploaderFunction = transfer.Upload(obj=self, field='file', url=url, filename=self.file, completed_callback=completed_callback)