PREFIX?=$(DESTDIR)/usr
test: uzbl
- ./uzbl --uri http://www.uzbl.org
+ ./uzbl --uri http://www.uzbl.org --verbose
test-config: uzbl
- ./uzbl --uri http://www.uzbl.org < examples/configs/sampleconfig-dev
+ ./uzbl --uri http://www.uzbl.org --config examples/configs/sampleconfig-dev --verbose
test-config-real: uzbl
- ./uzbl --uri http://www.uzbl.org < /usr/share/uzbl/examples/configs/sampleconfig
-
+ ./uzbl --uri http://www.uzbl.org --config /usr/share/uzbl/examples/configs/sampleconfig --verbose
+
clean:
rm -f uzbl
rm -f uzblctrl
cp -ax docs $(PREFIX)/share/uzbl/
cp -ax config.h $(PREFIX)/share/uzbl/docs/
cp -ax examples $(PREFIX)/share/uzbl/
+ cp -ax uzbl.png $(PREFIX)/share/uzbl/
install -D -m644 AUTHORS $(PREFIX)/share/uzbl/docs
install -D -m644 README $(PREFIX)/share/uzbl/docs
uzbl.behave.font_size, NULL);
}
}
-
+
static void
cmd_zoom_level() {
webkit_web_view_set_zoom_level (uzbl.gui.web_view, uzbl.behave.zoom_level);
static
GtkWidget* create_window () {
GtkWidget* window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gchar* uzbl_icon = find_xdg_file(1, "/uzbl/uzbl.png");
gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
gtk_widget_set_name (window, "Uzbl browser");
+ gtk_window_set_icon_from_file (GTK_WINDOW (window), uzbl_icon, NULL);
g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (destroy_cb), NULL);
g_signal_connect (G_OBJECT (window), "key-press-event", G_CALLBACK (key_press_cb), NULL);
+ g_free (uzbl_icon);
+
return window;
}
get_xdg_var (XDG_Var xdg) {
const gchar* actual_value = getenv (xdg.environmental);
const gchar* home = getenv ("HOME");
-
- gchar* return_value = str_replace ("~", home, actual_value);
+ gchar* return_value;
if (! actual_value || strcmp (actual_value, "") == 0) {
if (xdg.default_value) {
} else {
return_value = NULL;
}
+ } else {
+ return_value = str_replace("~", home, actual_value);
}
+
return return_value;
}
}
static gboolean
- inspector_dettach_window_cb (WebKitWebInspector* inspector){
+ inspector_detach_window_cb (WebKitWebInspector* inspector){
(void) inspector;
return FALSE;
}
g_signal_connect (G_OBJECT (g->inspector), "show-window", G_CALLBACK (inspector_show_window_cb), NULL);
g_signal_connect (G_OBJECT (g->inspector), "close-window", G_CALLBACK (inspector_close_window_cb), NULL);
g_signal_connect (G_OBJECT (g->inspector), "attach-window", G_CALLBACK (inspector_attach_window_cb), NULL);
- g_signal_connect (G_OBJECT (g->inspector), "dettach-window", G_CALLBACK (inspector_dettach_window_cb), NULL);
- g_signal_connect (G_OBJECT (g->inspector), "destroy", G_CALLBACK (inspector_inspector_destroyed_cb), NULL);
+ g_signal_connect (G_OBJECT (g->inspector), "detach-window", G_CALLBACK (inspector_detach_window_cb), NULL);
+ g_signal_connect (G_OBJECT (g->inspector), "finished", G_CALLBACK (inspector_inspector_destroyed_cb), NULL);
g_signal_connect (G_OBJECT (g->inspector), "notify::inspected-uri", G_CALLBACK (inspector_uri_changed_cb), NULL);
}