[gnome-control-center] privacy: Remove Name & Visibility section
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] privacy: Remove Name & Visibility section
- Date: Mon, 19 Aug 2013 17:52:31 +0000 (UTC)
commit ef1f9e3398c61162fe7db24de7e8dd3d5eca2c99
Author: Kalev Lember <kalevlember gmail com>
Date: Mon Aug 19 19:38:13 2013 +0200
privacy: Remove Name & Visibility section
We no longer show the user's name in the GNOME Shell top bar or in the
lock screen and this dialog no longer has any purpose.
https://bugzilla.gnome.org/show_bug.cgi?id=706301
panels/privacy/cc-privacy-panel.c | 90 -------------------
panels/privacy/privacy.ui | 173 -------------------------------------
2 files changed, 0 insertions(+), 263 deletions(-)
---
diff --git a/panels/privacy/cc-privacy-panel.c b/panels/privacy/cc-privacy-panel.c
index 5ca6a0e..24429dc 100644
--- a/panels/privacy/cc-privacy-panel.c
+++ b/panels/privacy/cc-privacy-panel.c
@@ -96,33 +96,6 @@ get_on_off_label (GSettings *settings,
return w;
}
-static gboolean
-visible_label_mapping_get (GValue *value,
- GVariant *variant,
- gpointer user_data)
-{
- g_value_set_string (value, g_variant_get_boolean (variant) ? _("Hidden") : _("Visible"));
-
- return TRUE;
-}
-
-static GtkWidget *
-get_visible_label (GSettings *settings,
- const gchar *key)
-{
- GtkWidget *w;
-
- w = gtk_label_new ("");
- g_settings_bind_with_mapping (settings, key,
- w, "label",
- G_SETTINGS_BIND_GET,
- visible_label_mapping_get,
- NULL,
- NULL,
- NULL);
- return w;
-}
-
typedef struct
{
GtkWidget *label;
@@ -303,68 +276,6 @@ add_screen_lock (CcPrivacyPanel *self)
}
static void
-stealth_mode_changed (GSettings *settings,
- const gchar *key,
- gpointer data)
-{
- CcPrivacyPanel *self = data;
- gboolean stealth_mode;
- GtkWidget *w;
-
- stealth_mode = g_settings_get_boolean (settings, "hide-identity");
-
- if (stealth_mode)
- {
- g_settings_set_boolean (self->priv->lock_settings, "show-full-name-in-top-bar", FALSE);
- g_settings_set_boolean (self->priv->privacy_settings, "show-full-name-in-top-bar", FALSE);
- }
-
- w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "full_name_top_bar"));
- gtk_widget_set_sensitive (w, !stealth_mode);
- w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "full_name_lock_screen"));
- gtk_widget_set_sensitive (w, !stealth_mode);
- w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "full_name_top_bar_label"));
- gtk_widget_set_sensitive (w, !stealth_mode);
- w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "full_name_lock_screen_label"));
- gtk_widget_set_sensitive (w, !stealth_mode);
-}
-
-static void
-add_name_visibility (CcPrivacyPanel *self)
-{
- GtkWidget *w;
- GtkWidget *dialog;
-
- w = get_visible_label (self->priv->privacy_settings, "hide-identity");
- add_row (self, _("Name & Visibility"), "name_dialog", w);
-
- w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "name_done"));
- dialog = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "name_dialog"));
- g_signal_connect_swapped (w, "clicked",
- G_CALLBACK (gtk_widget_hide), dialog);
- g_signal_connect (dialog, "delete-event",
- G_CALLBACK (gtk_widget_hide_on_delete), NULL);
-
- w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "stealth_mode"));
- g_settings_bind (self->priv->privacy_settings, "hide-identity",
- w, "active",
- G_SETTINGS_BIND_DEFAULT);
-
- w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "full_name_top_bar"));
- g_settings_bind (self->priv->privacy_settings, "show-full-name-in-top-bar",
- w, "active",
- G_SETTINGS_BIND_DEFAULT);
-
- w = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, "full_name_lock_screen"));
- g_settings_bind (self->priv->lock_settings, "show-full-name-in-top-bar",
- w, "active",
- G_SETTINGS_BIND_DEFAULT);
-
- g_signal_connect (self->priv->privacy_settings, "changed::hide-identity",
- G_CALLBACK (stealth_mode_changed), self);
-}
-
-static void
retain_history_combo_changed_cb (GtkWidget *widget,
CcPrivacyPanel *self)
{
@@ -713,7 +624,6 @@ cc_privacy_panel_init (CcPrivacyPanel *self)
self->priv->notification_settings = g_settings_new ("org.gnome.desktop.notifications");
add_screen_lock (self);
- add_name_visibility (self);
add_usage_history (self);
add_trash_temp (self);
diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui
index f49bdd6..66ff8df 100644
--- a/panels/privacy/privacy.ui
+++ b/panels/privacy/privacy.ui
@@ -43,179 +43,6 @@
</row>
</data>
</object>
- <object class="GtkDialog" id="name_dialog">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Name & Visibility</property>
- <property name="resizable">False</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox2">
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area2">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="name_done">
- <property name="label" translatable="yes">_Close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">12</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">12</property>
- <property name="label" translatable="yes">Control how you appear on the screen and the
network.</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="margin_right">2</property>
- <property name="margin_top">6</property>
- <property name="margin_bottom">12</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkLabel" id="full_name_top_bar_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes">Display _full name in top bar</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">full_name_top_bar</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="full_name_top_bar">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="full_name_lock_screen_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes">Display full name in _lock screen</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">full_name_lock_screen</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="full_name_lock_screen">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes">_Stealth Mode</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">stealth_mode</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSwitch" id="stealth_mode">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="0">name_done</action-widget>
- </action-widgets>
- </object>
<object class="GtkListStore" id="purge_after_model">
<columns>
<!-- column-name name -->
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]