[gnome-control-center] user-accounts: remove email configuration



commit 0cc58a4efa82302c8ee8db5a7daf892bdd6af5db
Author: William Jon McCann <jmccann redhat com>
Date:   Mon Jan 24 19:47:25 2011 -0500

    user-accounts: remove email configuration
    
    We don't use it yet.  We can add it back if we want.

 panels/user-accounts/data/user-accounts-dialog.ui |   29 ---------------------
 panels/user-accounts/um-user-panel.c              |   28 --------------------
 2 files changed, 0 insertions(+), 57 deletions(-)
---
diff --git a/panels/user-accounts/data/user-accounts-dialog.ui b/panels/user-accounts/data/user-accounts-dialog.ui
index b930b16..582a2e6 100644
--- a/panels/user-accounts/data/user-accounts-dialog.ui
+++ b/panels/user-accounts/data/user-accounts-dialog.ui
@@ -326,34 +326,6 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="email-label">
-                                <property name="visible">True</property>
-                                <property name="xalign">1</property>
-                                <property name="label" translatable="yes">E-mail address:</property>
-                                <attributes>
-                                  <attribute name="foreground" value="#555555555555"/>
-                                </attributes>
-                              </object>
-                              <packing>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="x_options">GTK_FILL</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="UmEditableEntry" id="account-email-entry">
-                                <property name="visible">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="right_attach">2</property>
-                                <property name="top_attach">3</property>
-                                <property name="bottom_attach">4</property>
-                                <property name="y_options"></property>
-                              </packing>
-                            </child>
-                            <child>
                               <object class="GtkLabel" id="language-label">
                                 <property name="visible">True</property>
                                 <property name="xalign">1</property>
@@ -505,7 +477,6 @@
     <widgets>
       <widget name="account-fingerprint-label"/>
       <widget name="language-label"/>
-      <widget name="email-label"/>
       <widget name="password-label"/>
       <widget name="account-type-label"/>
     </widgets>
diff --git a/panels/user-accounts/um-user-panel.c b/panels/user-accounts/um-user-panel.c
index f022f72..ef9de76 100644
--- a/panels/user-accounts/um-user-panel.c
+++ b/panels/user-accounts/um-user-panel.c
@@ -518,9 +518,6 @@ show_user (UmUser *user, UmUserPanelPrivate *d)
         widget = get_widget (d, "account-password-button");
         um_editable_button_set_text (UM_EDITABLE_BUTTON (widget), get_password_mode_text (user));
 
-        widget = get_widget (d, "account-email-entry");
-        um_editable_entry_set_text (UM_EDITABLE_ENTRY (widget), um_user_get_email (user));
-
         widget = get_widget (d, "account-language-combo");
         model = um_editable_combo_get_model (UM_EDITABLE_COMBO (widget));
         um_add_user_languages (model);
@@ -713,22 +710,6 @@ change_password (GtkButton *button, UmUserPanelPrivate *d)
 }
 
 static void
-change_email_done (UmEditableEntry    *e,
-                   UmUserPanelPrivate *d)
-{
-        const gchar *text;
-        UmUser *user;
-
-        user = get_selected_user (d);
-
-        text = um_editable_entry_get_text (e);
-
-        if (g_strcmp0 (text, um_user_get_email (user)) != 0) {
-                um_user_set_email (user, text);
-        }
-}
-
-static void
 change_fingerprint (GtkButton *button, UmUserPanelPrivate *d)
 {
         GtkWidget *label, *label2;
@@ -932,9 +913,6 @@ on_permission_changed (GPermission *permission,
                 um_editable_entry_set_editable (UM_EDITABLE_ENTRY (get_widget (d, "full-name-entry")), TRUE);
                 remove_unlock_tooltip (get_widget (d, "full-name-entry"));
 
-                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_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-language-combo")), TRUE);
                 remove_unlock_tooltip (get_widget (d, "account-language-combo"));
 
@@ -950,9 +928,6 @@ on_permission_changed (GPermission *permission,
                 um_editable_entry_set_editable (UM_EDITABLE_ENTRY (get_widget (d, "full-name-entry")), FALSE);
                 add_unlock_tooltip (get_widget (d, "full-name-entry"));
 
-                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_combo_set_editable (UM_EDITABLE_COMBO (get_widget (d, "account-language-combo")), FALSE);
                 add_unlock_tooltip (get_widget (d, "account-language-combo"));
 
@@ -1126,9 +1101,6 @@ setup_main_window (UmUserPanelPrivate *d)
         button = get_widget (d, "account-password-button");
         g_signal_connect (button, "start-editing", G_CALLBACK (change_password), d);
 
-        button = get_widget (d, "account-email-entry");
-        g_signal_connect (button, "editing-done", G_CALLBACK (change_email_done), d);
-
         button = get_widget (d, "account-language-combo");
         g_signal_connect (button, "editing-done", G_CALLBACK (language_changed), d);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]