[gnome-control-center] user-accounts: remove location configuration
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] user-accounts: remove location configuration
- Date: Tue, 25 Jan 2011 02:22:15 +0000 (UTC)
commit 31f2e6bbe554a1972626187f840ea3f667c5f38d
Author: William Jon McCann <jmccann redhat com>
Date: Mon Jan 24 19:44:38 2011 -0500
user-accounts: remove location configuration
We don't really have a good use case for it
panels/user-accounts/data/user-accounts-dialog.ui | 29 --------------------
panels/user-accounts/um-user-panel.c | 30 +--------------------
2 files changed, 1 insertions(+), 58 deletions(-)
---
diff --git a/panels/user-accounts/data/user-accounts-dialog.ui b/panels/user-accounts/data/user-accounts-dialog.ui
index d1f39f3..b930b16 100644
--- a/panels/user-accounts/data/user-accounts-dialog.ui
+++ b/panels/user-accounts/data/user-accounts-dialog.ui
@@ -202,18 +202,6 @@
</packing>
</child>
<child>
- <object class="UmEditableEntry" id="account-location-entry">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<object class="GtkNotebook" id="account-fingerprint-notebook">
<property name="visible">True</property>
<property name="show_tabs">False</property>
@@ -382,22 +370,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="location-label">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Location:</property>
- <attributes>
- <attribute name="foreground" value="#555555555555"/>
- </attributes>
- </object>
- <packing>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="account-fingerprint-label">
<property name="visible">True</property>
<property name="xalign">1</property>
@@ -532,7 +504,6 @@
<object class="GtkSizeGroup" id="label-width-sizegroup">
<widgets>
<widget name="account-fingerprint-label"/>
- <widget name="location-label"/>
<widget name="language-label"/>
<widget name="email-label"/>
<widget name="password-label"/>
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index 5cc4f97..f022f72 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -532,9 +532,6 @@ show_user (UmUser *user, UmUserPanelPrivate *d)
um_editable_combo_set_active_iter (UM_EDITABLE_COMBO (widget), &iter);
g_free (lang);
- label = get_widget (d, "account-location-entry");
- um_editable_entry_set_text (UM_EDITABLE_ENTRY (label), um_user_get_location (user));
-
widget = get_widget (d, "account-fingerprint-notebook");
label = get_widget (d, "account-fingerprint-label");
label2 = get_widget (d, "account-fingerprint-value-label");
@@ -579,7 +576,7 @@ change_name_done (GtkWidget *entry,
text = um_editable_entry_get_text (UM_EDITABLE_ENTRY (entry));
- if (g_strcmp0 (text, um_user_get_location (user)) != 0) {
+ if (g_strcmp0 (text, um_user_get_real_name (user)) != 0) {
um_user_set_real_name (user, text);
}
}
@@ -732,22 +729,6 @@ change_email_done (UmEditableEntry *e,
}
static void
-change_location_done (GtkWidget *entry,
- UmUserPanelPrivate *d)
-{
- const gchar *text;
- UmUser *user;
-
- user = get_selected_user (d);
-
- text = um_editable_entry_get_text (UM_EDITABLE_ENTRY (entry));
-
- if (g_strcmp0 (text, um_user_get_location (user)) != 0) {
- um_user_set_location (user, text);
- }
-}
-
-static void
change_fingerprint (GtkButton *button, UmUserPanelPrivate *d)
{
GtkWidget *label, *label2;
@@ -954,9 +935,6 @@ on_permission_changed (GPermission *permission,
um_editable_entry_set_editable (UM_EDITABLE_ENTRY (get_widget (d, "account-email-entry")), TRUE);
remove_unlock_tooltip (get_widget (d, "account-email-entry"));
- um_editable_entry_set_editable (UM_EDITABLE_ENTRY (get_widget (d, "account-location-entry")), TRUE);
- remove_unlock_tooltip (get_widget (d, "account-location-entry"));
-
um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-language-combo")), TRUE);
remove_unlock_tooltip (get_widget (d, "account-language-combo"));
@@ -975,9 +953,6 @@ on_permission_changed (GPermission *permission,
um_editable_entry_set_editable (UM_EDITABLE_ENTRY (get_widget (d, "account-email-entry")), FALSE);
add_unlock_tooltip (get_widget (d, "account-email-entry"));
- um_editable_entry_set_editable (UM_EDITABLE_ENTRY (get_widget (d, "account-location-entry")), FALSE);
- add_unlock_tooltip (get_widget (d, "account-location-entry"));
-
um_editable_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-language-combo")), FALSE);
add_unlock_tooltip (get_widget (d, "account-language-combo"));
@@ -1157,9 +1132,6 @@ setup_main_window (UmUserPanelPrivate *d)
button = get_widget (d, "account-language-combo");
g_signal_connect (button, "editing-done", G_CALLBACK (language_changed), d);
- button = get_widget (d, "account-location-entry");
- g_signal_connect (button, "editing-done", G_CALLBACK (change_location_done), d);
-
button = get_widget (d, "account-fingerprint-button");
g_signal_connect (button, "clicked",
G_CALLBACK (change_fingerprint), d);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]