summaryrefslogtreecommitdiff
path: root/plugins/unityshell
diff options
authorAndrea Azzarone <azzaronea@gmail.com>2013-08-01 07:12:52 +0200
committerAndrea Azzarone <azzaronea@gmail.com>2013-08-01 07:12:52 +0200
commit8e31212492b1f2357e17a64ee22608892f0794b1 (patch)
treef2bf3d6f590c20718632afce490b2a0d4203bfc3 /plugins/unityshell
parent39861ab1b9f76929274735657be7a82de592d3ec (diff)
parentc7736733ebd2fd73e6ea88b7abf90fef67eef294 (diff)
Merge trunk and update test_panel_controller.
(bzr r3444.2.2)
Diffstat (limited to 'plugins/unityshell')
-rw-r--r--plugins/unityshell/src/MultiMonitor.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/unityshell/src/MultiMonitor.h b/plugins/unityshell/src/MultiMonitor.h
index e93881334..f647f36dd 100644
--- a/plugins/unityshell/src/MultiMonitor.h
+++ b/plugins/unityshell/src/MultiMonitor.h
@@ -20,6 +20,12 @@
#ifndef MULTIMONITOR_H
#define MULTIMONITOR_H
-const int max_num_monitors = 6;
+namespace unity
+{
+namespace monitors
+{
+const unsigned MAX = 6;
+}
+}
#endif \ No newline at end of file