1. 13 Jan, 2020 1 commit
  2. 12 Jan, 2020 1 commit
  3. 09 Jan, 2020 1 commit
  4. 07 Jan, 2020 4 commits
  5. 06 Jan, 2020 1 commit
  6. 01 Jan, 2020 1 commit
  7. 30 Dec, 2019 1 commit
  8. 29 Dec, 2019 3 commits
  9. 28 Dec, 2019 1 commit
  10. 19 Dec, 2019 1 commit
  11. 12 Dec, 2019 1 commit
  12. 10 Dec, 2019 3 commits
  13. 09 Dec, 2019 1 commit
    • Aleix Pol Gonzalez's avatar
      Support locales with fallbacks · f7f68c67
      Aleix Pol Gonzalez authored
      Summary: Jonathan uses en_GB.dict that diverges slightly from en.dict. They both should be taken into account properly.
      
      Test Plan: Used Jon's env var
      
      Reviewers: #plasma, jriddell
      
      Reviewed By: #plasma, jriddell
      
      Subscribers: jriddell, plasma-devel
      
      Tags: #plasma
      
      Differential Revision: https://phabricator.kde.org/D25823
      f7f68c67
  14. 04 Dec, 2019 2 commits
  15. 03 Dec, 2019 6 commits
  16. 29 Nov, 2019 1 commit
  17. 25 Nov, 2019 3 commits
  18. 20 Nov, 2019 1 commit
  19. 18 Nov, 2019 1 commit
  20. 17 Nov, 2019 1 commit
  21. 05 Nov, 2019 1 commit
  22. 04 Nov, 2019 1 commit
  23. 02 Nov, 2019 1 commit
  24. 31 Oct, 2019 2 commits
    • Aleix Pol Gonzalez's avatar
      kimpanel: don't crash when ibus is already loaded · 299f298d
      Aleix Pol Gonzalez authored
      Summary:
      No need to replace the current engine if we already have an acceptable one set.
      
      Otherwise it confuses Qt and it asserts in Qt.
      
      ```
       7  0x00007f517fcdf8e6 in qt_assert (assertion=assertion@entry=0x7f5179fee560 "engine_name == desc.engine_name", file=file@entry=0x7f5179fee318 "/home/apol/devel/frameworks/qt5/qtbase/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp",
          line=line@entry=583) at ../../include/QtCore/../../../../../devel/frameworks/qt5/qtbase/src/corelib/global/qlogging.h:90
       8  0x00007f5179fdb6f4 in QIBusPlatformInputContext::globalEngineChanged (this=0x55831b2c7ff0, engine_name=...) at ../../../../include/QtCore/../../../../../devel/frameworks/qt5/qtbase/src/corelib/tools/qarraydata.h:236
       9  0x00007f5179fe7f6d in QIBusPlatformInputContext::qt_static_metacall (_o=<optimized out>, _c=<optimized out>, _id=<optimized out>, _a=<optimized out>) at .moc/moc_qibusplatforminputcontext.cpp:147
      ```
      
      Test Plan:
      Now I can start the plasmoid without it crashing.
      I'm guessing users so far were running against a release build of Qt without asserts.
      Starting ibus with the session now works as well, in contrast to having to start it explicitly
      
      Reviewers: hein
      
      Reviewed By: hein
      
      Subscribers: plasma-devel
      
      Tags: #plasma
      
      Differential Revision: https://phabricator.kde.org/D25045
      299f298d
    • Script Kiddy's avatar
      SVN_SILENT made messages (.desktop file) - always resolve ours · f0502407
      Script Kiddy authored
      In case of conflict in i18n, keep the version of the branch "ours"
      To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
      f0502407