gdm r5899 - in branches/gnome-2-20: . config docs/C gui gui/greeter
- From: bcameron svn gnome org
- To: svn-commits-list gnome org
- Subject: gdm r5899 - in branches/gnome-2-20: . config docs/C gui gui/greeter
- Date: Sun, 2 Mar 2008 05:37:31 +0000 (GMT)
Author: bcameron
Date: Sun Mar 2 05:37:31 2008
New Revision: 5899
URL: http://svn.gnome.org/viewvc/gdm?rev=5899&view=rev
Log:
2008-03-01 Brian Cameron <brian cameron sun com>
* gui/gdmlogin.c, gui/gdmsetup.glade,
gui/greeter/greeter_canvas_item.c, gui/gdmsetup.c,
config/gdm.conf.in: Honor default password character rather
than hardcoding to '*'.
* docs/C/gdm.xml: Modify docs relating to above change, and
modify the Custom Widgetry section to explain the recent fixes
(in last commit).
Modified:
branches/gnome-2-20/ChangeLog
branches/gnome-2-20/config/gdm.conf.in
branches/gnome-2-20/docs/C/gdm.xml
branches/gnome-2-20/gui/gdmlogin.c
branches/gnome-2-20/gui/gdmsetup.c
branches/gnome-2-20/gui/gdmsetup.glade
branches/gnome-2-20/gui/greeter/greeter_canvas_item.c
Modified: branches/gnome-2-20/config/gdm.conf.in
==============================================================================
--- branches/gnome-2-20/config/gdm.conf.in (original)
+++ branches/gnome-2-20/config/gdm.conf.in Sun Mar 2 05:37:31 2008
@@ -500,9 +500,6 @@
#ShowLastSession=true
# Always use 24 hour clock no matter what the locale.
#Use24Clock=auto
-# Use circles in the password field. Looks kind of cool actually, but only
-# works with certain fonts.
-#UseCirclesInEntry=false
# Do not show any visible feedback in the password field. This is standard for
# instance in console, xdm and ssh.
#UseInvisibleInEntry=false
Modified: branches/gnome-2-20/docs/C/gdm.xml
==============================================================================
--- branches/gnome-2-20/docs/C/gdm.xml (original)
+++ branches/gnome-2-20/docs/C/gdm.xml Sun Mar 2 05:37:31 2008
@@ -4008,17 +4008,6 @@
</varlistentry>
<varlistentry>
- <term>UseCirclesInEntry</term>
- <listitem>
- <synopsis>UseCirclesInEntry=false</synopsis>
- <para>
- Use circles instead of asterisks in the password entry.
- This may not work with all fonts however.
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>UseInvisibleInEntry</term>
<listitem>
<synopsis>UseInvisibleInEntry=false</synopsis>
@@ -7108,13 +7097,13 @@
<para>
For example suppose we are on display :0,
<filename>ServAuthDir</filename> is
- <filename><var>/lib/gdm</filename> and we have the following in the
- theme:
+ <filename><var>/lib/gdm</filename> and we have the following in
+ the theme:
</para>
<screen>
<item type="list" id="custom-config">
-<pos anchor="nw" x="1" y="1" height="200" width="100">
+<pos anchor="nw" x="1" y="1" height="200" width="100"/>
<listitem id="foo">
<text>Foo</text>
</listitem>
@@ -7125,8 +7114,21 @@
</screen>
<para>
- Then if the user chooses 'Foo' then
- <filename><var>/lib/gdm/:0.GreeterInfo</filename> will contain:
+ Using GDM 2.20, the file is created in INI format. The group value
+ is "GreeterInfo", and the "custom-config" key
+ will specify the id of the chosen listitem. For example, if the user
+ chooses "Foo" (which has an id value of "foo",
+ then <filename><var>/lib/gdm/:0.GreeterInfo</filename> will
+ contain:
+<screen>
+[GreeterInfo]
+custom-config=foo
+</screen>
+ </para>
+ <para>
+ Using GDM 2.18 and earlier, the file is not saved in INI format, so
+ the "GreeterInfo" group will not be in the file. In other
+ words, the file will contain only the following:
<screen>
custom-config=foo
</screen>
Modified: branches/gnome-2-20/gui/gdmlogin.c
==============================================================================
--- branches/gnome-2-20/gui/gdmlogin.c (original)
+++ branches/gnome-2-20/gui/gdmlogin.c Sun Mar 2 05:37:31 2008
@@ -2553,8 +2553,6 @@
gtk_entry_set_invisible_char (GTK_ENTRY (entry), 0);
else if (gdm_config_get_bool (GDM_KEY_ENTRY_CIRCLES))
gtk_entry_set_invisible_char (GTK_ENTRY (entry), 0x25cf);
- else
- gtk_entry_set_invisible_char (GTK_ENTRY (entry), '*');
gtk_entry_set_max_length (GTK_ENTRY (entry), PW_ENTRY_SIZE);
gtk_widget_set_size_request (entry, 250, -1);
Modified: branches/gnome-2-20/gui/gdmsetup.c
==============================================================================
--- branches/gnome-2-20/gui/gdmsetup.c (original)
+++ branches/gnome-2-20/gui/gdmsetup.c Sun Mar 2 05:37:31 2008
@@ -513,14 +513,7 @@
const char *key = g_object_get_data (G_OBJECT (toggle), "key");
gboolean val = gdm_config_get_bool ((gchar *)key);
- if (strcmp (ve_sure_string (key), GDM_KEY_ENTRY_INVISIBLE) == 0) {
- /* This is a lil bit back to front
- true is false and false is true in this case */
- if ( bool_equal (val, GTK_TOGGLE_BUTTON (toggle)->active)) {
- gdm_setup_config_set_bool (key, !GTK_TOGGLE_BUTTON (toggle)->active);
- }
- }
- else if (strcmp (ve_sure_string (key), GDM_KEY_GLOBAL_FACE_DIR) == 0) {
+ if (strcmp (ve_sure_string (key), GDM_KEY_GLOBAL_FACE_DIR) == 0) {
/* Once enabled write the curently selected item
in the filechooser widget, otherwise disable
the config entry, i.e. write an empty string */
@@ -2206,20 +2199,11 @@
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (timedlogin_allow_remote_toggled), timedlogin_allow_remote);
}
- else if (strcmp ("vis_feedback_passwd_checkbox", ve_sure_string (name)) == 0) {
- /* This one is a lil bit back to front
- true is false and false is true */
- GtkWidget *use_circles_in_passwd;
- use_circles_in_passwd = glade_xml_get_widget (xml, "use_circles_passwd_checkbox");
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), !val);
- gtk_widget_set_sensitive (use_circles_in_passwd, !val);
+ else if (strcmp ("hide_vis_feedback_passwd_checkbox", ve_sure_string (name)) == 0) {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), val);
g_signal_connect (G_OBJECT (toggle), "toggled",
- G_CALLBACK (toggle_toggled), toggle);
- g_signal_connect (G_OBJECT (toggle), "toggled",
- G_CALLBACK (toggle_toggled_sensitivity_positive), use_circles_in_passwd);
-
+ G_CALLBACK (toggle_toggled), toggle);
}
else if (strcmp ("local_set_pos_checkbox", ve_sure_string (name)) == 0) {
@@ -7451,10 +7435,7 @@
/* Setup use visual feedback in the passwotrd entry */
- setup_notify_toggle ("vis_feedback_passwd_checkbox", GDM_KEY_ENTRY_INVISIBLE);
-
- /* Setup use circles in the password entry */
- setup_notify_toggle ("use_circles_passwd_checkbox", GDM_KEY_ENTRY_CIRCLES);
+ setup_notify_toggle ("hide_vis_feedback_passwd_checkbox", GDM_KEY_ENTRY_INVISIBLE);
/* Setup always login current session entry */
setup_notify_toggle ("a_login_curr_session_checkbutton", GDM_KEY_ALWAYS_LOGIN_CURRENT_SESSION);
Modified: branches/gnome-2-20/gui/gdmsetup.glade
==============================================================================
--- branches/gnome-2-20/gui/gdmsetup.glade (original)
+++ branches/gnome-2-20/gui/gdmsetup.glade Sun Mar 2 05:37:31 2008
@@ -2,7 +2,6 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
<glade-interface>
-<requires lib="gnome"/>
<widget class="GtkDialog" id="setup_dialog">
<property name="title" translatable="yes">Login Window Preferences</property>
@@ -90,109 +89,17 @@
<property name="spacing">3</property>
<child>
- <widget class="GtkHBox" id="hbox201">
+ <widget class="GtkCheckButton" id="hide_vis_feedback_passwd_checkbox">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkTable" id="table24">
- <property name="visible">True</property>
- <property name="n_rows">2</property>
- <property name="n_columns">1</property>
- <property name="homogeneous">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">12</property>
-
- <child>
- <widget class="GtkCheckButton" id="vis_feedback_passwd_checkbox">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Show visual feedback in the password entry. Turning this option on can be a security hazard as the length of your password can be guessed.</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Show visual feedback (asterisks) in the password entry</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox203">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label297">
- <property name="visible">True</property>
- <property name="label"> </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="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="use_circles_passwd_checkbox">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Use circles instead of asterisks in the password entry. This may not work with all fonts however.</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Use circles instead of asterisks in the password entry</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">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="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <property name="tooltip" translatable="yes">Hide visual feedback in the password entry. Turning this option on can increase security, as the length of your password cannot be guessed by people looking at your screen.</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_Hide visual feedback in the password entry</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="padding">0</property>
Modified: branches/gnome-2-20/gui/greeter/greeter_canvas_item.c
==============================================================================
--- branches/gnome-2-20/gui/greeter/greeter_canvas_item.c (original)
+++ branches/gnome-2-20/gui/greeter/greeter_canvas_item.c Sun Mar 2 05:37:31 2008
@@ -468,8 +468,6 @@
gtk_entry_set_invisible_char (GTK_ENTRY (entry), 0);
else if (gdm_config_get_bool (GDM_KEY_ENTRY_CIRCLES))
gtk_entry_set_invisible_char (GTK_ENTRY (entry), 0x25cf);
- else
- gtk_entry_set_invisible_char (GTK_ENTRY (entry), '*');
gtk_widget_modify_font (entry, item->data.text.fonts[GREETER_ITEM_STATE_NORMAL]);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
