Attachment 304988 Details for Bug 445881 – Possible fix

[patch] Possible fix

rhn-client-tools-firstboot-445881.patch (text/plain), 11.70 KB, created by Michael Solberg on 2008-05-09 21:20:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Solberg

Created: 2008-05-09 21:20:42 UTC

Size: 11.70 KB

patch

obsolete

>--- data/rh_register.glade.orig	2007-02-13 17:35:41.000000000 -0500
>+++ data/rh_register.glade	2008-05-09 16:35:18.000000000 -0400
>@@ -8119,4 +8119,141 @@ You'll know when software updates are av
>   </child>
> </widget>
> 
>+<widget class="GtkWindow" id="ksRegisteredFirstbootWindow">
>+  <property name="visible">True</property>
>+  <property name="title">Registered during installation</property>
>+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
>+  <property name="window_position">GTK_WIN_POS_NONE</property>
>+  <property name="modal">False</property>
>+  <property name="resizable">True</property>
>+  <property name="destroy_with_parent">False</property>
>+  <property name="decorated">True</property>
>+  <property name="skip_taskbar_hint">False</property>
>+  <property name="skip_pager_hint">False</property>
>+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
>+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
>+  <property name="focus_on_map">True</property>
>+  <property name="urgency_hint">False</property>
>+
>+  <child>
>+    <widget class="GtkVBox" id="ksRegisteredFirstbootVbox">
>+      <property name="border_width">15</property>
>+      <property name="visible">True</property>
>+      <property name="homogeneous">False</property>
>+      <property name="spacing">15</property>
>+
>+      <child>
>+	<widget class="GtkHBox" id="hbox28">
>+	  <property name="visible">True</property>
>+	  <property name="homogeneous">False</property>
>+	  <property name="spacing">6</property>
>+
>+	  <child>
>+	    <widget class="GtkImage" id="image23">
>+	      <property name="visible">True</property>
>+	      <property name="stock">gtk-dialog-info</property>
>+	      <property name="icon_size">6</property>
>+	      <property name="xalign">0.5</property>
>+	      <property name="yalign">0.5</property>
>+	      <property name="xpad">0</property>
>+	      <property name="ypad">0</property>
>+	    </widget>
>+	    <packing>
>+	      <property name="padding">0</property>
>+	      <property name="expand">False</property>
>+	      <property name="fill">False</property>
>+	    </packing>
>+	  </child>
>+
>+	  <child>
>+	    <widget class="GtkLabel" id="label132">
>+	      <property name="visible">True</property>
>+	      <property name="label" translatable="yes">&lt;b&gt;Your system was registered for updates during installation.&lt;/b&gt;</property>
>+	      <property name="use_underline">False</property>
>+	      <property name="use_markup">True</property>
>+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
>+	      <property name="wrap">True</property>
>+	      <property name="selectable">False</property>
>+	      <property name="xalign">0</property>
>+	      <property name="yalign">0.5</property>
>+	      <property name="xpad">0</property>
>+	      <property name="ypad">0</property>
>+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
>+	      <property name="width_chars">-1</property>
>+	      <property name="single_line_mode">False</property>
>+	      <property name="angle">0</property>
>+	    </widget>
>+	    <packing>
>+	      <property name="padding">0</property>
>+	      <property name="expand">True</property>
>+	      <property name="fill">True</property>
>+	    </packing>
>+	  </child>
>+	</widget>
>+	<packing>
>+	  <property name="padding">0</property>
>+	  <property name="expand">False</property>
>+	  <property name="fill">True</property>
>+	</packing>
>+      </child>
>+
>+      <child>
>+	<widget class="GtkLabel" id="label133">
>+	  <property name="visible">True</property>
>+	  <property name="label" translatable="yes" context="yes">Your system is ready to receive the software updates that will keep it secure and supported.
>+
>+You'll know when software updates are available when a package icon appears in the notification area of your desktop (usually in the upper-right corner, circled below.) Clicking on this icon, when available, will guide you through applying any updates that are available:</property>
>+	  <property name="use_underline">False</property>
>+	  <property name="use_markup">False</property>
>+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
>+	  <property name="wrap">True</property>
>+	  <property name="selectable">False</property>
>+	  <property name="xalign">0</property>
>+	  <property name="yalign">0.5</property>
>+	  <property name="xpad">0</property>
>+	  <property name="ypad">0</property>
>+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
>+	  <property name="width_chars">-1</property>
>+	  <property name="single_line_mode">False</property>
>+	  <property name="angle">0</property>
>+	</widget>
>+	<packing>
>+	  <property name="padding">0</property>
>+	  <property name="expand">False</property>
>+	  <property name="fill">True</property>
>+	</packing>
>+      </child>
>+
>+      <child>
>+        <widget class="GtkImage" id="image24">
>+          <property name="visible">True</property>
>+          <property name="pixbuf">puplet-screenshot.png</property>
>+          <property name="xalign">0.5</property>
>+          <property name="yalign">0.5</property>
>+          <property name="xpad">0</property>
>+          <property name="ypad">0</property>
>+        </widget>
>+        <packing>
>+          <property name="padding">0</property>
>+          <property name="expand">False</property>
>+          <property name="fill">True</property>
>+        </packing>
>+      </child>
>+
>+      <child>
>+	<widget class="GtkHButtonBox" id="hbuttonbox4">
>+	  <property name="visible">True</property>
>+	  <property name="layout_style">GTK_BUTTONBOX_START</property>
>+	  <property name="spacing">0</property>
>+	</widget>
>+	<packing>
>+	  <property name="padding">0</property>
>+	  <property name="expand">False</property>
>+	  <property name="fill">True</property>
>+	</packing>
>+      </child>
>+    </widget>
>+  </child>
>+</widget>
>+
> </glade-interface>
>--- src/firstboot/rhn_activate_gui.py.orig	2006-12-06 12:01:35.000000000 -0500
>+++ src/firstboot/rhn_activate_gui.py	2008-05-09 16:34:38.000000000 -0400
>@@ -55,6 +55,8 @@ class RhnActivateWindow(RhnRegisterFirst
>     def __init__(self):
>         RhnRegisterFirstbootGuiWindow.__init__(self)
>         rhnregGui.ActivateSubscriptionPage.__init__(self)
>+        if rhnreg.registered():
>+            self.skipme = True
> 
>     def updatePage(self):
>         self.activateSubscriptionPagePrepare()
>--- src/firstboot/rhn_choose_org_gui.py.orig	2006-12-06 12:01:35.000000000 -0500
>+++ src/firstboot/rhn_choose_org_gui.py	2008-05-09 16:34:38.000000000 -0400
>@@ -20,6 +20,7 @@
> import sys
> sys.path.append("/usr/share/rhn/up2date_client/")
> sys.path.append("/usr/share/rhn")
>+import rhnreg
> import rhnregGui
> from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
> 
>@@ -43,6 +44,8 @@ class RhnChooseOrgWindow(RhnRegisterFirs
>     def __init__(self):
>         RhnRegisterFirstbootGuiWindow.__init__(self)
>         rhnregGui.ChooseOrgPage.__init__(self)
>+        if rhnreg.registered():
>+            self.skipme = True
>     
>     def _getVbox(self):
>         return self.chooseOrgPageVbox()
>--- src/firstboot/rhn_choose_server_gui.py.orig	2006-12-06 12:01:35.000000000 -0500
>+++ src/firstboot/rhn_choose_server_gui.py	2008-05-09 16:34:38.000000000 -0400
>@@ -21,6 +21,7 @@ import os
> import sys
> sys.path.append("/usr/share/rhn/up2date_client/")
> sys.path.append("/usr/share/rhn")
>+import rhnreg
> import rhnregGui
> import up2dateErrors
> from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
>@@ -45,6 +46,8 @@ class RhnChooseServerWindow(RhnRegisterF
>     def __init__(self):
>         RhnRegisterFirstbootGuiWindow.__init__(self)
>         rhnregGui.ChooseServerPage.__init__(self)
>+        if rhnreg.registered():
>+            self.skipme = True
>     
>     def _getVbox(self):
>         return self.chooseServerPageVbox()
>--- src/firstboot/rhn_create_profile_gui.py.orig	2006-12-06 12:01:35.000000000 -0500
>+++ src/firstboot/rhn_create_profile_gui.py	2008-05-09 16:34:38.000000000 -0400
>@@ -55,6 +55,8 @@ class RhnCreateProfileWindow(RhnRegister
>     def __init__(self):
>         RhnRegisterFirstbootGuiWindow.__init__(self)
>         rhnregGui.CreateProfilePage.__init__(self)
>+        if rhnreg.registered():
>+            self.skipme = True
> 
>     def updatePage(self):
>         self.createProfilePagePrepare()
>--- src/firstboot/rhn_finish_gui.py.orig	2006-12-06 12:01:35.000000000 -0500
>+++ src/firstboot/rhn_finish_gui.py	2008-05-09 16:34:38.000000000 -0400
>@@ -20,6 +20,7 @@
> import sys
> sys.path.append("/usr/share/rhn/up2date_client/")
> sys.path.append("/usr/share/rhn")
>+import rhnreg
> import rhnregGui
> from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
> 
>@@ -43,6 +44,8 @@ class RhnFinishWindow(RhnRegisterFirstbo
>     def __init__(self):
>         RhnRegisterFirstbootGuiWindow.__init__(self)
>         rhnregGui.FinishPage.__init__(self)
>+        if rhnreg.registered():
>+            self.skipme = True
>     
>     def _getVbox(self):
>         return self.finishPageVbox()
>--- src/firstboot/rhn_login_gui.py.me	2006-12-06 12:01:35.000000000 -0500
>+++ src/firstboot/rhn_login_gui.py	2008-05-09 16:34:38.000000000 -0400
>@@ -60,6 +60,8 @@ class RhnLoginWindow(RhnRegisterFirstboo
>     def __init__(self):
>         RhnRegisterFirstbootGuiWindow.__init__(self)
>         rhnregGui.LoginPage.__init__(self)
>+        if rhnreg.registered():
>+            self.skipme = True
> 
>     def updatePage(self):
> #        self.getCaps()
>--- src/firstboot/rhn_provide_certificate_gui.py.orig	2006-12-06 12:01:35.000000000 -0500
>+++ src/firstboot/rhn_provide_certificate_gui.py	2008-05-09 16:34:38.000000000 -0400
>@@ -21,6 +21,7 @@ import os
> import sys
> sys.path.append("/usr/share/rhn/up2date_client/")
> sys.path.append("/usr/share/rhn")
>+import rhnreg
> import rhnregGui
> import up2dateErrors
> from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
>@@ -45,6 +46,8 @@ class RhnProvideCertificateWindow(RhnReg
>     def __init__(self):
>         RhnRegisterFirstbootGuiWindow.__init__(self)
>         rhnregGui.ProvideCertificatePage.__init__(self)
>+        if rhnreg.registered():
>+            self.skipme = True
>     
>     def _getVbox(self):
>         return self.provideCertificatePageVbox()
>--- src/firstboot/rhn_review_gui.py.orig	2006-12-06 12:01:35.000000000 -0500
>+++ src/firstboot/rhn_review_gui.py	2008-05-09 16:34:38.000000000 -0400
>@@ -20,6 +20,7 @@
> import sys
> sys.path.append("/usr/share/rhn/up2date_client/")
> sys.path.append("/usr/share/rhn")
>+import rhnreg
> import rhnregGui
> from rhn_register_firstboot_gui_window import RhnRegisterFirstbootGuiWindow
> 
>@@ -43,6 +44,8 @@ class RhnReviewWindow(RhnRegisterFirstbo
>     def __init__(self):
>         RhnRegisterFirstbootGuiWindow.__init__(self)
>         rhnregGui.ReviewSubscriptionPage.__init__(self)
>+        if rhnreg.registered():
>+            self.skipme = True
>     
>     def _getVbox(self):
>         return self.reviewSubscriptionPageVbox()
>--- src/firstboot/rhn_start_gui.py.orig	2006-12-22 14:54:14.000000000 -0500
>+++ src/firstboot/rhn_start_gui.py	2008-05-09 16:34:38.000000000 -0400
>@@ -45,6 +45,9 @@ class RhnStartWindow(RhnRegisterFirstboo
>         self.start_page = None
> 
>     def _getVbox(self):
>+        if rhnreg.registered():
>+            self.start_page = KsRegisteredPage()
>+            return self.start_page.startPageVbox()
>         if self.parent.checkNetwork():
>             self.start_page = rhnregGui.StartPage(firstboot=True)
>         else:
>@@ -62,6 +65,20 @@ class RhnStartWindow(RhnRegisterFirstboo
>         return True
> 
> 
>+class KsRegisteredPage:
>+
>+    def __init__(self):
>+        gladefile = "/usr/share/rhn/up2date_client/rh_register.glade"
>+        ksRegisteredXml = gtk.glade.XML(gladefile, "ksRegisteredFirstbootVbox",
>+              domain="rhn-client-tools")
>+        self.vbox = ksRegisteredXml.get_widget('ksRegisteredFirstbootVbox')
>+
>+    def startPageVbox(self):
>+        return self.vbox
>+
>+    def startPageRegisterNow(self):
>+        return True
>+
> class NoNetworkPage:
> 
>     def __init__(self):

Actions: View | Diff

Attachments on bug 445881: 304988