From 4ae8a979a0a430f29a2cf2bc5d51e115d8e1bd41 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Fri, 3 Jul 2009 20:40:48 +0200 Subject: merge much better uzbl_tabbed.py + fix for cookies.py --- AUTHORS | 7 ++++--- uzbl.c | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9d80ccc..d7269b8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -21,17 +21,18 @@ Contributors: Uli Schlachter (psychon) - basic mime_policy_cb & Makefile patch (uranther) - zoom level (bobpaul) - session script patches - Tom Adams (holizz) - few patches, cookies.py, gtkplugk/socket & uzbl_tabbed.py + Tom Adams (holizz) - few patches, cookies.py, gtkplug/socket & proof of concept uzbl_tabbed.py neutralinsomniac - load_progress = 0 fix - Maximilian Gaß (mxey) - small patches + Maximilian Gaß (mxey) - several small patches Abel Camarillo (00z) - make it compile on OpenBSD (israellevin) - toggle_zoom_type (kmeaw) - fix for multibyte utf8 characters segfault (evocallaghan) - tiny patches Aaron Griffin (phrakture) - Makefile patches to build on OSX - Mason Larobina - os.environ.keys() & os.path.join fix in cookies.py + Mason Larobina - os.environ.keys() & os.path.join fix in cookies.py, work on uzbl_tabbed.py (dequis) - Uzbl.run, birectional socket, javascript commands Brendan Taylor (bct) - various bugfixes + Chris van Dijk (quigybo) - work on uzbl_tabbed.py Originaly based on http://trac.webkit.org/browser/trunk/WebKitTools/GtkLauncher/main.c Which is copyrighted: diff --git a/uzbl.c b/uzbl.c index 69b1b9e..ed9c4be 100644 --- a/uzbl.c +++ b/uzbl.c @@ -2120,11 +2120,11 @@ update_title (void) { if (b->status_background) { GdkColor color; gdk_color_parse (b->status_background, &color); - //labels and hboxes do not draw their own background. applying this on the vbox is ok as the statusbar is the only affected widget. (if not, we could also use GtkEventBox) + //labels and hboxes do not draw their own background. applying this on the window/vbox is ok as the statusbar is the only affected widget. (if not, we could also use GtkEventBox) if (uzbl.gui.main_window) gtk_widget_modify_bg (uzbl.gui.main_window, GTK_STATE_NORMAL, &color); else if (uzbl.gui.plug) - gtk_widget_modify_bg (uzbl.gui.plug, GTK_STATE_NORMAL, &color); + gtk_widget_modify_bg ((GtkWidget * ) uzbl.gui.plug, GTK_STATE_NORMAL, &color); } } else { if (b->title_format_long) { -- cgit v1.2.3