← Back to branch summary

~axiometry/shutter/devel

« back to all changes in this revision

Viewing changes to bin/shutter

  • Committer: Mario Kemper
  • Date: 2014-06-09 14:57:36 UTC
  • Revision ID: mario.kemper@googlemail.com-20140609145736-275ncg75vw3hv87p
fix mime_type and remove ImmIO.pm

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/shutter
103
103
#define constants
104
104
#--------------------------------------
105
105
use constant MAX_ERROR       => 5;
106
 
use constant SHUTTER_REV     => 'Rev.1262';
 
106
use constant SHUTTER_REV     => 'Rev.1263';
107
107
use constant SHUTTER_NAME    => 'Shutter';
108
108
use constant SHUTTER_VERSION => '0.91';
109
 
 
110
109
#--------------------------------------
111
110
 
112
111
#configure path settings
4114
4113
 
4115
4114
        #check mime type
4116
4115
        my $mime_type = Gnome2::VFS->get_mime_type_for_name( $uri->to_string );
 
4116
        $mime_type =~ s/image\/x\-apple\-ios\-png/image\/png/; #FIXME
4117
4117
        if ( $mime_type =~ m/(pdf|ps|svg)/ig ) {
4118
4118
 
4119
4119
            #not a supported mime type
5263
5263
        my @valid_files;
5264
5264
        foreach my $file (@files) {
5265
5265
            my $mime_type = Gnome2::VFS->get_mime_type_for_name($file);
 
5266
            $mime_type =~ s/image\/x\-apple\-ios\-png/image\/png/; #FIXME
5266
5267
            if ( $mime_type && &fct_check_valid_mime_type($mime_type) ) {
5267
5268
                push @valid_files, $file;
5268
5269
            }
7581
7582
                $session_screens{$key}->{'name'} =~ s/\.$session_screens{$key}->{'filetype'}//g;
7582
7583
 
7583
7584
                #mime type
7584
 
                $session_screens{$key}->{'mime_type'} = Gnome2::VFS->get_mime_type_for_name( $session_screens{$key}->{'uri'}->to_string );
 
7585
                my $mime_type = Gnome2::VFS->get_mime_type_for_name( $session_screens{$key}->{'uri'}->to_string );
 
7586
                                $mime_type =~ s/image\/x\-apple\-ios\-png/image\/png/; #FIXME
 
7587
                                $session_screens{$key}->{'mime_type'} = $mime_type;
7585
7588
 
7586
 
                #THUMBNAIL
 
7589
                                #THUMBNAIL
7587
7590
                #--------------------------------------
7588
7591
                #maybe we have a pixbuf already (e.g. after taking a screenshot)
7589
7592
                unless ($pixbuf) {