[inital-setup rhel7-branch][PATCH] Clear the default text before inserting the EULA

Vratislav Podzimek vpodzime at redhat.com
Thu Oct 3 17:12:12 UTC 2013


On Thu, 2013-10-03 at 12:59 -0400, David Shea wrote:
> Also, since the default text is always replaced in eula.py, the default
> text does not need to be translated.
> ---
>  initial_setup/gui/spokes/eula.glade | 2 +-
>  initial_setup/gui/spokes/eula.py    | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/initial_setup/gui/spokes/eula.glade b/initial_setup/gui/spokes/eula.glade
> index ea29652..18402ec 100644
> --- a/initial_setup/gui/spokes/eula.glade
> +++ b/initial_setup/gui/spokes/eula.glade
> @@ -3,7 +3,7 @@
>    <!-- interface-requires gtk+ 3.6 -->
>    <!-- interface-requires AnacondaWidgets 1.0 -->
>    <object class="GtkTextBuffer" id="eulaBuffer">
> -    <property name="text" translatable="yes">The license will go here</property>
> +    <property name="text">The license will go here</property>
>    </object>
>    <object class="AnacondaSpokeWindow" id="eulaWindow">
>      <property name="startup_id">filler</property>
> diff --git a/initial_setup/gui/spokes/eula.py b/initial_setup/gui/spokes/eula.py
> index 0704477..c789ebb 100644
> --- a/initial_setup/gui/spokes/eula.py
> +++ b/initial_setup/gui/spokes/eula.py
> @@ -35,7 +35,6 @@ class EULAspoke(FirstbootOnlySpokeMixIn, NormalSpoke):
>          self._agree_label = self._agree_check_button.get_child()
>          self._agree_text = self._agree_label.get_text()
>  
> -        itr = self._eula_buffer.get_iter_at_offset(0)
>          license_file = get_license_file_name()
>          if not license_file:
>              self._have_eula = False
> @@ -43,6 +42,8 @@ class EULAspoke(FirstbootOnlySpokeMixIn, NormalSpoke):
>                                           "at http://bugzilla.redhat.com"))
>              return
>  
> +        self._eula_buffer.set_text("")
> +        itr = self._eula_buffer.get_iter_at_offset(0)
>          with open(license_file, "r") as fobj:
>              for line in fobj:
>                  self._eula_buffer.insert(itr, line)
ACK, thanks!

-- 
Vratislav Podzimek

Anaconda Rider | Red Hat, Inc. | Brno - Czech Republic



More information about the anaconda-patches mailing list