Request for freeze break: pessulus

[Vincent Untz <vuntz gnome org>]

Hi,

A new section for pessulus was added to the system admin guide. I'd like
to make the help button of pessulus use it (instead of being a useless
insensitive button).

The patch is quite simple.

It should not directly affect sabayon since sabayon uses a copied
version of the pessulus code, however, I'd like to hear from Alex to
know if the change is okay for him (the PessulusMainDialog init function
now needs a new GnomeProgram argument).

Thanks,

Vincent

-- 
Les gens heureux ne sont pas press�

? po/stamp-it
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/pessulus/ChangeLog,v
retrieving revision 1.60
diff -u -p -r1.60 ChangeLog
--- ChangeLog	13 Mar 2006 04:44:30 -0000	1.60
+++ ChangeLog	13 Mar 2006 08:43:54 -0000
@@ -1,3 +1,11 @@
+2006-03-13  Vincent Untz  <vuntz gnome org>
+
+	* Pessulus/main.py: pass a GnomeProgram to the PessulusMainDialog
+	* Pessulus/maindialog.py: (__init__): keep the GnomeProgram somewhere,
+	don't make the help button insensitive
+	(__on_dialog_response): open the pessulus section in the System Admin
+	Guide for help
+
 2006-03-13  Runa Bhattacharjee <runa bengalinux org>
 
 	* configure.ac: Added "bn" (Bengali) to ALL_LINGUAS.
Index: Pessulus/main.py
===================================================================
RCS file: /cvs/gnome/pessulus/Pessulus/main.py,v
retrieving revision 1.3
diff -u -p -r1.3 main.py
--- Pessulus/main.py	2 Nov 2005 08:29:23 -0000	1.3
+++ Pessulus/main.py	13 Mar 2006 08:43:54 -0000
@@ -29,6 +29,7 @@ def main (args):
     
     import gtk
     import gtk.glade
+    import gnome
 
     import maindialog
     import lockdownappliergconf
@@ -41,11 +42,13 @@ def main (args):
     gettext.install (config.PACKAGE, config.LOCALEDIR)
     gtk.glade.bindtextdomain (config.PACKAGE, config.LOCALEDIR)
 
+    prog = gnome.program_init (config.PACKAGE, config.VERSION)
+
     gtk.window_set_default_icon_name ("stock_lock")
 
     applier = lockdownappliergconf.PessulusLockdownApplierGconf ()
 
-    dialog = maindialog.PessulusMainDialog (applier)
+    dialog = maindialog.PessulusMainDialog (prog, applier)
 
     gtk.main ()
 
Index: Pessulus/maindialog.py
===================================================================
RCS file: /cvs/gnome/pessulus/Pessulus/maindialog.py,v
retrieving revision 1.7
diff -u -p -r1.7 maindialog.py
--- Pessulus/maindialog.py	16 Jan 2006 21:18:49 -0000	1.7
+++ Pessulus/maindialog.py	13 Mar 2006 08:43:54 -0000
@@ -26,6 +26,7 @@ import gettext
 import gobject
 import gtk
 import gtk.glade
+import gnome
 
 from config import *
 
@@ -68,7 +69,8 @@ lockdownbuttons = (
 )
 
 class PessulusMainDialog:
-    def __init__ (self, applier, quit_on_close = True):
+    def __init__ (self, gnome_program, applier, quit_on_close = True):
+        self.gnome_program = gnome_program
         globalvar.applier = applier
         globalvar.tooltips = gtk.Tooltips ()
 
@@ -84,8 +86,6 @@ class PessulusMainDialog:
         self.__init_disabledapplets ()
         self.__init_safeprotocols ()
 
-        self.xml.get_widget ("helpbutton").set_sensitive (False)
-
         self.window = self.xml.get_widget ("dialogEditor")
         self.window.connect ("response", self.__on_dialog_response)
 
@@ -141,6 +141,10 @@ class PessulusMainDialog:
 
     def __on_dialog_response (self, dialog, response_id):
         if dialog == self.window and response_id == gtk.RESPONSE_HELP:
+            gnome.help_display_desktop (self.gnome_program,
+                                        "system-admin-guide",
+                                        "system-admin-guide",
+                                        "lockdown")
             return
         
         dialog.hide ()