diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2013-11-18 15:40:11 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2013-11-28 15:39:50 +0100 |
| commit | 7e92a121aebff4a3b99f7cbd2cadeb9d492e243e (patch) | |
| tree | e1990ebd5624478aa97f8129479b01c1b663b1b6 | |
| parent | 19fb795c5ca2f2780d1850e257124e39ee970e63 (diff) | |
| download | drakwizard-7e92a121aebff4a3b99f7cbd2cadeb9d492e243e.tar drakwizard-7e92a121aebff4a3b99f7cbd2cadeb9d492e243e.tar.gz drakwizard-7e92a121aebff4a3b99f7cbd2cadeb9d492e243e.tar.bz2 drakwizard-7e92a121aebff4a3b99f7cbd2cadeb9d492e243e.tar.xz drakwizard-7e92a121aebff4a3b99f7cbd2cadeb9d492e243e.zip | |
use (my|u)gtk3 instead of *tk2
| -rw-r--r-- | common/Wizcommon_gtk2.pm | 12 | ||||
| -rw-r--r-- | time_wizard/Ntp.pm | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/common/Wizcommon_gtk2.pm b/common/Wizcommon_gtk2.pm index 56d18a0a..07526863 100644 --- a/common/Wizcommon_gtk2.pm +++ b/common/Wizcommon_gtk2.pm @@ -19,16 +19,16 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -package MDK::Wizard::Wizcommon_gtk2; +package MDK::Wizard::Wizcommon_gtk3; use strict; #use common; sub wizard_progress_bar { use lib qw(/usr/lib/libDrakX); - use ugtk2 qw(:wrappers); + use ugtk3 qw(:wrappers); my ($command, $descr) = @_; my ($value, $timer); - my $my_win = ugtk2->new(""); + my $my_win = ugtk3->new(""); my $window1 = $my_win->{window}; gtkadd($window1, gtkpack(Gtk2::VBox->new(0,0), @@ -63,11 +63,11 @@ sub wizard_progress_bar { sub gtk_log { use lib qw(/usr/lib/libDrakX); - use ugtk2 qw(:wrappers); - use mygtk2 qw(gtknew); + use ugtk3 qw(:wrappers); + use mygtk3 qw(gtknew); my ($command, $text) = @_; my $log_text = gtknew('TextView'); - my $my_win = ugtk2->new(""); + my $my_win = ugtk3->new(""); my $window1 = $my_win->{window}; #my $pid; gtkadd($window1, diff --git a/time_wizard/Ntp.pm b/time_wizard/Ntp.pm index 08f9db52..b2fcd7a6 100644 --- a/time_wizard/Ntp.pm +++ b/time_wizard/Ntp.pm @@ -27,7 +27,7 @@ use strict; use common; use services; use MDK::Wizard::Wizcommon; -use MDK::Wizard::Wizcommon_gtk2; +use MDK::Wizard::Wizcommon_gtk3; use timezone; my $wiz = new MDK::Wizard::Wizcommon; @@ -180,7 +180,7 @@ sub test { return 'end'; } my $command = "/usr/sbin/ntpdate -q $o->{var}{varserver1}"; # $o->{var}{varserver2}"; - my $_o = MDK::Wizard::Wizcommon_gtk2::gtk_log($command, "Test NTP server Responding..."); + my $_o = MDK::Wizard::Wizcommon_gtk3::gtk_log($command, "Test NTP server Responding..."); # system("/usr/sbin/ntpdate -q $o->{var}{varserver1} $o->{var}{varserver2}"); if (!($? >> 8)) { @@ -212,7 +212,7 @@ ARC=false substInFile { s/(# server clock.via.net)/$1\nserver $o->{var}{varserver1}/ } '/etc/ntp.conf' if -f '/etc/ntp.conf'; standalone::explanations("Wrote /etc/ntp/step-tickers, starting services"); my $command = "service crond stop; service atd stop; service ntpd stop; service ntpd start; service atd start; service crond start; /sbin/hwclock --systohc --utc"; - MDK::Wizard::Wizcommon_gtk2::gtk_log($command, "Configuring NTP, ATD and CROND services..."); + MDK::Wizard::Wizcommon_gtk3::gtk_log($command, "Configuring NTP, ATD and CROND services..."); } 1; |