← Back to branch summary

~ubuntu-branches/ubuntu/quantal/kde4libs/quantal

« back to all changes in this revision

Viewing changes to kio/kio/job.cpp

  • Committer: Package Import Robot
  • Author(s): Felix Geyer, Philip Muškovac, Jonathan Thomas, Felix Geyer
  • Date: 2011-05-29 17:19:55 UTC
  • mfrom: (1.14.5 upstream) (0.1.19 sid)
  • Revision ID: package-import@ubuntu.com-20110529171955-nodep1593tuwyu6k
Tags: 4:4.6.3-1ubuntu1
[ Philip Muškovac]
* Drop kubuntu_83_fix_solid_network_status.diff
* Update Vcs links as the branch is owned by kubuntu-packagers now

[ Jonathan Thomas ]
* Drop kubuntu_06_user_disk_mounting. We no longer compile the hal
  backend, so this patch is useless.

[ Felix Geyer ]
* Merge from Debian unstable, remaining changes:
  - no build-dep on libaspell-dev
  - no build-dep on libfam-dev
  - kdelibs5-data: don't install kspell_aspell.desktop and
    usr/lib/kde4/kspell_aspell.so
  - kdelibs5-dev: don't install preparetips
  - Pass -DKDESU_USE_SUDO_DEFAULT=true to configure
  - dh_fixperms: exclude /usr/lib/kde4/libexec/fileshareset
  - set export KUBUNTU_DESKTOP_POT=kdelibs
  - don't apply use_dejavu_as_default_font.diff
  - don't apply kconf_update_migrate_from_kde3_icon_theme.diff
    - kdelibs5-data.install: drop usr/share/kde4/apps/kconf_update/kdeui.upd
  - don't build depend on libglu1-mesa-dev, not needed due to
    kubuntu_no_direct_gl_usage.diff
  - Add kdelibs5-data.links: link from /usr/share/doc/kde4 to kde for
    backwards compatible with old docs location
  - Keep the kdelibs5 transitional package
  - kdelibs5-dev.install: install ksambasharedata.h
  - kdelibs5-plugins: recommend ttf-dejavu-core instead of ttf-dejavu to save
    CD space.
* Add Breaks in addition to Replaces for moving files between packages.
* Drop no longer needed Breaks and Replaces.
* Completely drop kubuntu_51_launchpad_integration.diff and
  kubuntu_68_remove_applet_confirmation.diff.
  + Also drop the launchpad and kubuntu icons.
* Remove sequence numbers from kubuntu patches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
kio/kio/job.cpp
666
666
         return;
667
667
     }
668
668
     m_redirectionURL = url; // We'll remember that when the job finishes
669
 
     if (m_url.hasUser() && !url.hasUser() && (m_url.host().toLower() == url.host().toLower()))
670
 
         m_redirectionURL.setUser(m_url.user()); // Preserve user
671
669
     // Tell the user that we haven't finished yet
672
670
     emit q->redirection(q, m_redirectionURL);
673
671
}
893
891
       return;
894
892
     }
895
893
     m_redirectionURL = url; // We'll remember that when the job finishes
896
 
     if (m_url.hasUser() && !url.hasUser() && (m_url.host().toLower() == url.host().toLower()))
897
 
        m_redirectionURL.setUser(m_url.user()); // Preserve user
898
894
     // Tell the user that we haven't finished yet
899
895
     emit q->redirection(q, m_redirectionURL);
900
896
}
1038
1034
    else
1039
1035
    {
1040
1036
       d->m_redirectionURL = url; // We'll remember that when the job finishes
1041
 
       if (d->m_url.hasUser() && !url.hasUser() && (d->m_url.host().toLower() == url.host().toLower()))
1042
 
          d->m_redirectionURL.setUser(d->m_url.user()); // Preserve user
1043
1037
       d->m_redirectionList.append(url);
1044
1038
       d->m_outgoingMetaData["ssl_was_in_use"] = d->m_incomingMetaData["ssl_in_use"];
1045
1039
       // Tell the user that we haven't finished yet
2521
2515
        return;
2522
2516
    }
2523
2517
    m_redirectionURL = url; // We'll remember that when the job finishes
2524
 
    if (m_url.hasUser() && !url.hasUser() && (m_url.host().toLower() == url.host().toLower()))
2525
 
        m_redirectionURL.setUser(m_url.user()); // Preserve user
2526
2518
    emit q->redirection( q, m_redirectionURL );
2527
2519
}
2528
2520
 
2778
2770
     return;
2779
2771
  }
2780
2772
  d->m_redirectionURL = url;
2781
 
  if (d->m_currentEntry.url.hasUser() && !url.hasUser() && (d->m_currentEntry.url.host().toLower() == url.host().toLower()))
2782
 
      d->m_redirectionURL.setUser(d->m_currentEntry.url.user()); // Preserve user
2783
2773
  get(d->m_currentEntry.id, d->m_redirectionURL, d->m_currentEntry.metaData); // Try again
2784
2774
}
2785
2775