Attachment 857094 Details for Bug 1059267 – Fix gscan2pdf to use relocated functions.

Fix gscan2pdf to use relocated functions.

gscan2pdf.fix.txt (text/plain), 2.47 KB, created by David Hampton on 2014-01-29 14:16:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Hampton

Created: 2014-01-29 14:16:02 UTC

Size: 2.47 KB

patch

obsolete

>--- /usr/bin/gscan2pdf.bad	2013-08-03 16:15:47.000000000 -0400
>+++ /usr/bin/gscan2pdf	2014-01-29 08:55:24.085834385 -0500
>@@ -3766,14 +3766,14 @@
>   }
>  );
>  if ( defined $SETTING{'default profile'} ) {
>-  Gscan2pdf::Dialog::Scan::Sane::set_combobox_by_text( $combobsp,
>+  Gscan2pdf::Dialog::Scan::set_combobox_by_text( $combobsp,
>    $SETTING{'default profile'} );
>  }
>- elsif ( Gscan2pdf::Dialog::Scan::Sane::num_rows_combobox($combobsp) > -1 ) {
>+ elsif ( Gscan2pdf::Dialog::Scan::num_rows_combobox($combobsp) > -1 ) {
>   $combobsp->set_active(0);
>  }
>  $combobsp->set_active(
>-  Gscan2pdf::Dialog::Scan::Sane::num_rows_combobox($combobsp) );
>+  Gscan2pdf::Dialog::Scan::num_rows_combobox($combobsp) );
>  $vboxsp->pack_start( $combobsp, FALSE, FALSE, 0 );
>  my $hboxsp = Gtk2::HBox->new;
>  $vboxsp->pack_end( $hboxsp, FALSE, FALSE, 0 );
>@@ -3805,7 +3805,7 @@
>     $combobsp->append_text($profile);
>     $SETTING{profile}{$profile} = \%options;
>     $combobsp->set_active(
>-     Gscan2pdf::Dialog::Scan::Sane::num_rows_combobox($combobsp) );
>+     Gscan2pdf::Dialog::Scan::num_rows_combobox($combobsp) );
>    }
>    $dialog->destroy;
>   }
>@@ -3820,7 +3820,7 @@
>    if ( $i > -1 ) {
>     delete $SETTING{profile}{ $combobsp->get_active_text };
>     $combobsp->remove_text($i);
>-    my $n = Gscan2pdf::Dialog::Scan::Sane::num_rows_combobox($combobsp);
>+    my $n = Gscan2pdf::Dialog::Scan::num_rows_combobox($combobsp);
>     $i = $n if ( $i > $n );
>     $combobsp->set_active($i) if ( $i > -1 );
>    }
>@@ -5734,7 +5734,7 @@
> 
>  # Give the GUI a chance to catch up before resizing.
>  Glib::Idle->add( sub { $windows->resize( 100, 100 ); } );
>- Gscan2pdf::Dialog::Scan::Sane::set_combobox_by_text( $combobp,
>+ Gscan2pdf::Dialog::Scan::set_combobox_by_text( $combobp,
>   $SETTING{'Paper size'} );
> 
>  #  Unghost the scan button
>@@ -5966,7 +5966,7 @@
>    my @rows = $paper_list->get_selected_indices;
>    $rows[0] = 0 unless (@rows);
>    $SETTING{'Paper size'} = $paper_list->{data}[ $rows[0] ][0];
>-   Gscan2pdf::Dialog::Scan::Sane::set_combobox_by_text( $combobp,
>+   Gscan2pdf::Dialog::Scan::set_combobox_by_text( $combobp,
>     $SETTING{'Paper size'} );
>    $windowd->hide;
>   },
>@@ -5974,7 +5974,7 @@
>    my @rows = $paper_list->get_selected_indices;
>    $rows[0] = 0 unless (@rows);
>    $SETTING{'Paper size'} = $paper_list->{data}[ $rows[0] ][0];
>-   Gscan2pdf::Dialog::Scan::Sane::set_combobox_by_text( $combobp,
>+   Gscan2pdf::Dialog::Scan::set_combobox_by_text( $combobp,
>     $SETTING{'Paper size'} );
>    $windowd->hide;
>   }

Actions: View

Attachments on bug 1059267: 857094