[gnome-initial-setup/shell/4765: 107/362] Revert "account: add a switch for the shared account"
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/shell/4765: 107/362] Revert "account: add a switch for the shared account"
- Date: Thu, 19 Mar 2015 01:30:03 +0000 (UTC)
commit 7e29f3b899fe5af04bf6efdd0ac1f92e240685c1
Author: Roddy Shuler <roddy endlessm com>
Date: Wed Jul 23 07:30:26 2014 -0700
Revert "account: add a switch for the shared account"
Let's reduce some of the complexity / potential confusion
of the first boot experience. Instead, we'll always create
the shared account, and the user can remove it via account
settings if desired.
This reverts commit 2e776632274828a5d8f736dfa283499b3ec39372.
Conflicts:
gnome-initial-setup/pages/account/gis-account-page.c
po/es.po
po/pt_BR.po
[endlessm/eos-shell#3177]
.../pages/account/gis-account-page.c | 5 +--
.../pages/account/gis-account-page.ui | 44 --------------------
po/es.po | 4 --
po/pt_BR.po | 4 --
4 files changed, 1 insertions(+), 56 deletions(-)
---
diff --git a/gnome-initial-setup/pages/account/gis-account-page.c
b/gnome-initial-setup/pages/account/gis-account-page.c
index 9d728b3..9c480a1 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.c
+++ b/gnome-initial-setup/pages/account/gis-account-page.c
@@ -472,13 +472,10 @@ local_create_user (GisAccountPage *page)
const gchar *fullname;
const gchar *language;
gboolean autologin_active;
- gboolean enable_shared;
GSettings *lock_settings;
GError *error = NULL;
- enable_shared = gtk_switch_get_active (OBJ(GtkSwitch*, "account-shared-account-switch"));
- if (enable_shared)
- create_shared_user (page);
+ create_shared_user (page);
username = gtk_combo_box_text_get_active_text (OBJ(GtkComboBoxText*, "account-username-combo"));
fullname = gtk_entry_get_text (OBJ (GtkEntry*, "account-fullname-entry"));
diff --git a/gnome-initial-setup/pages/account/gis-account-page.ui
b/gnome-initial-setup/pages/account/gis-account-page.ui
index 8a16619..ce1175a 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.ui
+++ b/gnome-initial-setup/pages/account/gis-account-page.ui
@@ -304,50 +304,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="account-shared-account-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="xalign">1</property>
- <property name="label" translatable="yes">Enable _Shared Account</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">account-shared-account-switch</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">8</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkSwitch" id="account-shared-account-switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="active">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">8</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<placeholder/>
</child>
<child>
diff --git a/po/es.po b/po/es.po
index c982259..7d043ec 100644
--- a/po/es.po
+++ b/po/es.po
@@ -111,10 +111,6 @@ msgid "A_utomatic Login"
msgstr "_Inicio de sesión automático"
#: ../gnome-initial-setup/pages/account/gis-account-page.ui.h:9
-msgid "Enable _Shared Account"
-msgstr "Activar Cu_enta Compartida"
-
-#: ../gnome-initial-setup/pages/account/gis-account-page.ui.h:10
msgid "page 1"
msgstr "página 1"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2d01355..c9db965 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -107,10 +107,6 @@ msgid "A_utomatic Login"
msgstr ""
#: ../gnome-initial-setup/pages/account/gis-account-page.ui.h:9
-msgid "Enable _Shared Account"
-msgstr ""
-
-#: ../gnome-initial-setup/pages/account/gis-account-page.ui.h:10
msgid "page 1"
msgstr ""
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]