summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-08-08 05:45:04 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-08-08 05:45:04 +0800
commit45ef4bf023cd4018427a3de760bb17cc6b5cc1f6 (patch)
tree59c95c94d66012ddd8d43eb3d7c3da5852b3c26e
parent375dab986dd559878093a3567b798c87149242d6 (diff)
downloadmarcuscom-ports-45ef4bf023cd4018427a3de760bb17cc6b5cc1f6.tar
marcuscom-ports-45ef4bf023cd4018427a3de760bb17cc6b5cc1f6.tar.gz
marcuscom-ports-45ef4bf023cd4018427a3de760bb17cc6b5cc1f6.tar.bz2
marcuscom-ports-45ef4bf023cd4018427a3de760bb17cc6b5cc1f6.tar.lz
marcuscom-ports-45ef4bf023cd4018427a3de760bb17cc6b5cc1f6.tar.xz
marcuscom-ports-45ef4bf023cd4018427a3de760bb17cc6b5cc1f6.tar.zst
marcuscom-ports-45ef4bf023cd4018427a3de760bb17cc6b5cc1f6.zip
Remove the problem from runtime. This just hides the problem. But this port has
some other issues that needs to be reviewed anyway. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17030 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--x11/gnome-shell/files/patch-js_ui_main.js32
1 files changed, 26 insertions, 6 deletions
diff --git a/x11/gnome-shell/files/patch-js_ui_main.js b/x11/gnome-shell/files/patch-js_ui_main.js
index 548ee0089..34d93391c 100644
--- a/x11/gnome-shell/files/patch-js_ui_main.js
+++ b/x11/gnome-shell/files/patch-js_ui_main.js
@@ -1,6 +1,6 @@
---- js/ui/main.js.orig 2011-12-15 15:54:58.000000000 +0100
-+++ js/ui/main.js 2011-12-15 15:55:25.000000000 +0100
-@@ -27,7 +27,6 @@ const PlaceDisplay = imports.ui.placeDis
+--- js/ui/main.js.orig 2012-04-16 18:41:48.000000000 +0200
++++ js/ui/main.js 2012-08-07 23:34:04.000000000 +0200
+@@ -26,12 +26,11 @@
const RunDialog = imports.ui.runDialog;
const Layout = imports.ui.layout;
const LookingGlass = imports.ui.lookingGlass;
@@ -8,7 +8,22 @@
const NotificationDaemon = imports.ui.notificationDaemon;
const WindowAttentionHandler = imports.ui.windowAttentionHandler;
const Scripting = imports.ui.scripting;
-@@ -66,7 +65,6 @@ let xdndHandler = null;
+ const ShellDBus = imports.ui.shellDBus;
+-const TelepathyClient = imports.ui.telepathyClient;
++//const TelepathyClient = imports.ui.telepathyClient;
+ const WindowManager = imports.ui.windowManager;
+ const Magnifier = imports.ui.magnifier;
+ const XdndHandler = imports.ui.xdndHandler;
+@@ -54,7 +53,7 @@
+ let messageTray = null;
+ let notificationDaemon = null;
+ let windowAttentionHandler = null;
+-let telepathyClient = null;
++//let telepathyClient = null;
+ let ctrlAltTabManager = null;
+ let recorder = null;
+ let shellDBusService = null;
+@@ -66,7 +65,6 @@
let statusIconDispatcher = null;
let keyboard = null;
let layoutManager = null;
@@ -16,8 +31,13 @@
let _errorLogStack = [];
let _startDate;
let _defaultCssStylesheet = null;
-@@ -84,7 +82,6 @@ function _createUserSession() {
- telepathyClient = new TelepathyClient.Client();
+@@ -82,10 +80,10 @@
+ global.launch_calendar_server();
+
+ placesManager = new PlaceDisplay.PlacesManager();
+- telepathyClient = new TelepathyClient.Client();
++// For some reason the below doesn't work ...
++// telepathyClient = new TelepathyClient.Client();
automountManager = new AutomountManager.AutomountManager();
autorunManager = new AutorunManager.AutorunManager();
- networkAgent = new NetworkAgent.NetworkAgent();