← Back to branch summary

~ubuntu-branches/ubuntu/maverick/plasma-mobile/maverick

« back to all changes in this revision

Viewing changes to shell/main.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Belem
  • Date: 2010-08-30 23:41:22 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20100830234122-3q94e0vf1qfl4e2c
Tags: 0.0~svn20100830-0ubuntu1
https://launchpad.net/bugs/627205
* New svn snapshot, revision 1170070. (LP: #627205)
* Updated Standards-Version to 3.9.1.
* Updated the build-dep kdebase-workspace-dev to >= 4.5.
* Removed the patches kubuntu_02_enable_mobilesystray_build.diff and
  kubuntu_03_add_mobilesystray_to_all_desktops.diff since upstream
  already enables the systray build and it is by default on all
  desktops.
* Switch to dpkg-source 3.0 (quilt) format.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/main.cpp
27
27
#include <KIcon>
28
28
 
29
29
#include "plasmaapp.h"
 
30
#include "inputcontext.h"
30
31
 
31
32
static const char description[] = I18N_NOOP( "The KDE desktop, panels and widgets workspace application." );
32
33
static const char version[] = "0.1";
53
54
    KCmdLineArgs::addCmdLineOptions(options);
54
55
 
55
56
    PlasmaApp *app = PlasmaApp::self();
 
57
 
 
58
    InputContext *ic = new InputContext;
 
59
    app->setInputContext(ic);
 
60
 
56
61
    QApplication::setWindowIcon(KIcon("plasma"));
57
62
    app->disableSessionManagement(); // autostarted
58
63
    int rc = app->exec();