Commit 09f08da1 authored by Mohammed Sadiq's avatar Mohammed Sadiq
Browse files

Merge branch 'librem5-3-24' into pureos/sloppy

parents 2575d001 e6536c59
include:
- 'https://source.puri.sm/Librem5/librem5-ci/raw/master/librem5-pipeline-definitions.yml'
stages:
- package
- test-package
package:deb-debian-buster:
extends: .l5-build-debian-package
package:deb-debian-buster:arm64:
tags:
- librem5:arm64
extends: .l5-build-debian-package
autopkgtest-debian-buster-package:
dependencies:
- package:deb-debian-buster
extends: .l5-autopkgtest-debian-package
lintian-debian-buster-package:
dependencies:
- package:deb-debian-buster
extends: .l5-lintian-debian-package
......@@ -120,7 +120,8 @@ Package: gnome-control-center-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
Breaks: gnome-control-center (<< 1:3.7.92-2~)
Breaks: gnome-control-center (<< 1:3.7.92-2~),
phosh (<< 0.1.7)
Replaces: gnome-control-center (<< 1:3.7.92-2~)
Description: configuration applets for GNOME - data files
This package contains data files (icons, pixmaps, locales files) needed by
......
......@@ -116,7 +116,8 @@ Package: gnome-control-center-data
Architecture: all
Multi-Arch: foreign
Depends: ${misc:Depends}
Breaks: gnome-control-center (<< 1:3.7.92-2~)
Breaks: gnome-control-center (<< 1:3.7.92-2~),
phosh (<< 0.1.7)
Replaces: gnome-control-center (<< 1:3.7.92-2~)
Description: configuration applets for GNOME - data files
This package contains data files (icons, pixmaps, locales files) needed by
......
......@@ -2371,6 +2371,8 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
g_strcmp0 (self->chassis_type, "tablet") == 0)
return;
/* XXX: Remove this once we have chassis type rightly set */
return;
/* Power button row */
row = no_prelight_row_new ();
gtk_widget_show (row);
......
......@@ -58,7 +58,7 @@
</child>
<child>
<object class="GtkButton">
<property name="visible">True</property>
<property name="visible">False</property>
<property name="margin_bottom">8</property>
<property name="margin_top">8</property>
<property name="valign">center</property>
......
......@@ -90,7 +90,7 @@ update_password_strength (CcPasswordDialog *self)
strength_level = (strlen (password) >= MINIMUM_PASSCODE_LENGTH) + 1; /* Hack */
if (strlen (password) == 6) {
if (strlen (password) >= 6) {
set_entry_validation_checkmark (self->password_entry);
/* } else if (strlen (password) == 0) { */
/* set_entry_generation_icon (self->password_entry); */
......@@ -211,7 +211,7 @@ update_sensitivity (CcPasswordDialog *self)
if (self->password_mode == ACT_USER_PASSWORD_MODE_REGULAR) {
strength = update_password_strength (self);
can_change = strength > 1 && strcmp (password, verify) == 0 &&
strlen (password) == 6 &&
strlen (password) >= 6 &&
(self->old_password_ok || !gtk_widget_get_visible (GTK_WIDGET (self->old_password_entry)));
}
else {
......
......@@ -196,7 +196,7 @@
<child>
<object class="GtkLabel">
<property name="visible">true</property>
<property name="label">Only 6 digit numbers are allowed</property>
<property name="label">Password should be atleast 6 digits</property>
<style>
<class name="dim-label"/>
</style>
......
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