From ce0b590ca693e7d54ea963a72fa6c8a122d6b9f7 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 15 Nov 2012 00:10:38 +0100 Subject: [PATCH 1/2] .xinitrc --- .xinitrc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.xinitrc b/.xinitrc index 3be47f4..3f10143 100755 --- a/.xinitrc +++ b/.xinitrc @@ -9,12 +9,6 @@ if [ -d /etc/X11/xinit/xinitrc.d ]; then unset f fi -pidof mpdscribble >& /dev/null -if [ $? -ne 0 ] -then - mpdscribble & -fi - emacs --daemon & fehlstart & From 596a8ceeb38037b53c8f6226cf8e744dff3e0065 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 15 Nov 2012 00:10:57 +0100 Subject: [PATCH 2/2] .conkerorrc/init.js --- .conkerorrc/init.js | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/.conkerorrc/init.js b/.conkerorrc/init.js index 671a5f7..5d03951 100644 --- a/.conkerorrc/init.js +++ b/.conkerorrc/init.js @@ -1,6 +1,8 @@ require("content-policy.js"); require("favicon"); +var linkwave_program = "/home/slash/var/src/linkwave/src/linkwave"; + theme_load_paths.push("/home/slash/.conkerorrc/themes/"); define_browser_object_class( @@ -43,17 +45,21 @@ function oni_linkwave_add(I) { check_buffer(I.buffer, content_buffer); let url = load_spec_uri_string(load_spec(I.buffer.top_frame)); - let title = escape(yield I.minibuffer.read( + let title = yield I.minibuffer.read( $prompt = "name (required): ", - $initial_value = I.buffer.title)); - let tags = escape(yield I.minibuffer.read( - $prompt = "tags (space delimited): ")); - let description = escape(yield I.minibuffer.read( - $prompt = "extended description: ")); - let command = - '/home/slash/development/projects/linkwave/src/linkwave "' - + url + '" "' + title + '" "' + description + '"'; - I.window.minibuffer.message(command); + $initial_value = I.buffer.title); + // let tags = escape(yield I.minibuffer.read( + // $prompt = "tags (space delimited): ")); + let description = yield I.minibuffer.read( + $prompt = "extended description: "); + let command = linkwave_program + ' "' + url + '" "' + title + '" "' + + description + '"'; + let result = yield shell_command(command); + + if (!result) + I.window.minibuffer.message('Added to linkwave'); + else + I.window.minibuffer.message('Couldn\'t add to linkwave'); } interactive("linkwave-add", "Bookmark the page in linkwave", oni_linkwave_add); @@ -63,16 +69,15 @@ function oni_linkwave_add_link(I) { let url = load_spec_uri_string( load_spec(encodeURIComponent(bo))); check_buffer(I.buffer, content_buffer); - let title = escape(yield I.minibuffer.read( + let title = yield I.minibuffer.read( $prompt = "name (required): ", - $initial_value = bo.textContent)); - let tags = escape(yield I.minibuffer.read( - $prompt = "tags (space delimited): ")); - let description = escape(yield I.minibuffer.read( - $prompt = "extended description: ")); - let command = - '/home/slash/development/projects/linkwave/src/linkwave "' - + url + '" "' + title + '" "' + description + '"'; + $initial_value = bo.textContent); + // let tags = escape(yield I.minibuffer.read( + // $prompt = "tags (space delimited): ")); + let description = yield I.minibuffer.read( + $prompt = "extended description: "); + let command = linkwave_program + ' "' + url + '" "' + title + '" "' + + description + '"'; let result = yield shell_command(command); if (!result)