aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--HOWTO3
-rw-r--r--INSTALLING23
-rw-r--r--TODO7
-rw-r--r--uzbl.c8
4 files changed, 33 insertions, 8 deletions
diff --git a/HOWTO b/HOWTO
deleted file mode 100644
index 8836674..0000000
--- a/HOWTO
+++ /dev/null
@@ -1,3 +0,0 @@
-1) get the latest code from master branch
-2) make
-3) profit !
diff --git a/INSTALLING b/INSTALLING
new file mode 100644
index 0000000..0d10d24
--- /dev/null
+++ b/INSTALLING
@@ -0,0 +1,23 @@
+* Arch Linux:
+ pkgbuild @ http://aur.archlinux.org/packages.php?ID=25972
+
+* From source:
+
+$ git clone git://github.com/Dieterbe/uzbl.git
+[ $ git checkout master/experimental ] # master == fairly stable. experimental is more bleeding edge
+$ cd uzbl
+$ make
+$ sudo make install
+
+Dependencies:
+libwebkit 1.1.4 or higher
+gtk 2 something something
+pkgconfig (for Make/gcc)
+
+Optional:
+dmenu, zenity, bash for the sample scripts
+
+You will have the program in /usr/bin and various sample scripts, a sample config, sample bookmarks file and some documentation in /usr/share/uzbl. You
+will probably want to change the scripts to behave more like you want, so copy the scripts to your home dir. If you save your config as
+$XDG_CONFIG_HOME/uzbl/config (this expands to ~/.config/uzbl/config on most systems) it will be recognized automatically. You can also pass the path to
+the config file with the --config parameter.
diff --git a/TODO b/TODO
index 3dbcbc7..c6eeda3 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,9 @@
ASAP
-* do a clean implementation of bindings that need arguments (eg insert_bookmark needs the uri.)
-
* implement all the ideas from README
* get a logo
* improve site
* Support for binding keyboard shortcuts in config file.
+* when launching new instance, don't just try 'uzbl' and then './uzbl', rather launch a new uzbl in the same way the current uzbl instance was started. (same command, same arguments, except --uri)
* where to put proxy config? webkit support?
* implement XDG basedir spec (config is done, but not cache/data, which I presume we'll need at some point)
* check configured commands if they end on .sh so users don't need to prepend /bin/<shell>
@@ -14,6 +13,10 @@ ASAP
* add a keybind to hand the current url to an external scrips, so you can edit it and/or store it in the primary and secondary clipboards
* use http://library.gnome.org/devel/glib/stable/glib-Hash-Tables.html#g-hash-table-insert for tracking bindings and wherever we use structs and ugly loops
* fifo -> socket. so you can do question-response. socket is slightly more complicated so we'll need to create a uzblctrl
+* select/fork based instead of the pthread stuff -> drops dependency, more lightweight.
+* on website, see if we can <pre><?php include('..'); ?></pre> the documentation inside the uzbl project itself, so we need to maintain the stuff on only 1 place
+* see if we can use the github bugtracker (anonymous posting allowed?)
+* allow user to change bindings for navigation (up,down,left,right, page up, page down etc)
SOMEDAY:
check if we can make the settings loading less hard coded. eg( keep a list of all settings, and for each one, try to load it)
diff --git a/uzbl.c b/uzbl.c
index 9cb9001..d3a27e0 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -147,9 +147,11 @@ static gboolean
download_cb (WebKitWebView *web_view, GObject *download, gpointer user_data) {
(void) web_view;
(void) user_data;
- const gchar* uri = webkit_download_get_uri ((WebKitDownload*)download);
- printf("Download -> %s\n",uri);
- run_command(download_handler, uri);
+ if (download_handler) {
+ const gchar* uri = webkit_download_get_uri ((WebKitDownload*)download);
+ printf("Download -> %s\n",uri);
+ run_command(download_handler, uri);
+ }
return (FALSE);
}