Run of fresh-snapshots for clawsker

Merge these changes:

git pull https://janitor.debian.net/git/clawsker fresh-snapshots/main
git pull https://janitor.debian.net/git/clawsker fresh-snapshots/pristine-tar
git pull https://janitor.debian.net/git/clawsker fresh-snapshots/upstream

Summary

Merged new upstream version: 1.3.5+git20220223.1.1b1c905 (was: 1.3.5).

Diff

Branch: main

diff --git a/clawsker b/clawsker
index a49d983..8ff079d 100755
--- a/clawsker
+++ b/clawsker
@@ -163,6 +163,9 @@ sub _ {
     h_beh_rewrite_ff => _('Workaround some servers which convert first \'From\' to \'>From\' by using Quoted-Printable transfer encoding instead of 7bit/8bit encoding.'),
     l_beh_hide_tz => _('Hide time zone information'),
     h_beh_hide_tz => _('On outgoing messages, sets time zone of date headers to the unknown timezone value "-0000", as specified by RFC 5322'),
+    l_beh_qs_press_t => _('Quick search type-ahead delay'),
+    l_beh_qs_press_t_units => _('milliseconds'),
+    h_beh_qs_press_t => _('When type-ahead mode of Quick search is enabled, this is the delay after key presses in the search entry before starting a new search with the changes made.'),
 
     l_col_emphasis => _('X-Mailer header'),
     h_col_emphasis => _('The colour used for the X-Mailer line when its value is Claws Mail.'),
@@ -358,9 +361,9 @@ sub gdk_rgba_from_str {
     my ($rr, $gg, $bb) = (0, 0 ,0);
     $_ = uc ($str);
     if (/\#([A-F0-9][A-F0-9])([A-F0-9][A-F0-9])([A-F0-9][A-F0-9])/) {
-        $rr = hex($1) / 256;
-        $gg = hex($2) / 256;
-        $bb = hex($3) / 256;
+        $rr = hex($1) / 255;
+        $gg = hex($2) / 255;
+        $bb = hex($3) / 255;
     }
     my $color = Gtk3::Gdk::RGBA->new ($rr, $gg, $bb, 1.0);
     return $color;
@@ -368,9 +371,9 @@ sub gdk_rgba_from_str {
 
 sub str_from_gdk_rgba {
     my ($color) = @_;
-    my $rr = $color->red * 256;
-    my $gg = $color->green * 256;
-    my $bb = $color->blue * 256;
+    my $rr = $color->red * 255;
+    my $gg = $color->green * 255;
+    my $bb = $color->blue * 255;
     my $str = sprintf ("#%.2x%.2x%.2x", $rr, $gg, $bb);
     return $str;
 }
@@ -1118,13 +1121,22 @@ sub new_gui_page() {
         '3.14.0.22',
         '0',
     ],
+    qs_press_t => [
+        'qs_press_timeout',
+        [ $xl::s{l_beh_qs_press_t}, $xl::s{l_beh_qs_press_t_units} ],
+        $xl::s{h_beh_qs_press_t},
+        'int,50,5000', # 0.05 seconds - 5 seconds
+        '4.0.0.411',
+        '500',
+
+    ],
 );
 
 sub new_behaviour_page() {
-    return new_grid_pack (2, 21, [
+    return new_grid_pack (2, 22, [
         [ _('Drag \'n\' drop') ],
-        [ new_text_box_for_int (\%pr::beh, 'hover_t', \%HPVALUE) ],
-        [ new_check_button_for (\%pr::beh, 'warn_dnd', \%HPVALUE) ],
+        [ new_text_box_for_int (\%pr::beh, 'hover_t', \%HPVALUE),
+            new_check_button_for (\%pr::beh, 'warn_dnd', \%HPVALUE) ],
         [ '--' ],
         [ _('Secure Sockets Layer') ],
         [ new_check_button_for (\%pr::beh, 'skip_ssl', \%HPVALUE),
@@ -1142,12 +1154,13 @@ sub new_behaviour_page() {
         [ new_check_button_for (\%pr::beh, 'hide_tz', \%HPVALUE) ],
         [ '--' ],
         [ _('Completion') ],
-        [ new_check_button_for (\%pr::beh, 'addr_swc', \%HPVALUE) ],
-        [ new_check_button_for (\%pr::beh, 'fold_swc', \%HPVALUE) ],
+        [ new_check_button_for (\%pr::beh, 'addr_swc', \%HPVALUE),
+            new_check_button_for (\%pr::beh, 'fold_swc', \%HPVALUE) ],
         [ '--' ],
         [ _('Other') ],
         [ new_text_box_for_int (\%pr::beh, 'up_step', \%HPVALUE) ],
-        [ new_text_box_for_int (\%pr::beh, 'thread_a', \%HPVALUE) ]
+        [ new_text_box_for_int (\%pr::beh, 'thread_a', \%HPVALUE) ],
+        [ new_text_box_for_int (\%pr::beh, 'qs_press_t', \%HPVALUE) ]
     ]);
 }
 
diff --git a/debian/changelog b/debian/changelog
index b806b15..b69d946 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+clawsker (1.3.5+git20220223.1.1b1c905-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Mon, 28 Mar 2022 02:49:30 -0000
+
 clawsker (1.3.5-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/t/str_rgba.t b/t/str_rgba.t
index 6d1cef6..60f116f 100644
--- a/t/str_rgba.t
+++ b/t/str_rgba.t
@@ -1,7 +1,8 @@
 use 5.010_000;
 use strict;
 use utf8;
-use Test::More tests => 6;
+use Gtk3;
+use Test::More tests => 12;
 
 require_ok ('Clawsker');
 
@@ -33,3 +34,19 @@ ok (
     'complementarity white'
 );
 
+my @colors = (
+    [Gtk3::Gdk::RGBA->new (1.0, 1.0, 1.0, 1.0), '#ffffff'],
+    [Gtk3::Gdk::RGBA->new (1.0, 1.0, 1.0, 0.5), '#ffffff'],
+    [Gtk3::Gdk::RGBA->new (0.505, 0.505, 0.505, 1.0), '#808080'],
+    [Gtk3::Gdk::RGBA->new (0.505, 0.505, 0.505, 0.5), '#808080'],
+    [Gtk3::Gdk::RGBA->new (0.0, 0.0, 0.0, 1.0), '#000000'],
+    [Gtk3::Gdk::RGBA->new (0.0, 0.0, 0.0, 0.5), '#000000'],
+);
+
+for my $color (@colors) {
+    is (
+        Clawsker::str_from_gdk_rgba($color->[0]),
+        $color->[1],
+        join(' ', 'color', $color->[1])
+    )
+}

Branch: pristine-tar

diff --git a/clawsker_1.3.5+git20220223.1.1b1c905.orig.tar.xz.delta b/clawsker_1.3.5+git20220223.1.1b1c905.orig.tar.xz.delta
new file mode 100644
index 0000000..e15cc36
Binary files /dev/null and b/clawsker_1.3.5+git20220223.1.1b1c905.orig.tar.xz.delta differ
diff --git a/clawsker_1.3.5+git20220223.1.1b1c905.orig.tar.xz.id b/clawsker_1.3.5+git20220223.1.1b1c905.orig.tar.xz.id
new file mode 100644
index 0000000..2d7e0ad
--- /dev/null
+++ b/clawsker_1.3.5+git20220223.1.1b1c905.orig.tar.xz.id
@@ -0,0 +1 @@
+51cbacb5291f4cf5358811fc8c9da345df8a13d0

Branch: upstream

Tag: upstream/1.3.5+git20220223.1.1b1c905
diff --git a/clawsker b/clawsker
index a49d983..8ff079d 100755
--- a/clawsker
+++ b/clawsker
@@ -163,6 +163,9 @@ sub _ {
     h_beh_rewrite_ff => _('Workaround some servers which convert first \'From\' to \'>From\' by using Quoted-Printable transfer encoding instead of 7bit/8bit encoding.'),
     l_beh_hide_tz => _('Hide time zone information'),
     h_beh_hide_tz => _('On outgoing messages, sets time zone of date headers to the unknown timezone value "-0000", as specified by RFC 5322'),
+    l_beh_qs_press_t => _('Quick search type-ahead delay'),
+    l_beh_qs_press_t_units => _('milliseconds'),
+    h_beh_qs_press_t => _('When type-ahead mode of Quick search is enabled, this is the delay after key presses in the search entry before starting a new search with the changes made.'),
 
     l_col_emphasis => _('X-Mailer header'),
     h_col_emphasis => _('The colour used for the X-Mailer line when its value is Claws Mail.'),
@@ -358,9 +361,9 @@ sub gdk_rgba_from_str {
     my ($rr, $gg, $bb) = (0, 0 ,0);
     $_ = uc ($str);
     if (/\#([A-F0-9][A-F0-9])([A-F0-9][A-F0-9])([A-F0-9][A-F0-9])/) {
-        $rr = hex($1) / 256;
-        $gg = hex($2) / 256;
-        $bb = hex($3) / 256;
+        $rr = hex($1) / 255;
+        $gg = hex($2) / 255;
+        $bb = hex($3) / 255;
     }
     my $color = Gtk3::Gdk::RGBA->new ($rr, $gg, $bb, 1.0);
     return $color;
@@ -368,9 +371,9 @@ sub gdk_rgba_from_str {
 
 sub str_from_gdk_rgba {
     my ($color) = @_;
-    my $rr = $color->red * 256;
-    my $gg = $color->green * 256;
-    my $bb = $color->blue * 256;
+    my $rr = $color->red * 255;
+    my $gg = $color->green * 255;
+    my $bb = $color->blue * 255;
     my $str = sprintf ("#%.2x%.2x%.2x", $rr, $gg, $bb);
     return $str;
 }
@@ -1118,13 +1121,22 @@ sub new_gui_page() {
         '3.14.0.22',
         '0',
     ],
+    qs_press_t => [
+        'qs_press_timeout',
+        [ $xl::s{l_beh_qs_press_t}, $xl::s{l_beh_qs_press_t_units} ],
+        $xl::s{h_beh_qs_press_t},
+        'int,50,5000', # 0.05 seconds - 5 seconds
+        '4.0.0.411',
+        '500',
+
+    ],
 );
 
 sub new_behaviour_page() {
-    return new_grid_pack (2, 21, [
+    return new_grid_pack (2, 22, [
         [ _('Drag \'n\' drop') ],
-        [ new_text_box_for_int (\%pr::beh, 'hover_t', \%HPVALUE) ],
-        [ new_check_button_for (\%pr::beh, 'warn_dnd', \%HPVALUE) ],
+        [ new_text_box_for_int (\%pr::beh, 'hover_t', \%HPVALUE),
+            new_check_button_for (\%pr::beh, 'warn_dnd', \%HPVALUE) ],
         [ '--' ],
         [ _('Secure Sockets Layer') ],
         [ new_check_button_for (\%pr::beh, 'skip_ssl', \%HPVALUE),
@@ -1142,12 +1154,13 @@ sub new_behaviour_page() {
         [ new_check_button_for (\%pr::beh, 'hide_tz', \%HPVALUE) ],
         [ '--' ],
         [ _('Completion') ],
-        [ new_check_button_for (\%pr::beh, 'addr_swc', \%HPVALUE) ],
-        [ new_check_button_for (\%pr::beh, 'fold_swc', \%HPVALUE) ],
+        [ new_check_button_for (\%pr::beh, 'addr_swc', \%HPVALUE),
+            new_check_button_for (\%pr::beh, 'fold_swc', \%HPVALUE) ],
         [ '--' ],
         [ _('Other') ],
         [ new_text_box_for_int (\%pr::beh, 'up_step', \%HPVALUE) ],
-        [ new_text_box_for_int (\%pr::beh, 'thread_a', \%HPVALUE) ]
+        [ new_text_box_for_int (\%pr::beh, 'thread_a', \%HPVALUE) ],
+        [ new_text_box_for_int (\%pr::beh, 'qs_press_t', \%HPVALUE) ]
     ]);
 }
 
diff --git a/t/str_rgba.t b/t/str_rgba.t
index 6d1cef6..60f116f 100644
--- a/t/str_rgba.t
+++ b/t/str_rgba.t
@@ -1,7 +1,8 @@
 use 5.010_000;
 use strict;
 use utf8;
-use Test::More tests => 6;
+use Gtk3;
+use Test::More tests => 12;
 
 require_ok ('Clawsker');
 
@@ -33,3 +34,19 @@ ok (
     'complementarity white'
 );
 
+my @colors = (
+    [Gtk3::Gdk::RGBA->new (1.0, 1.0, 1.0, 1.0), '#ffffff'],
+    [Gtk3::Gdk::RGBA->new (1.0, 1.0, 1.0, 0.5), '#ffffff'],
+    [Gtk3::Gdk::RGBA->new (0.505, 0.505, 0.505, 1.0), '#808080'],
+    [Gtk3::Gdk::RGBA->new (0.505, 0.505, 0.505, 0.5), '#808080'],
+    [Gtk3::Gdk::RGBA->new (0.0, 0.0, 0.0, 1.0), '#000000'],
+    [Gtk3::Gdk::RGBA->new (0.0, 0.0, 0.0, 0.5), '#000000'],
+);
+
+for my $color (@colors) {
+    is (
+        Clawsker::str_from_gdk_rgba($color->[0]),
+        $color->[1],
+        join(' ', 'color', $color->[1])
+    )
+}

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☑ proposals not currently being rate-limited for maintainer None
  • ☑ change set 376a56b2-0f2e-4e84-824d-f3d8142f6b09 is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots clawsker

Lintian Result

Full worker log Full build log