← Back to branch summary

~ubuntu-branches/ubuntu/maverick/wxwidgets2.8/maverick-proposed

« back to all changes in this revision

Viewing changes to src/common/mimecmn.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Devid Filoni
  • Date: 2007-11-06 18:25:13 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20071106182513-809agqds6igh7mqo
Tags: 2.8.6.1-0ubuntu1
* New upstream version, based on the upstream tarball
  wxPython-src-2.8.6.1.tar.bz2, renamed debian to debian-upstream.
* Provide a get-orig-source target to do the repackaging.
* Fix "substvar-source-version-is-deprecated" lintian warnings.
* Remove duplicate Description field in debian/control.
* Add "\" at the end of line 8 in debian/python-wxtools.menu to fix
  "bad-test-in-menu-item" lintian error.
* Provide .xpm icons to fix "menu-icon-not-in-xpm-format" lintian errors,
  changed Icon field in debian/python-wxtools.menu.
* Fix "wrong-name-for-upstream-changelog" lintian warnings.
* Remove "Application;" from Categories field in debian/pycrust.desktop,
  debian/pyshell.desktop, debian/xrced.desktop.
* Switch "Apps" to "Applications" in debian/python-wxtools.menu to fix
  "menu-item-uses-apps-section" lintian warnings.
* Drop the icon extension from debian/pycrust.desktop,
  debian/pyshell.desktop, debian/xrced.desktop.
* Add dpatch support.
* Add "WX_CONFIG" patch.
* debian/rules:
  - added .xpm icons to install-gtk-py-tools target
  - added "docs/changes.txt" to dh_installchangelogs in binary-common target
  - added "\" at the end of "install-examples install-msw-dev
    install-msw-dbg install-headers-msw" line in .PHONY

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/mimecmn.cpp
5
5
// Modified by:
6
6
//  Chris Elliott (biol75@york.ac.uk) 5 Dec 00: write support for Win32
7
7
// Created:     23.09.98
8
 
// RCS-ID:      $Id: mimecmn.cpp,v 1.51 2006/11/23 13:51:49 VZ Exp $
 
8
// RCS-ID:      $Id: mimecmn.cpp 47027 2007-06-29 18:23:39Z VZ $
9
9
// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
10
10
// Licence:     wxWindows licence (part of wxExtra library)
11
11
/////////////////////////////////////////////////////////////////////////////
600
600
wxMimeTypesManager::GetFileTypeFromExtension(const wxString& ext)
601
601
{
602
602
    EnsureImpl();
603
 
    wxFileType *ft = m_impl->GetFileTypeFromExtension(ext);
 
603
 
 
604
    wxString::const_iterator i = ext.begin();
 
605
    const wxString::const_iterator end = ext.end();
 
606
    wxString extWithoutDot;
 
607
    if ( i != end && *i == '.' )
 
608
        extWithoutDot.assign(++i, ext.end());
 
609
    else
 
610
        extWithoutDot = ext;
 
611
 
 
612
    wxCHECK_MSG( !ext.empty(), NULL, _T("extension can't be empty") );
 
613
 
 
614
    wxFileType *ft = m_impl->GetFileTypeFromExtension(extWithoutDot);
604
615
 
605
616
    if ( !ft ) {
606
617
        // check the fallbacks