Move marginal ui code to a more standard layout

diff --git a/marginalUI.glade b/Crypt/Monkeysphere/MSVA/MarginalUI.glade
similarity index 92%
rename from marginalUI.glade
rename to Crypt/Monkeysphere/MSVA/MarginalUI.glade
index fe3bb9edf4562976848e0419ef45772a3575f068..c8f2003cad119f7e37c198d0bde4b543139bfd17 100644 (file)
--- a/marginalUI.glade
+++ b/Crypt/Monkeysphere/MSVA/MarginalUI.glade
@@ -32,7 +32,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_yesButton_clicked"/>
+                <signal name="clicked" handler="Crypt::Monkeysphere::MSVA::MarginalUI::on_yesButton_clicked"/>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -47,7 +47,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_noButton_clicked" object="no"/>
+                <signal name="clicked" handler="Crypt::Monkeysphere::MSVA::MarginalUI::on_noButton_clicked" object="no"/>
               </widget>
               <packing>
                 <property name="expand">False</property>

diff --git a/marginalUI.pl b/Crypt/Monkeysphere/MSVA/MarginalUI.pm
similarity index 94%
rename from marginalUI.pl
rename to Crypt/Monkeysphere/MSVA/MarginalUI.pm
index 071442389f5f70dc8af267fdfff81275b4660718..dc94816c5a61c0a58e7464db60be750f37a102a1 100755 (executable)
--- a/marginalUI.pl
+++ b/Crypt/Monkeysphere/MSVA/MarginalUI.pm
@@ -9,6 +9,8 @@
 #
 #----------------------------------------------------------------------
 
+{ package MSVA::MarginalUI;
+
 use strict;
 use warnings;
 
@@ -19,7 +21,7 @@ my $glade;
 my $label;
 
 # populate UI from 
-$glade = Gtk2::GladeXML->new("marginalUI.glade");
+$glade = Gtk2::GladeXML->new("MSVA/MarginalUI.glade");
 
 # Connect the signals
 $glade->signal_autoconnect_from_package('main');
@@ -53,3 +55,7 @@ sub on_yesButton_clicked {
 sub on_noButton_clicked {
     exit 1;
 }
+
+1;
+
+}

diff --git a/msva-perl b/msva-perl
index 132a3221f4cb711ef8e86bf925c69c36caa5dda3..fa16e616a6eea5d4daf6f8d064eaa2ba10a16c65 100755 (executable)
--- a/msva-perl
+++ b/msva-perl
@@ -23,6 +23,7 @@ use strict;
 { package MSVA;
 
 use Data::Dumper;
+use Crypt::Monkeysphere::MSVA::MarginalUI;
   use parent qw(HTTP::Server::Simple::CGI);
   require Crypt::X509;
   use Regexp::Common qw /net/;