Merge remote-tracking branch 'origin/master' into build64-par

Conflicts:
	.kde/share/apps
	.kde/share/config
	.kde4

1 files changed, 1 insertions, 55 deletions

diff --git a/.conkerorrc b/.conkerorrc
index e33add1..6a56807 100644..120000
--- a/.conkerorrc
+++ b/.conkerorrc
@@ -1,55 +1 @@
-/* -*- Mode: js -*- */
-session_pref("signon.rememberSignons", true);
-session_pref("signon.expireMasterPassword", false);
-session_pref("signon.SignonFileName", "signons.txt");
-
-define_webjump("ddg", "https://duckduckgo.com/?q=%s");
-
-// Load login manager
-Components.classes["@mozilla.org/login-manager;1"].getService(Components.interfaces.nsILoginManager);
-
-// Auto complete stuff
-minibuffer_auto_complete_default = true;
-url_completion_use_history = true; // should work since bf05c87405
-url_completion_use_bookmarks = true;
-
-// Prompt before closing
-//define_key(content_buffer_normal_keymap, "C-x C-c", "confirm-quit");
-//can_kill_last_buffer = false;
-
-// Workaround for scrollbar bug (issue351)
-add_hook("create_buffer_late_hook",
-         function (buffer) {
-             buffer.top_frame.scrollbars.visible = true;
-         });
-
-// load session module
-require("session.js");
-session_auto_save_auto_load = true; // auto-load session
-
-// Don't show a clock in the modeline
-remove_hook("mode_line_hook", mode_line_adder(clock_widget));
-
-// Add favicons to the modeline
-require("favicon");
-add_hook("mode_line_hook", mode_line_adder(buffer_icon_widget), true);
-read_buffer_show_icons = true;
-
-// load firebug lite
-define_variable("firebug_url",
-    "https://getfirebug.com/firebug-lite.js");
-
-function firebug (I) {
-    var doc = I.buffer.document;
-    var script = doc.createElement('script');
-    script.setAttribute('type', 'text/javascript');
-    script.setAttribute('src', firebug_url);
-    script.setAttribute('onload', 'firebug.init();');
-    doc.body.appendChild(script);
-}
-interactive("firebug", "open firebug lite", firebug);
-
-// Make middle-click open links in a new buffer
-require("clicks-in-new-buffer.js");
-clicks_in_new_buffer_target = OPEN_NEW_BUFFER_BACKGROUND; 
-clicks_in_new_buffer_button = 1;
+.config/conkerorrc
\ No newline at end of file