[patch] Patch that removes references to sound in the gtk user interface

deluge-1.1.9-remove-sound.patch (text/plain), 6.17 KB, created by Brian Gifford on 2010-01-25 02:06:49 UTC

Files deluge-1.1.9/deluge/ui/gtkui/glade/.preferences_dialog.glade.swp and deluge-patch/deluge/ui/gtkui/glade/.preferences_dialog.glade.swp differ
diff -urN deluge-1.1.9/deluge/ui/gtkui/glade/preferences_dialog.glade deluge-patch/deluge/ui/gtkui/glade/preferences_dialog.glade
--- deluge-1.1.9/deluge/ui/gtkui/glade/preferences_dialog.glade	2009-03-15 14:38:08.000000000 -0400
+++ deluge-patch/deluge/ui/gtkui/glade/preferences_dialog.glade	2010-01-24 20:41:35.000000000 -0500
@@ -3740,7 +3740,7 @@
                                                 <property name="n_rows">3</property>
                                                 <property name="n_columns">2</property>
                                                 <property name="column_spacing">5</property>
-                                                <child>
+                                                <!-- <child>
                                                   <widget class="GtkCheckButton" id="chk_ntf_sound">
                                                     <property name="visible">True</property>
                                                     <property name="can_focus">True</property>
@@ -3755,7 +3755,7 @@
                                                     <property name="bottom_attach">3</property>
                                                     <property name="x_options">GTK_FILL</property>
                                                   </packing>
-                                                </child>
+                                                </child>-->
                                                 <child>
                                                   <widget class="GtkCheckButton" id="chk_ntf_popup">
                                                     <property name="visible">True</property>
diff -urN deluge-1.1.9/deluge/ui/gtkui/gtkui.py deluge-patch/deluge/ui/gtkui/gtkui.py
--- deluge-1.1.9/deluge/ui/gtkui/gtkui.py	2009-04-09 12:40:52.000000000 -0400
+++ deluge-patch/deluge/ui/gtkui/gtkui.py	2010-01-24 20:27:21.000000000 -0500
@@ -104,8 +104,8 @@
     "show_new_releases": True,
     "signal_port": 40000,
     "ntf_tray_blink": True,
-    "ntf_sound": False,
-    "ntf_sound_path": deluge.common.get_default_download_dir(),
+    # "ntf_sound": False,
+    # "ntf_sound_path": deluge.common.get_default_download_dir(),
     "ntf_popup": False,
     "ntf_email": False,
     "ntf_email_add": "",
diff -urN deluge-1.1.9/deluge/ui/gtkui/notification.py deluge-patch/deluge/ui/gtkui/notification.py
--- deluge-1.1.9/deluge/ui/gtkui/notification.py	2009-05-13 16:52:51.000000000 -0400
+++ deluge-patch/deluge/ui/gtkui/notification.py	2010-01-24 19:53:29.000000000 -0500
@@ -84,20 +84,20 @@
 
     def sound(self):
         """plays a sound when a torrent finishes"""
-        try:
-            import pygame
-        except:
-            log.warning("pygame is not installed")
-        else:
-            pygame.init()
-            try:
-                alert_sound = pygame.mixer.music
-                alert_sound.load(self.config["ntf_sound_path"])
-                alert_sound.play()
-            except pygame.error, message:
-                log.warning("pygame failed to play because %s" % (message))
-            else:
-                log.info("sound notification played successfully")
+        # try:
+            # import pygame
+        # except:
+            # log.warning("pygame is not installed")
+        # else:
+            # pygame.init()
+            # try:
+            #    alert_sound = pygame.mixer.music
+            #    alert_sound.load(self.config["ntf_sound_path"])
+            #    alert_sound.play()
+            # except pygame.error, message:
+            #    log.warning("pygame failed to play because %s" % (message))
+            # else:
+            #    log.info("sound notification played successfully")
 
     def email(self, status):
         """sends email notification of finished torrent"""
diff -urN deluge-1.1.9/deluge/ui/gtkui/preferences.py deluge-patch/deluge/ui/gtkui/preferences.py
--- deluge-1.1.9/deluge/ui/gtkui/preferences.py	2009-04-06 16:24:02.000000000 -0400
+++ deluge-patch/deluge/ui/gtkui/preferences.py	2010-01-24 20:26:46.000000000 -0500
@@ -452,10 +452,10 @@
                 self.gtkui_config["ntf_popup"])
         self.glade.get_widget("chk_ntf_email").set_active(
             self.gtkui_config["ntf_email"])
-        self.glade.get_widget("chk_ntf_sound").set_active(
-            self.gtkui_config["ntf_sound"])
-        if self.gtkui_config["ntf_sound_path"]:
-            self.glade.get_widget("combo_ntf_sound_path").set_filename(self.gtkui_config["ntf_sound_path"])
+        # self.glade.get_widget("chk_ntf_sound").set_active(
+        #    self.gtkui_config["ntf_sound"])
+        # if self.gtkui_config["ntf_sound_path"]:
+        #    self.glade.get_widget("combo_ntf_sound_path").set_filename(self.gtkui_config["ntf_sound_path"])
         self.glade.get_widget("txt_ntf_email").set_text(
             self.gtkui_config["ntf_email_add"])
         self.glade.get_widget("txt_ntf_server").set_text(
@@ -632,8 +632,8 @@
             self.glade.get_widget("chk_ntf_tray_blink").get_active()
         new_gtkui_config["ntf_popup"] = \
             self.glade.get_widget("chk_ntf_popup").get_active()
-        new_gtkui_config["ntf_sound"] = \
-            self.glade.get_widget("chk_ntf_sound").get_active()
+        # new_gtkui_config["ntf_sound"] = \
+        #    self.glade.get_widget("chk_ntf_sound").get_active()
         new_gtkui_config["ntf_email"] = \
             self.glade.get_widget("chk_ntf_email").get_active()
         new_gtkui_config["ntf_email_add"] = \
@@ -644,8 +644,8 @@
             self.glade.get_widget("txt_ntf_pass").get_text()
         new_gtkui_config["ntf_server"] = \
             self.glade.get_widget("txt_ntf_server").get_text()
-        new_gtkui_config["ntf_sound_path"] = \
-                self.glade.get_widget("combo_ntf_sound_path").get_filename()
+        # new_gtkui_config["ntf_sound_path"] = \
+        #        self.glade.get_widget("combo_ntf_sound_path").get_filename()
         if self.glade.get_widget("rad_ntf_none").get_active():
             new_gtkui_config["ntf_security"] = None
         elif self.glade.get_widget("rad_ntf_ssl").get_active():