Changeset 11039
- Timestamp:
- 03/10/10 01:30:35 (2 years ago)
- Location:
- trunk/Padre/lib/Padre
- Files:
-
- 3 edited
-
SlaveDriver.pm (modified) (3 diffs)
-
Wx/Ack.pm (modified) (2 diffs)
-
Wx/Dialog/WindowList.pm (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Padre/lib/Padre/SlaveDriver.pm
r11027 r11039 128 128 129 129 require Storable; 130 $self->{cmd_queue}->enqueue( 131 Storable::freeze( [ $task_manager->task_queue ] ) 132 ); 133 134 return threads->object( 135 $self->{tid_queue}->dequeue 136 ); 130 $self->{cmd_queue}->enqueue( Storable::freeze( [ $task_manager->task_queue ] ) ); 131 132 return threads->object( $self->{tid_queue}->dequeue ); 137 133 } 138 134 … … 192 188 193 189 sub _worker_loop { 194 my ( $queue) = @_;190 my ($queue) = @_; 195 191 @_ = (); # Hack to avoid "Scalars leaked" 196 192 … … 244 240 while ( my $args = $inqueue->dequeue ) { # args is frozen [$main, $queue] 245 241 last if $args eq 'STOP'; 246 my $task_queue = Padre::SlaveDriver->new->task_queue;242 my $task_queue = Padre::SlaveDriver->new->task_queue; 247 243 my $worker_thread = threads->create( \&_worker_loop, $task_queue ); 248 $outqueue->enqueue( $worker_thread->tid);244 $outqueue->enqueue( $worker_thread->tid ); 249 245 } 250 246 -
trunk/Padre/lib/Padre/Wx/Ack.pm
r11011 r11039 248 248 my $file_matching = $opts{f} || $opts{lines}; 249 249 if ( !$file_matching ) { 250 $opts{regex} = App::Ack::build_regex( $opts{regex} , \%opts );250 $opts{regex} = App::Ack::build_regex( $opts{regex}, \%opts ); 251 251 } 252 252 … … 254 254 eval { App::Ack::check_regex( $opts{regex} ) }; 255 255 if ($@) { 256 $main->error( "Find in Files: error in regex " . $opts{regex});256 $main->error( "Find in Files: error in regex " . $opts{regex} ); 257 257 return; 258 258 } -
trunk/Padre/lib/Padre/Wx/Dialog/WindowList.pm
r11033 r11039 54 54 $self->SetIcon(Padre::Wx::Icon::PADRE); 55 55 56 if ( !scalar(Padre->ide->wx->main->pages)) {56 if ( !scalar( Padre->ide->wx->main->pages ) ) { 57 57 $self->{_empty} = 1; 58 58 } else { 59 59 60 # create dialog61 $self->_create;60 # create dialog 61 $self->_create; 62 62 } 63 63 … … 70 70 my $self = shift; 71 71 72 if ( $self->{_empty}) {72 if ( $self->{_empty} ) { 73 73 $self->Destroy; 74 74 return 0; … … 323 323 324 324 my $documentfile = $document->file; 325 if ( defined($documentfile)) {326 327 $filename= $documentfile->filename;328 my $project_dir = $document->project_dir;329 $filename =~ s/^\Q$project_dir\E// if defined($project_dir);330 331 # Apply filter (if any)332 if ( defined( $self->{filter} ) ) {333 next unless &{ $self->{filter} }( $page, $project_dir, $filename, $document );334 }325 if ( defined($documentfile) ) { 326 327 $filename = $documentfile->filename; 328 my $project_dir = $document->project_dir; 329 $filename =~ s/^\Q$project_dir\E// if defined($project_dir); 330 331 # Apply filter (if any) 332 if ( defined( $self->{filter} ) ) { 333 next unless &{ $self->{filter} }( $page, $project_dir, $filename, $document ); 334 } 335 335 } else { 336 336 $filename = $document->get_title;
Note: See TracChangeset
for help on using the changeset viewer.
