Commit 63e1df8e authored by Adrien Plazas's avatar Adrien Plazas

Merge branch 'fixes' into 'librem5-3-32-1'

drop non free stuff from goa and turn privacy leaks off

See merge request !2
parents b414fb09 808ada19
Pipeline #35105 failed with stage
in 0 seconds
......@@ -181,10 +181,8 @@ add_provider_to_list (GisGoaPage *page, const char *provider_type)
static void
populate_provider_list (GisGoaPage *page)
{
add_provider_to_list (page, "google");
add_provider_to_list (page, "owncloud");
add_provider_to_list (page, "windows_live");
add_provider_to_list (page, "facebook");
add_provider_to_list (page, "imap_smtp");
}
static void
......
......@@ -176,8 +176,8 @@ gis_privacy_page_constructed (GObject *object)
priv->location_settings = g_settings_new ("org.gnome.system.location");
priv->privacy_settings = g_settings_new ("org.gnome.desktop.privacy");
gtk_switch_set_active (GTK_SWITCH (priv->location_switch), TRUE);
gtk_switch_set_active (GTK_SWITCH (priv->reporting_switch), TRUE);
gtk_switch_set_active (GTK_SWITCH (priv->location_switch), FALSE);
gtk_switch_set_active (GTK_SWITCH (priv->reporting_switch), FALSE);
update_os_data (page);
......
......@@ -250,33 +250,11 @@ static void
update_distro_name (GisSummaryPage *page)
{
GisSummaryPagePrivate *priv = gis_summary_page_get_instance_private (page);
char *buffer;
char *name;
char *text;
name = NULL;
if (g_file_get_contents ("/etc/os-release", &buffer, NULL, NULL))
{
name = get_item (buffer, "NAME");
g_free (buffer);
}
if (!name)
name = g_strdup ("GNOME 3");
/* Translators: the parameter here is the name of a distribution,
* like "Fedora" or "Ubuntu". It falls back to "GNOME 3" if we can't
* detect any distribution. */
text = g_strdup_printf (_("_Start Using %s"), name);
text = g_strdup_printf (_("_Start Using your Librem 5"));
gtk_label_set_label (GTK_LABEL (priv->start_button_label), text);
g_free (text);
/* Translators: the parameter here is the name of a distribution,
* like "Fedora" or "Ubuntu". It falls back to "GNOME 3" if we can't
* detect any distribution. */
g_free (name);
}
static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment