From 901b8f51b22aec08bc91921276d721387809207f Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Thu, 3 Feb 2011 18:07:04 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Magiea. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r398 | dmorgan | 2011-02-03 18:07:04 +0000 (Thu, 03 Feb 2011) | 1 line Import cleaned drakx-net ------------------------------------------------------------------------ In addition to the above commits, the following cleaning work has been recorded: po - replace Mandriva by Mangeia in po files pixmaps - replace all images (use Oxygen) icons - replace all images (use Oxygen) lib - remove Mandriva occurrences - movre dbus prefix to org.mageia config - remove Mandriva occurrences - movre dbus prefix to org.mageia --- lib/network/adsl.pm | 2 +- lib/network/connection_manager.pm | 8 ++++---- lib/network/drakconnect/global.pm | 2 +- lib/network/drakfirewall.pm | 6 ++---- lib/network/ifw.pm | 8 ++++---- lib/network/modem.pm | 2 +- lib/network/monitor.pm | 6 +++--- lib/network/netcenter.pm | 2 +- lib/network/netconnect.pm | 2 +- lib/network/network.pm | 2 +- lib/network/pxe.pm | 2 +- lib/network/shorewall.pm | 4 ++-- lib/network/test.pm | 8 ++++---- lib/network/thirdparty.pm | 6 ++---- lib/network/tools.pm | 6 +++--- 15 files changed, 31 insertions(+), 35 deletions(-) (limited to 'lib/network') diff --git a/lib/network/adsl.pm b/lib/network/adsl.pm index c012219..e2ac90d 100644 --- a/lib/network/adsl.pm +++ b/lib/network/adsl.pm @@ -1,4 +1,4 @@ -package network::adsl; # $Id$ +package network::adsl; # $Id: adsl.pm 219797 2007-05-25 15:39:46Z blino $ use common; use run_program; diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm index e6b2a83..3efb2c1 100644 --- a/lib/network/connection_manager.pm +++ b/lib/network/connection_manager.pm @@ -458,7 +458,7 @@ sub setup_dbus_handlers { $dbus->{connection}->add_filter( sub { my ($_con, $msg) = @_; - if ($msg->get_interface eq 'com.mandriva.network') { + if ($msg->get_interface eq 'org.mageia.network') { my $member = $msg->get_member; my $message = _get_network_event_message($connections, $member, $msg->get_args_list); $on_network_event->($message) if $on_network_event && $message; @@ -483,7 +483,7 @@ sub setup_dbus_handlers { } } } - if ($msg->get_interface eq 'com.mandriva.monitoring.wireless' && $msg->get_member eq 'Event') { + if ($msg->get_interface eq 'org.mageia.monitoring.wireless' && $msg->get_member eq 'Event') { my ($event, $interface) = $msg->get_args_list; print "got wireless event: $event $interface\n"; # eugeni: wpa_supplicant seems to issue 'Authentication..timed out messages' even if they @@ -498,8 +498,8 @@ sub setup_dbus_handlers { # } } }); - $dbus->{connection}->add_match("type='signal',interface='com.mandriva.network'"); - $dbus->{connection}->add_match("type='signal',interface='com.mandriva.monitoring.wireless'"); + $dbus->{connection}->add_match("type='signal',interface='org.mageia.network'"); + $dbus->{connection}->add_match("type='signal',interface='org.mageia.monitoring.wireless'"); dbus_object::set_gtk2_watch_helper($dbus); } diff --git a/lib/network/drakconnect/global.pm b/lib/network/drakconnect/global.pm index ad59c2a..59da73c 100644 --- a/lib/network/drakconnect/global.pm +++ b/lib/network/drakconnect/global.pm @@ -33,7 +33,7 @@ sub configure_net { $in->ask_warn( N("Warning"), N("You do not have any configured Internet connection. -Run the \"%s\" assistant from the Mandriva Linux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))); +Run the \"%s\" assistant from the Mageia Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))); return; } unless ($::isEmbedded) { diff --git a/lib/network/drakfirewall.pm b/lib/network/drakfirewall.pm index 5746ae7..f22ecfe 100644 --- a/lib/network/drakfirewall.pm +++ b/lib/network/drakfirewall.pm @@ -1,4 +1,4 @@ -package network::drakfirewall; # $Id$ +package network::drakfirewall; # $Id: drakfirewall.pm 268043 2010-04-30 13:29:37Z blino $ use strict; use diagnostics; @@ -223,9 +223,7 @@ sub get_conf { } else { $in->ask_okcancel(N("Firewall configuration"), N("drakfirewall configurator -This configures a personal firewall for this Mandriva Linux machine. -For a powerful and dedicated firewall solution, please look to the -specialized Mandriva Security Firewall distribution."), 1) or return; +This configures a personal firewall for this Mageia machine."), 1) or return; $in->ask_okcancel(N("Firewall configuration"), N("drakfirewall configurator diff --git a/lib/network/ifw.pm b/lib/network/ifw.pm index 1c7996d..2509b93 100644 --- a/lib/network/ifw.pm +++ b/lib/network/ifw.pm @@ -9,7 +9,7 @@ sub init { my ($bus, $filter) = @_; my $con = $bus->{connection}; $con->add_filter($filter); - $con->add_match("type='signal',interface='com.mandriva.monitoring.ifw'"); + $con->add_match("type='signal',interface='org.mageia.monitoring.ifw'"); } sub new { @@ -17,9 +17,9 @@ sub new { require dbus_object; my $o = dbus_object::new($type, $bus, - "com.mandriva.monitoring", - "/com/mandriva/monitoring/ifw", - "com.mandriva.monitoring.ifw"); + "org.mageia.monitoring", + "/org/mageia/monitoring/ifw", + "org.mageia.monitoring.ifw"); $o; } diff --git a/lib/network/modem.pm b/lib/network/modem.pm index 6c8fba0..b7fbc85 100644 --- a/lib/network/modem.pm +++ b/lib/network/modem.pm @@ -1,4 +1,4 @@ -package network::modem; # $Id$ +package network::modem; # $Id: modem.pm 243081 2008-06-25 15:44:25Z blino $ use strict; use common; diff --git a/lib/network/monitor.pm b/lib/network/monitor.pm index 7e644b6..1182de4 100644 --- a/lib/network/monitor.pm +++ b/lib/network/monitor.pm @@ -5,9 +5,9 @@ use dbus_object; our @ISA = qw(dbus_object); -my $monitor_service = "com.mandriva.monitoring"; -my $monitor_path = "/com/mandriva/monitoring/wireless"; -my $monitor_interface = "com.mandriva.monitoring.wireless"; +my $monitor_service = "org.mageia.monitoring"; +my $monitor_path = "/org/mageia/monitoring/wireless"; +my $monitor_interface = "org.mageia.monitoring.wireless"; sub new { my ($type, $bus) = @_; diff --git a/lib/network/netcenter.pm b/lib/network/netcenter.pm index 29e2232..10d156d 100755 --- a/lib/network/netcenter.pm +++ b/lib/network/netcenter.pm @@ -183,7 +183,7 @@ sub main { if ($dbus) { $dbus->{connection}->add_filter(sub { my ($_con, $msg) = @_; - if ($msg->get_interface eq 'com.mandriva.network' && $msg->get_member eq 'status') { + if ($msg->get_interface eq 'org.mageia.network' && $msg->get_member eq 'status') { my ($status, $interface) = $msg->get_args_list; my $cmanager = find { $_->{connection}->get_interface eq $interface } @cmanagers; if ($status eq "add") { diff --git a/lib/network/netconnect.pm b/lib/network/netconnect.pm index 1f6cbc1..e58121e 100644 --- a/lib/network/netconnect.pm +++ b/lib/network/netconnect.pm @@ -1,4 +1,4 @@ -package network::netconnect; # $Id$ +package network::netconnect; # $Id: netconnect.pm 259351 2009-08-17 15:15:51Z tv $ use strict; use common; diff --git a/lib/network/network.pm b/lib/network/network.pm index f88939b..77e7e4c 100644 --- a/lib/network/network.pm +++ b/lib/network/network.pm @@ -1,4 +1,4 @@ -package network::network; # $Id$wir +package network::network; # $Id: network.pm 268044 2010-04-30 13:31:34Z blino $wir #-###################################################################################### #- misc imports diff --git a/lib/network/pxe.pm b/lib/network/pxe.pm index 1bc625a..2fecb8f 100644 --- a/lib/network/pxe.pm +++ b/lib/network/pxe.pm @@ -110,7 +110,7 @@ sub write_default_pxe_messages { my $hostname = $net->{hostname} || chomp_(`hostname`); output($pxelinux_message_file, < $o_hostname || "www.mandriva.com" + hostname => $o_hostname || "www.mageia.org" }, $class; } @@ -111,7 +111,7 @@ sub update_status { =head2 Test synchronously -resolve and get ping to hostname from command line if given, else to www.mandriva.com +resolve and get ping to hostname from command line if given, else to www.mageia.org use lib qw(/usr/lib/libDrakX); use network::test; @@ -132,7 +132,7 @@ resolve and get ping to hostname from command line if given, else to www.mandriv =head2 Test asynchronously -resolve and get ping to hostname from command line if given, else to Mandriva +resolve and get ping to hostname from command line if given, else to Mageia prints a "." every 10 miliseconds during connection test diff --git a/lib/network/thirdparty.pm b/lib/network/thirdparty.pm index f5a32eb..8fd48ab 100644 --- a/lib/network/thirdparty.pm +++ b/lib/network/thirdparty.pm @@ -145,11 +145,9 @@ sub warn_not_found { N("Some packages (%s) are required but aren't available.", join(', ', @packages))), join("\n\n", if_(!$opt{no_distro_package} && !$opt{no_package}, - #-PO: first argument is a list of Mandriva distributions + #-PO: first argument is a list of Mageia distributions #-PO: second argument is a package media name - N("These packages can be found in %s, or in the official %s package repository.", - join(", ", "Mandriva Linux One", "Mandriva Linux Powerpack"), - "non-free"), + N("These packages can be found in %s, or in the official %s package repository.", "non-free"), ), if_($checked, N("The following component is missing: %s", $checked)), if_($opt{explanations}, translate($opt{explanations})), diff --git a/lib/network/tools.pm b/lib/network/tools.pm index 0a1d840..60eeb8b 100644 --- a/lib/network/tools.pm +++ b/lib/network/tools.pm @@ -1,4 +1,4 @@ -package network::tools; # $Id$ +package network::tools; # $Id: tools.pm 253976 2009-03-13 10:57:55Z eugeni $ use strict; use common; @@ -47,7 +47,7 @@ sub stop_net_interface { stop_interface($net->{net_interface}, $detach); } -sub connected() { gethostbyname("www.mandriva.com") ? 1 : 0 } +sub connected() { gethostbyname("www.mageia.org") ? 1 : 0 } # request a ref on a bg_connect and a ref on a scalar sub connected_bg__raw { @@ -111,7 +111,7 @@ sub check_link_beat() { } else { $p = Net::Ping->new("icmp"); } - print $p->ping("www.mandriva.com") ? 1 : 0; + print $p->ping("www.mageia.org") ? 1 : 0; }); } -- cgit v1.2.1