Changeset ba4e2fe


Ignore:
Timestamp:
Aug 10, 2010, 7:13:10 PM (14 years ago)
Author:
Kyle Brogle <broglek@…>
Branches:
debian
Children:
b349e5d
Parents:
7009a01 (diff), 9fdf4a1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Kyle Brogle <broglek@…> (08/10/10 19:13:10)
git-committer:
Kyle Brogle <broglek@…> (08/10/10 19:13:10)
Message:

Merge branch 'master' into debian

Files:
29 added
4 edited

Legend:

Unmodified
Added
Removed

  • client/bin/gbq

    r0d02eca r9fdf4a1  
    3737my $printer = $cups->getDestination("$queue");
    3838
     39unless( $printer){
     40    print "Cannot access queue $q...do you have network connectivity and permission to view the queue?\n";
     41    exit 1;
     42}
    3943print "Queue listing for queue '$queue' on '$host'\n\n";
    4044print "Job ID\t\tOwner\t\tTitle\n";

  • client/bin/gbr

    r0d02eca r9fdf4a1  
    3838$cups->setServer("$host");
    3939my $printer = $cups->getDestination("$queue");
     40unless( $printer){
     41    print "Cannot access queue $q...do you have network connectivity and permission to view the queue?\n";
     42    exit 1;
     43}
    4044my ($jobid, $title);
    4145
    … …  
    5256        my $magic = $fileinfo->{FileType};
    5357
    54         if ($magic) {
     58        if ($magic && exists($fileinfo->{Title}) && exists($fileinfo->{Artist}) && exists($fileinfo->{Album})) {
    5559            $title = $fileinfo->{'Title'}." - ".$fileinfo->{'Artist'}." - ".$fileinfo->{'Album'};
    5660        }

  • client/bin/gbrm

    r0d02eca r9fdf4a1  
    3737$cups->setServer("$host");
    3838my $printer = $cups->getDestination("$queue");
     39unless( $printer){
     40    print "Cannot access queue $q...do you have network connectivity and permission to view the queue?\n";
     41    exit 1;
     42}
    3943my @jobs = $printer->getJobs(0, 0);
    4044

  • .gitignore

    rb58aada r1d7e681  
    11*~
     2debian/files
     3debian/*.debhelper
     4debian/*.substvars
     5debian/*.debhelper.log
     6debian/gutenbach/
     7debian/gutenbach-client/
     8debian/gutenbach-queue/
     9debian/gutenbach-remctl/
     10debian/gutenbach-server/
     11debian/stamp-makefile-build
     12debian/tmp/
    213client/bin/*.1.gz
    3 debian/
Note: See TracChangeset for help on using the changeset viewer.