From: Ricardo Mones <ricardo@mones.org>
Date: Sun, 18 Sep 2016 23:01:29 +0000 (+0200)
Subject: Decouple getting version info from printing
X-Git-Tag: 1.0.0~24
X-Git-Url: http://git.claws-mail.org/?p=clawsker.git;a=commitdiff_plain;h=56bf0d2908e7f8a402b108f36b825b1c207795af

Decouple getting version info from printing
---

diff --git a/clawsker b/clawsker
index 8ed9fdf..27ea596 100755
--- a/clawsker
+++ b/clawsker
@@ -1973,23 +1973,35 @@ sub new_plugins_page() {
 }
 
 # version info
-sub print_version() {
-    print $xl::s{about_title} . "\n";
-    print $xl::s{about_version} . " $VERSION\n";
-    print "Perl-GLib " . $Glib::VERSION;
+sub get_toolkit_versions {
+    my %versions = ();
+    $versions{'glib'} = $Glib::VERSION;
     # version info stuff appeared in 1.040
     if ($Glib::VERSION >= 1.040) {
-        print _(", built for ") . join(".", Glib->GET_VERSION_INFO)
-              . _(", running with ") . join(".", &Glib::major_version,
-              &Glib::minor_version, &Glib::micro_version);
+        $versions{'glib-b'} = join('.', Glib->GET_VERSION_INFO);
+        $versions{'glib-r'} = join('.',
+            &Glib::major_version, &Glib::minor_version, &Glib::micro_version);
     }
-    print "\n";
-    print "Perl-GTK2 " . $Gtk2::VERSION;
+    $versions{'gtk2'} = $Gtk2::VERSION;
     if ($Gtk2::VERSION >= 1.040) {
-        print _(", built for ") . join(".", Gtk2->GET_VERSION_INFO)
-              . _(", running with ") . join(".", &Gtk2::major_version,
-              &Gtk2::minor_version, &Gtk2::micro_version);
+        $versions{'gtk2-b'} = join('.', Gtk2->GET_VERSION_INFO);
+        $versions{'gtk2-r'} = join('.',
+            &Gtk2::major_version, &Gtk2::minor_version, &Gtk2::micro_version);
     }
+    return \%versions;
+}
+
+sub print_version() {
+    print $xl::s{about_title} . "\n";
+    print $xl::s{about_version} . " $VERSION\n";
+    my $v = get_toolkit_versions ();
+    print "Perl-GLib " . $v->{'glib'};
+    print _(", built for ") . $v->{'glib-b'}
+        . _(", running with ") . $v->{'glib-r'} if $v->{'glib-b'};
+    print "\n";
+    print "Perl-GTK2 " . $v->{'gtk2'};
+    print _(", built for ") . $v->{'gtk2-b'}
+        . _(", running with ") . $v->{'gtk2-r'} if $v->{'gtk2-b'};
     print "\n";
     my $clawsver = ($CLAWSV eq "") ?
                 _("was not found!") :