* data/glade/SoftwareProperties.glade:

  - changed the text for Popcon participation
* SoftwareProperties/SoftwareProperties.py:
  - support popcon pariticipation

2 files changed, 23 insertions, 1 deletions

diff --git a/SoftwareProperties/SoftwareProperties.py b/SoftwareProperties/SoftwareProperties.py
index f7a40821..07170fa6 100644
--- a/SoftwareProperties/SoftwareProperties.py
+++ b/SoftwareProperties/SoftwareProperties.py
@@ -440,6 +440,27 @@ class SoftwareProperties(SimpleGladeApp):
                                  source.file)
     self.modified_sourceslist()
 
+  def on_checkbutton_popcon_toggled(self, widget):
+    """ The user clicked on the popcon paritipcation button """
+    popcon = "/etc/popularity-contest.conf"
+    if widget.get_active():
+      new_value = "yes"
+    else:
+      new_value = "no"
+    if os.path.exists(popcon):
+      # read it
+      lines = open(popcon).read().split("\n")
+      for line in lines:
+        try:
+          (key,value) = line.split("=")
+          if key == "PARTICIPATE":
+            lines[lines.index(line)] = 'PARTICIPATE=\"%s"' % new_value
+        except ValueError:
+          continue
+      # write it
+      open(popcon,"w").write("\n".join(lines))
+
+
   def open_file(self, file):
     """Show an confirmation for adding the channels of the specified file"""
     dialog = dialog_add_sources_list.AddSourcesList(self.window_main,
@@ -1003,3 +1024,4 @@ class GtkCdromProgress(apt.progress.CdromProgress, SimpleGladeApp):
       return True
     return False
   
+    
diff --git a/data/glade/SoftwareProperties.glade b/data/glade/SoftwareProperties.glade
index 08ffd743..98bf65bc 100644
--- a/data/glade/SoftwareProperties.glade
+++ b/data/glade/SoftwareProperties.glade
@@ -1057,7 +1057,7 @@
 	      <child>
 		<widget class="GtkLabel" id="label20">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;i&gt;Please take part in the popularity contest, to improve the user experience of Ubuntu. Therefor the following data will be collected and sent to the Ubuntu project anonymously on a weekly basis: the list of installed software and how often it was used.
+		  <property name="label" translatable="yes">&lt;i&gt;To improve the user experience of Ubuntu please take part in the popularity contest. If you do so the list of installed software and how often it was used will be collected and sent anonymously to the Ubuntu project  on a weekly basis.
 
 The results are used to improve the support for popular applications and to rank applications in the search results.&lt;/i&gt;</property>
 		  <property name="use_underline">False</property>