client/rhel/rhn-client-tools/data/rh_register.glade | 174 -----------
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 45 --
2 files changed, 1 insertion(+), 218 deletions(-)
New commits:
commit 6b7d121f1d805bc662e747d602fc82dcc77dc2a6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 23 17:18:50 2010 +0100
Remove showPrivacyDialog, PrivacyDialog, and privacyDialog, as they are not used any
more.
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade
b/client/rhel/rhn-client-tools/data/rh_register.glade
index 82b9e34..eec1b72 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -797,162 +797,6 @@
https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small&...
</child>
</widget>
-<widget class="GtkWindow" id="privacyDialog">
- <property name="visible">True</property>
- <property name="title" translatable="yes">Red Hat Privacy
Statement</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="modal">False</property>
- <property name="default_width">480</property>
- <property name="default_height">400</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="vbox7">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="shadow_type">GTK_SHADOW_NONE</property>
- <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport1">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="label_yalign">0.5</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkViewport" id="viewport2">
- <property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property
name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property
name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTextView" id="privacyArea">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="overwrite">False</property>
- <property name="accepts_tab">True</property>
- <property name="justification">GTK_JUSTIFY_LEFT</property>
- <property name="wrap_mode">GTK_WRAP_NONE</property>
- <property name="cursor_visible">False</property>
- <property name="pixels_above_lines">0</property>
- <property name="pixels_below_lines">0</property>
- <property name="pixels_inside_wrap">0</property>
- <property name="left_margin">0</property>
- <property name="right_margin">0</property>
- <property name="indent">0</property>
- <property name="text"
translatable="yes"></property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label56">
- <property name="visible">True</property>
- <property name="label" translatable="yes"
context="yes">Privacy Statement</property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</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="type">label_item</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">10</property>
-
- <child>
- <widget class="GtkButton" id="okButton">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">5</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- </child>
-</widget>
-
<widget class="GtkWindow" id="hardwareDialog">
<property name="visible">True</property>
<property name="title" translatable="yes">Hardware
Info</property>
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index e291a66..8416406 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -533,9 +533,6 @@ class LoginPage:
setArrowCursor()
return False
- def showPrivacyDialog(self, button):
- PrivacyDialog()
-
def activateSubscriptionShouldBeShown():
"""If we activate an EN from disk and/or hardware info (eg asset tag)
and
@@ -1319,47 +1316,6 @@ class WhyRegisterDialog:
self.rc = 1 # What does this do? Is it needed?
- def showPrivacyDialog(self, button):
- PrivacyDialog()
-
-class PrivacyDialog:
- def __init__(self):
- self.privXml = gtk.glade.XML(
- gladefile,
- "privacyDialog", domain="rhn-client-tools")
- self.dlg = self.privXml.get_widget("privacyDialog")
-
- self.privXml.get_widget("okButton").connect("clicked",
self.finish)
-
- privacyArea = self.privXml.get_widget("privacyArea")
- socket.setdefaulttimeout(5)
- # see bz #165157
-
- try:
- text = callAndFilterExceptions(
- rhnreg.privacyText,
- [socket.timeout, up2dateErrors.CommunicationError],
- _("There was an error retrieving the privacy statement.")
- )
- if text is None:
- text = ""
- except (socket.timeout, up2dateErrors.CommunicationError), error:
- self.dlg.hide()
- messageWindow.ErrorDialog(_("Unable to access the server. Please "
- "check your network settings."), parent=self.dlg)
- log.log_me(error)
- return None
-
- textBuffer = gtk.TextBuffer(None)
- textBuffer.set_text(text)
- privacyArea.set_buffer(textBuffer)
-
-
- def finish(self, button):
- self.dlg.hide()
- self.rc = 1
-
-
class HardwareDialog:
def __init__(self):
self.hwXml = gtk.glade.XML(
commit e20bb63da5a7c238299e014f452b16c882984ec0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 23 17:10:42 2010 +0100
Replace the button with URL for privacy statement.
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade
b/client/rhel/rhn-client-tools/data/rh_register.glade
index c42cb49..82b9e34 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -3269,7 +3269,7 @@
https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small&...
<child>
<widget class="GtkLabel" id="label125">
<property name="visible">True</property>
- <property name="label" translatable="yes"
context="yes"><small><b>Tip:</b>
Red Hat values your privacy.</small></property>
+ <property name="label" translatable="yes"
context="yes"><small><b>Tip:</b>
Red Hat values your privacy:
http://www.redhat.com/legal/privacy_statement.html.</small>...
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3290,22 +3290,6 @@
https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small&...
<property name="fill">False</property>
</packing>
</child>
-
- <child>
- <widget class="GtkButton" id="privacyButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Red Hat
Privacy Statement</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index d55a899..e291a66 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -1313,7 +1313,6 @@ class WhyRegisterDialog:
self.whyRegisterXml.signal_autoconnect({
"onBackToRegistrationButtonClicked" : self.finish,
})
-
self.whyRegisterXml.get_widget("privacyButton").connect("clicked",
self.showPrivacyDialog)
def finish(self, button):
self.dlg.hide()