← Back to branch summary

~jbicha/unity-2d/fix-launcher-quicklist-naming-lp949636

« back to all changes in this revision

Viewing changes to launcher/app/launcherview.cpp

  • Committer: Florian Boucault
  • Date: 2012-02-06 19:38:07 UTC
  • mto: This revision was merged to the branch mainline in revision 897.
  • Revision ID: florian@boucault.net-20120206193807-7u5ezdcl5m58bcvw
https://launchpad.net/bugs/757288
Support running installed inside a directory that is a symlink.

isRunningInstalled() is made more reliable by resolving all symlinks contained
in the installation path.
Header inclusions were shuffled around to respect the best practice to include
from the more local to the more global headers and to solve a compilation error
as a result.

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/app/launcherview.cpp
19
19
 
20
20
#include "launcherview.h"
21
21
 
 
22
#include <config.h>
 
23
#include <keyboardmodifiersmonitor.h>
 
24
#include <hotkey.h>
 
25
#include <hotkeymonitor.h>
 
26
#include <keymonitor.h>
 
27
#include <debug_p.h>
 
28
 
22
29
#include <QApplication>
23
30
#include <QDesktopWidget>
24
31
#include <QX11Info>
37
44
#include <X11/Xlib.h>
38
45
#include <X11/Xatom.h>
39
46
 
40
 
#include <keyboardmodifiersmonitor.h>
41
 
#include <hotkey.h>
42
 
#include <hotkeymonitor.h>
43
 
#include <keymonitor.h>
44
 
#include <debug_p.h>
45
 
#include <config.h>
46
 
 
47
47
static const int KEY_HOLD_THRESHOLD = 250;
48
48
 
49
49
static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";