Sophie

Sophie

distrib > Mageia > 6 > armv5tl > media > core-updates-src > by-pkgid > d833e7971c6af4a677c56fa27b90adfe > files > 1

gscan2pdf-1.8.2-1.1.mga6.src.rpm

diff --git a/bin/gscan2pdf b/bin/gscan2pdf
index 1342447..e2389d1 100755
--- a/bin/gscan2pdf
+++ b/bin/gscan2pdf
@@ -119,8 +119,11 @@
 # Set up domain for gettext (internationalisation)
 # Expects /usr/share/locale/LANGUAGE/LC_MESSAGES/$prog_name.mo
 # or whatever is set by $d->dir([NEWDIR]);
-my $d      = Locale::gettext->domain($prog_name);
-my $d_sane = Locale::gettext->domain('sane-backends');
+Locale::gettext::bind_textdomain_codeset( $prog_name, 'UTF-8' );
+my $d      = Locale::gettext->domain_raw($prog_name);
+my $d_sane = Locale::gettext->domain_raw('sane-backends');
+$d->codeset('UTF-8');
+$d_sane->codeset('UTF-8');
 
 my $debug   = FALSE;
 my $EMPTY   = q{};
diff --git a/lib/Gscan2pdf/Config.pm b/lib/Gscan2pdf/Config.pm
index c2c5ba2..4a01665 100644
--- a/lib/Gscan2pdf/Config.pm
+++ b/lib/Gscan2pdf/Config.pm
@@ -79,7 +79,8 @@
     }
 
     if ( not defined $d ) {
-        $d = Locale::gettext->domain(Glib::get_application_name);
+        $d = Locale::gettext->domain_raw(Glib::get_application_name);
+        $d->codeset('UTF-8');
     }
 
     # from v1.3.3 onwards, the config file is saved as JSON
diff --git a/lib/Gscan2pdf/Dialog/Renumber.pm b/lib/Gscan2pdf/Dialog/Renumber.pm
index f4d2baa..fab1e04 100644
--- a/lib/Gscan2pdf/Dialog/Renumber.pm
+++ b/lib/Gscan2pdf/Dialog/Renumber.pm
@@ -84,7 +84,8 @@
     my ( $class, @arguments ) = @_;
     my $self = Glib::Object::new( $class, @arguments );
 
-    my $d = Locale::gettext->domain(Glib::get_application_name);
+    my $d = Locale::gettext->domain_raw(Glib::get_application_name);
+    $d->codeset('UTF-8');
     $self->set( 'title', $d->get('Renumber') );
 
     my $vbox = $self->get('vbox');
@@ -337,7 +338,8 @@
         $slist->select(@page);
     }
     else {
-        my $d   = Locale::gettext->domain(Glib::get_application_name);
+        my $d = Locale::gettext->domain_raw(Glib::get_application_name);
+        $d->codeset('UTF-8');
         my $msg = $d->get(
 'The current settings would result in duplicate page numbers. Please select new start and increment values.'
         );
diff --git a/lib/Gscan2pdf/Dialog/Scan/CLI.pm b/lib/Gscan2pdf/Dialog/Scan/CLI.pm
index 550bccd..bd9cfa5 100644
--- a/lib/Gscan2pdf/Dialog/Scan/CLI.pm
+++ b/lib/Gscan2pdf/Dialog/Scan/CLI.pm
@@ -89,8 +89,10 @@
     $tooltips = Gtk2::Tooltips->new;
     $tooltips->enable;
 
-    $d      = Locale::gettext->domain(Glib::get_application_name);
-    $d_sane = Locale::gettext->domain('sane-backends');
+    $d      = Locale::gettext->domain_raw(Glib::get_application_name);
+    $d_sane = Locale::gettext->domain_raw('sane-backends');
+    $d->codeset('UTF-8');
+    $d_sane->codeset('UTF-8');
     return $self;
 }
 
diff --git a/lib/Gscan2pdf/Dialog/Scan/Sane.pm b/lib/Gscan2pdf/Dialog/Scan/Sane.pm
index 24f09cd..b9eaeb9 100644
--- a/lib/Gscan2pdf/Dialog/Scan/Sane.pm
+++ b/lib/Gscan2pdf/Dialog/Scan/Sane.pm
@@ -47,8 +47,10 @@
     $tooltips = Gtk2::Tooltips->new;
     $tooltips->enable;
 
-    $d      = Locale::gettext->domain(Glib::get_application_name);
-    $d_sane = Locale::gettext->domain('sane-backends');
+    $d      = Locale::gettext->domain_raw(Glib::get_application_name);
+    $d_sane = Locale::gettext->domain_raw('sane-backends');
+    $d->codeset('UTF-8');
+    $d_sane->codeset('UTF-8');
     return $self;
 }
 
