From c04f77174519c296f2863b25f40be3ae5f5d4a0d Mon Sep 17 00:00:00 2001
From: Matthew James Goins <mjgoins@openflows.com>
Date: Sun, 3 Oct 2010 00:09:12 -0400
Subject: [PATCH] Move marginal ui code to a more standard layout

---
 .../Monkeysphere/MSVA/MarginalUI.glade                    | 4 ++--
 marginalUI.pl => Crypt/Monkeysphere/MSVA/MarginalUI.pm    | 8 +++++++-
 msva-perl                                                 | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)
 rename marginalUI.glade => Crypt/Monkeysphere/MSVA/MarginalUI.glade (92%)
 rename marginalUI.pl => Crypt/Monkeysphere/MSVA/MarginalUI.pm (94%)

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 fe3bb9e..c8f2003 100644
--- 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 0714423..dc94816 100755
--- 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 132a322..fa16e61 100755
--- 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/;
-- 
2.26.2