← Back to branch summary

~ubuntu-branches/ubuntu/natty/plasma-mobile/natty

« back to all changes in this revision

Viewing changes to shell/main.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Belem
  • Date: 2011-01-01 16:58:27 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110101165827-vij700zj247uxcdr
Tags: 0.0~svn20110101-0ubuntu1
* New svn snapshot
* Remove kubuntu_01_library_version.diff and
  debian-changes-0.0~svn20100830-0ubuntu4, they don't apply and aren't
  needed in the current snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/main.cpp
41
41
    aboutData.addAuthor(ki18n("Alexis Menard"),
42
42
                        ki18n("Author and maintainer"),
43
43
                        "menard@kde.org");
 
44
    aboutData.addAuthor(ki18n("Marco Martin"),
 
45
                        ki18n("Author and maintainer"),
 
46
                        "mart@kde.org");
44
47
 
 
48
    QApplication::setGraphicsSystem("raster");
45
49
    KCmdLineArgs::init(argc, argv, &aboutData);
46
50
 
47
51
    KCmdLineOptions options;
54
58
    KCmdLineArgs::addCmdLineOptions(options);
55
59
 
56
60
    PlasmaApp *app = PlasmaApp::self();
57
 
 
 
61
#define CUSTOM_INPUTCONTEXT
 
62
#ifdef CUSTOM_INPUTCONTEXT
58
63
    InputContext *ic = new InputContext;
59
64
    app->setInputContext(ic);
 
65
#endif
60
66
 
61
67
    QApplication::setWindowIcon(KIcon("plasma"));
62
68
    app->disableSessionManagement(); // autostarted