diff --git a/lib/Gscan2pdf/Dialog/Scan.pm b/lib/Gscan2pdf/Dialog/Scan.pm
index dc0e49b..f7f046b 100644
--- a/lib/Gscan2pdf/Dialog/Scan.pm
+++ b/lib/Gscan2pdf/Dialog/Scan.pm
@@ -254,8 +254,10 @@
     $tooltips = Gtk2::Tooltips->new;
     $tooltips->enable;
 
-    $d      = Locale::gettext->domain(Glib::get_application_name);
-    $d_sane = Locale::gettext->domain('sane-backends');
+    $d      = Locale::gettext->domain_raw(Glib::get_application_name);
+    $d_sane = Locale::gettext->domain_raw('sane-backends');
+    $d->codeset('UTF-8');
+    $d_sane->codeset('UTF-8');
 
     $self->_add_device_combobox($vbox);
 
diff --git a/lib/Gscan2pdf/Document.pm b/lib/Gscan2pdf/Document.pm
index 01e130e..6fa44fa 100644
--- a/lib/Gscan2pdf/Document.pm
+++ b/lib/Gscan2pdf/Document.pm
@@ -95,7 +95,8 @@
 sub setup {
     ( my $class, $logger ) = @_;
     $_self = {};
-    $d     = Locale::gettext->domain(Glib::get_application_name);
+    $d     = Locale::gettext->domain_raw(Glib::get_application_name);
+    $d->codeset('UTF-8');
     Gscan2pdf::Page->set_logger($logger);
 
     $_self->{requests} = Thread::Queue->new;
diff --git a/lib/Gscan2pdf/Frontend/CLI.pm b/lib/Gscan2pdf/Frontend/CLI.pm
index fdc5dd8..1b605fe 100644
--- a/lib/Gscan2pdf/Frontend/CLI.pm
+++ b/lib/Gscan2pdf/Frontend/CLI.pm
@@ -40,7 +40,8 @@
 sub setup {
     ( my $class, $logger ) = @_;
     $_self = {};
-    $d     = Locale::gettext->domain(Glib::get_application_name);
+    $d     = Locale::gettext->domain_raw(Glib::get_application_name);
+    $d->codeset('UTF-8');
     return;
 }
 
diff --git a/lib/Gscan2pdf/Page.pm b/lib/Gscan2pdf/Page.pm
index eccc18b..1b4ee50 100644
--- a/lib/Gscan2pdf/Page.pm
+++ b/lib/Gscan2pdf/Page.pm
@@ -50,7 +50,8 @@
     my ( $class, %options ) = @_;
     my $self = {};
     if ( not defined $d ) {
-        $d = Locale::gettext->domain(Glib::get_application_name);
+        $d = Locale::gettext->domain_raw(Glib::get_application_name);
+        $d->codeset('UTF-8');
     }
 
     if ( not defined $options{filename} ) {
diff --git a/lib/Gscan2pdf/PageRange.pm b/lib/Gscan2pdf/PageRange.pm
index 97e0add..26486a3 100644
--- a/lib/Gscan2pdf/PageRange.pm
+++ b/lib/Gscan2pdf/PageRange.pm
@@ -34,7 +34,8 @@
 
 sub INIT_INSTANCE {
     my $self    = shift;
-    my $d       = Locale::gettext->domain(Glib::get_application_name);
+    my $d       = Locale::gettext->domain_raw(Glib::get_application_name);
+    $d->codeset('UTF-8');
     my %buttons = (
         'selected' => $d->get('Selected'),
         'all'      => $d->get('All'),
diff --git a/lib/Gscan2pdf/Unpaper.pm b/lib/Gscan2pdf/Unpaper.pm
index 55f5f92..e6e8960 100644
--- a/lib/Gscan2pdf/Unpaper.pm
+++ b/lib/Gscan2pdf/Unpaper.pm
@@ -36,7 +36,8 @@
 sub new {
     my ( $class, $default ) = @_;
     my $self = {};
-    $d = Locale::gettext->domain(Glib::get_application_name);
+    $d = Locale::gettext->domain_raw(Glib::get_application_name);
+    $d->codeset('UTF-8');
     $self->{default} = defined $default ? $default : {};
 
     # Set up hash for options
diff --git a/lib/Gscan2pdf/Dialog.pm b/lib/Gscan2pdf/Dialog.pm
--- a/lib/Gscan2pdf/Dialog.pm
+++ b/lib/Gscan2pdf/Dialog.pm
@@ -51,7 +51,8 @@
     my $self = shift;
 
     $self->set_position('center-on-parent');
-    $d        = Locale::gettext->domain(Glib::get_application_name);
+    $d        = Locale::gettext->domain_raw(Glib::get_application_name);
+    $d->codeset('UTF-8');
     $tooltips = Gtk2::Tooltips->new;
     $tooltips->enable;