# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1303855918 -7200
# Node ID c32ca77dcded33e9719306f15b56119e9267acf0
# Parent  694a52b21b0607696c3dadfe881eefe5ac583139
Place spaces between control statements and their parentheses (follow webkit coding style)

diff -r 694a52b21b06 -r c32ca77dcded README
--- a/README	Mon Apr 25 03:17:02 2011 +0200
+++ b/README	Wed Apr 27 00:11:58 2011 +0200
@@ -60,6 +60,9 @@
 
     * Append a string
       g_string_append(string, " - TazWeb");
+
+     * Editable webview
+       webkit_web_view_set_editable (webview, TRUE);
       
 
 ================================================================================
diff -r 694a52b21b06 -r c32ca77dcded src/main.c
--- a/src/main.c	Mon Apr 25 03:17:02 2011 +0200
+++ b/src/main.c	Wed Apr 27 00:11:58 2011 +0200
@@ -4,7 +4,7 @@
  * as a contextual menu, but no menu bar or tabs. Commented line code
  * starts with // and comments are between * *
  *
- * Copyright(C) 2011 SliTaz GNU/Linux - BSD License
+ * Copyright (C) 2011 SliTaz GNU/Linux - BSD License
  * See AUTHORS and LICENSE for detailed information
  * 
  */
@@ -12,13 +12,13 @@
 #include <gtk/gtk.h>
 #include <webkit/webkit.h>
 
-#define CONFIG   g_strdup_printf("%s/.config/tazweb", g_get_home_dir())
+#define CONFIG   g_strdup_printf ("%s/.config/tazweb", g_get_home_dir ())
 #define START    "file:///usr/share/webhome/index.html"
 
 /* Needs AppleWebKit/531.2+ to handle all sites ? */
-static gchar *useragent = "TazWeb (X11; SliTaz GNU/Linux; U; en_US)";
+static gchar *useragent = "TazWeb  (X11; SliTaz GNU/Linux; U; en_US)";
 
-static GtkWidget* create_window(WebKitWebView** newwebview);
+static GtkWidget* create_window (WebKitWebView** newwebview);
 static GtkWidget *mainwindow, *vbox, *browser, *toolbar;
 static WebKitWebView *webview;
 static WebKitWebFrame* frame;
@@ -27,375 +27,375 @@
 
 /* Create an icon */
 static GdkPixbuf*
-create_pixbuf(const gchar* image)
+create_pixbuf (const gchar* image)
 {
 	GdkPixbuf *pixbuf;
-	pixbuf = gdk_pixbuf_new_from_file(image, NULL);
+	pixbuf = gdk_pixbuf_new_from_file (image, NULL);
 	return pixbuf;
 }
 
 /* Can be: http://hg.slitaz.org or hg.slitaz.org */
 static void
-check_requested_uri()
+check_requested_uri ()
 {
-	uri = g_strrstr(uri, "://") ? g_strdup(uri)
-		: g_strdup_printf("http://%s", uri);
+	uri = g_strrstr (uri, "://") ? g_strdup (uri)
+		: g_strdup_printf ("http://%s", uri);
 }
 
 /* Update title */
 static void
-update_title(GtkWindow* window, WebKitWebView* webview)
+update_title (GtkWindow* window, WebKitWebView* webview)
 {
 	GString *string;
 	gdouble progress;
 	gchar *title;
 	
-	string = g_string_new(webkit_web_view_get_title(webview));
-	progress = webkit_web_view_get_progress(webview) * 100;
+	string = g_string_new (webkit_web_view_get_title (webview));
+	progress = webkit_web_view_get_progress (webview) * 100;
 	if (progress < 100)
-		g_string_append_printf(string, " [ %f%% ] ", progress);
+		g_string_append_printf (string, " [ %f%% ] ", progress);
 	
-	title = g_string_free(string, FALSE);
-	gtk_window_set_title(window, title);
-	g_free(title);
+	title = g_string_free (string, FALSE);
+	gtk_window_set_title (window, title);
+	g_free (title);
 }
 
 /* Get the page title */
 static void
-notify_title_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window)
+notify_title_cb (WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window)
 {
-	update_title(GTK_WINDOW(window), webview);
+	update_title (GTK_WINDOW (window), webview);
 }
 
 /* Request progress in window title */
 static void
-notify_progress_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window)
+notify_progress_cb (WebKitWebView* webview, GParamSpec* pspec, GtkWidget* window)
 {
-	update_title(GTK_WINDOW(window), webview);
+	update_title (GTK_WINDOW (window), webview);
 }
 
 /* Notify loader and url entry */
 static void
-notify_load_status_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* urientry)
+notify_load_status_cb (WebKitWebView* webview, GParamSpec* pspec, GtkWidget* urientry)
 {
-	if (webkit_web_view_get_load_status(webview) == WEBKIT_LOAD_COMMITTED) {
-		frame = webkit_web_view_get_main_frame(webview);
-		uri = webkit_web_frame_get_uri(frame);
+	if (webkit_web_view_get_load_status (webview) == WEBKIT_LOAD_COMMITTED) {
+		frame = webkit_web_view_get_main_frame (webview);
+		uri = webkit_web_frame_get_uri (frame);
 		if (uri)
-			gtk_entry_set_text(GTK_ENTRY(urientry), uri);
+			gtk_entry_set_text (GTK_ENTRY (urientry), uri);
 	}
 }
 
 /* Destroy the window */
 static void
-destroy_cb(GtkWidget* widget, GtkWindow* window)
+destroy_cb (GtkWidget* widget, GtkWindow* window)
 {
-	if (g_atomic_int_dec_and_test(&count))
-		gtk_main_quit();
+	if (g_atomic_int_dec_and_test (&count))
+		gtk_main_quit ();
 }
 
 /* Show page source */
 static void
-view_source_cb(GtkWidget* widget, WebKitWebView* webview)
+view_source_cb (GtkWidget* widget, WebKitWebView* webview)
 {
 	gboolean source;
 	
-	frame = webkit_web_view_get_main_frame(webview);
-	uri = webkit_web_frame_get_uri(frame);
-	source = webkit_web_view_get_view_source_mode(webview);
+	frame = webkit_web_view_get_main_frame (webview);
+	uri = webkit_web_frame_get_uri (frame);
+	source = webkit_web_view_get_view_source_mode (webview);
 	
-	webkit_web_view_set_view_source_mode(webview, !source);
-	webkit_web_view_reload(webview);
+	webkit_web_view_set_view_source_mode (webview, !source);
+	webkit_web_view_reload (webview);
 }
 
 /* URL entry callback function */
 static void
-uri_entry_cb(GtkWidget* urientry, WebKitWebView* webview)
+uri_entry_cb (GtkWidget* urientry, WebKitWebView* webview)
 {
-	uri = gtk_entry_get_text(GTK_ENTRY(urientry));
-	g_assert(uri);
-	check_requested_uri();
-	webkit_web_view_load_uri(webview, uri);
+	uri = gtk_entry_get_text (GTK_ENTRY (urientry));
+	g_assert (uri);
+	check_requested_uri ();
+	webkit_web_view_load_uri (webview, uri);
 }
 
 /* Search entry callback function */
 static void
-search_entry_cb(GtkWidget* search, WebKitWebView* webview)
+search_entry_cb (GtkWidget* search, WebKitWebView* webview)
 {
-	uri = g_strdup_printf("http://www.google.com/search?q=%s",
-			gtk_entry_get_text(GTK_ENTRY(search)));
-	g_assert(uri);
-	webkit_web_view_load_uri(webview, uri);
+	uri = g_strdup_printf ("http://www.google.com/search?q=%s",
+			gtk_entry_get_text (GTK_ENTRY (search)));
+	g_assert (uri);
+	webkit_web_view_load_uri (webview, uri);
 }
 
 /* Navigation button function */
 static void
-go_home_cb(GtkWidget* widget, WebKitWebView* webview)
+go_home_cb (GtkWidget* widget, WebKitWebView* webview)
 {
-	uri = g_strdup_printf("file://%s/home.html", CONFIG);
-	g_assert(uri);
-	webkit_web_view_load_uri(webview, uri);
+	uri = g_strdup_printf ("file://%s/home.html", CONFIG);
+	g_assert (uri);
+	webkit_web_view_load_uri (webview, uri);
 }
 
 static void
-go_back_cb(GtkWidget* widget, WebKitWebView* webview)
+go_back_cb (GtkWidget* widget, WebKitWebView* webview)
 {
-    webkit_web_view_go_back(webview);
+    webkit_web_view_go_back (webview);
 }
 
 static void
-go_forward_cb(GtkWidget* widget, WebKitWebView* webview)
+go_forward_cb (GtkWidget* widget, WebKitWebView* webview)
 {
-    webkit_web_view_go_forward(webview);
+    webkit_web_view_go_forward (webview);
 }
 
 /* Fullscreen and unfullscreen callback function */
 static void
-fullscreen_cb(GtkWindow* window, gpointer data)
+fullscreen_cb (GtkWindow* window, gpointer data)
 {
 	GdkWindowState state;
-	state = gdk_window_get_state(gtk_widget_get_window(GTK_WIDGET(mainwindow)));
+	state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (mainwindow)));
 
-	if(state & GDK_WINDOW_STATE_FULLSCREEN)
-		gtk_window_unfullscreen(GTK_WINDOW(mainwindow));
+	if (state & GDK_WINDOW_STATE_FULLSCREEN)
+		gtk_window_unfullscreen (GTK_WINDOW (mainwindow));
 	else
-		gtk_window_fullscreen(GTK_WINDOW(mainwindow));
+		gtk_window_fullscreen (GTK_WINDOW (mainwindow));
 }
 
 /* TazWeb doc callback function */
 static void
-tazweb_doc_cb(GtkWidget* widget, WebKitWebView *webview)
+tazweb_doc_cb (GtkWidget* widget, WebKitWebView *webview)
 {
-	uri = ("file:///usr/share/doc/tazweb/tazweb.html");
-	g_assert(uri);
-	webkit_web_view_load_uri(webview, uri);
+	uri =  ("file:///usr/share/doc/tazweb/tazweb.html");
+	g_assert (uri);
+	webkit_web_view_load_uri (webview, uri);
 }
 
 /* Download function */
 static gboolean
-download_requested_cb(WebKitWebView *webview, WebKitDownload *download,
+download_requested_cb (WebKitWebView *webview, WebKitDownload *download,
 		gpointer user_data)
 {
-	uri = webkit_download_get_uri(download);
+	uri = webkit_download_get_uri (download);
 	const gchar* buffer;
-	asprintf(&buffer,
+	asprintf (&buffer,
 			"xterm -T 'Download' -geom 72x10+0-24 -e \
 				'cd $HOME/Downloads && wget -c %s; sleep 2' &", uri);
-	system(buffer);
+	system (buffer);
 }
 
 /* Zoom out and in callback function */
 static void
-zoom_out_cb(GtkWidget *widget, WebKitWebView* webview)
+zoom_out_cb (GtkWidget *widget, WebKitWebView* webview)
 {
-	webkit_web_view_zoom_out(webview);
+	webkit_web_view_zoom_out (webview);
 }
 
 static void
-zoom_in_cb(GtkWidget *widget, WebKitWebView* webview)
+zoom_in_cb (GtkWidget *widget, WebKitWebView* webview)
 {
-	webkit_web_view_zoom_in(webview);
+	webkit_web_view_zoom_in (webview);
 }
 
 /* New webview clallbacks */
 static WebKitWebView*
-create_web_view_cb(WebKitWebView* webview, WebKitWebFrame* web_frame,
+create_web_view_cb (WebKitWebView* webview, WebKitWebFrame* web_frame,
 		GtkWidget* window)
 {
 	WebKitWebView *newview;
-	create_window(&newview);
+	create_window (&newview);
 	return newview;
 }
 
 static gboolean
-webview_ready_cb(WebKitWebView* webview, GtkWidget* window)
+webview_ready_cb (WebKitWebView* webview, GtkWidget* window)
 {
-	gtk_widget_grab_focus(GTK_WIDGET(webview));
-	gtk_widget_show_all(window);
+	gtk_widget_grab_focus (GTK_WIDGET (webview));
+	gtk_widget_show_all (window);
 	return FALSE;
 }
 
 static gboolean
-close_webview_cb(WebKitWebView* webview, GtkWidget* window)
+close_webview_cb (WebKitWebView* webview, GtkWidget* window)
 {
-	gtk_widget_destroy(window);
+	gtk_widget_destroy (window);
 	return TRUE;
 }
 
 /* Add items to WebKit contextual menu */
 static void
-populate_menu_cb(WebKitWebView *webview, GtkMenu *menu, gpointer data)
+populate_menu_cb (WebKitWebView *webview, GtkMenu *menu, gpointer data)
 {
 	GtkWidget* item;
 	
 	/* Separator */
-	item = gtk_separator_menu_item_new();
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	item = gtk_separator_menu_item_new ();
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
 	/* Zoom in */
-	item = gtk_image_menu_item_new_with_label("Zoom in");
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
-	gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	g_signal_connect(item, "activate", G_CALLBACK(zoom_in_cb), webview);
+	item = gtk_image_menu_item_new_with_label ("Zoom in");
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+	gtk_image_new_from_stock (GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	g_signal_connect (item, "activate", G_CALLBACK (zoom_in_cb), webview);
 	
 	/* Zoom out */
-	item = gtk_image_menu_item_new_with_label("Zoom out");
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
-	gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	g_signal_connect(item, "activate", G_CALLBACK(zoom_out_cb), webview);
+	item = gtk_image_menu_item_new_with_label ("Zoom out");
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+	gtk_image_new_from_stock (GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	g_signal_connect (item, "activate", G_CALLBACK (zoom_out_cb), webview);
 
 	/* Separator */
-	item = gtk_separator_menu_item_new();
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+	item = gtk_separator_menu_item_new ();
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
 
 	/* TazWeb documentation */
-	item = gtk_image_menu_item_new_with_label("TazWeb manual");
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
-	gtk_image_new_from_stock(GTK_STOCK_INFO, GTK_ICON_SIZE_MENU));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	g_signal_connect(item, "activate", G_CALLBACK(tazweb_doc_cb), webview);
+	item = gtk_image_menu_item_new_with_label ("TazWeb manual");
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+	gtk_image_new_from_stock (GTK_STOCK_INFO, GTK_ICON_SIZE_MENU));
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	g_signal_connect (item, "activate", G_CALLBACK (tazweb_doc_cb), webview);
 
 	/* View source mode */
-	item = gtk_image_menu_item_new_with_label("View source mode");
-	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
-	gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU));
-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-	g_signal_connect(item, "activate", G_CALLBACK(view_source_cb), webview);
+	item = gtk_image_menu_item_new_with_label ("View source mode");
+	gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item),
+	gtk_image_new_from_stock (GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU));
+	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+	g_signal_connect (item, "activate", G_CALLBACK (view_source_cb), webview);
 	
-	gtk_widget_show_all(GTK_WIDGET(menu));
+	gtk_widget_show_all (GTK_WIDGET (menu));
 }
 
 /* Scrolled window for the webview */
 static GtkWidget*
-create_browser(GtkWidget* window, GtkWidget* urientry, GtkWidget* search,
+create_browser (GtkWidget* window, GtkWidget* urientry, GtkWidget* search,
 		WebKitWebView* webview)
 {
 	WebKitWebSettings *settings;
 	
-	browser = gtk_scrolled_window_new(NULL, NULL);
-	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(browser),
+	browser = gtk_scrolled_window_new (NULL, NULL);
+	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (browser),
 			GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-	gtk_container_add(GTK_CONTAINER(browser), GTK_WIDGET(webview));
+	gtk_container_add (GTK_CONTAINER (browser), GTK_WIDGET (webview));
 
 	/* User agent */
-	settings = webkit_web_view_get_settings (webview);
-	g_object_set (G_OBJECT (settings), "user-agent", useragent, NULL);
+	settings = webkit_web_view_get_settings  (webview);
+	g_object_set  (G_OBJECT  (settings), "user-agent", useragent, NULL);
 
 	/* Connect WebKit events */
-	g_signal_connect(webview, "notify::title",
-			G_CALLBACK(notify_title_cb), window);
-	g_signal_connect(webview, "notify::progress",
-			G_CALLBACK(notify_progress_cb), window);
-	g_signal_connect(webview, "notify::load-status",
-			G_CALLBACK(notify_load_status_cb), urientry);
-	g_signal_connect(webview, "download-requested",
-			G_CALLBACK(download_requested_cb), NULL);
-	g_signal_connect(webview, "create-web-view",
-			G_CALLBACK(create_web_view_cb), window);
-	g_signal_connect(webview, "web-view-ready",
-			G_CALLBACK(webview_ready_cb), window);
-	g_signal_connect(webview, "close-web-view",
-			G_CALLBACK(close_webview_cb), window);
+	g_signal_connect (webview, "notify::title",
+			G_CALLBACK (notify_title_cb), window);
+	g_signal_connect (webview, "notify::progress",
+			G_CALLBACK (notify_progress_cb), window);
+	g_signal_connect (webview, "notify::load-status",
+			G_CALLBACK (notify_load_status_cb), urientry);
+	g_signal_connect (webview, "download-requested",
+			G_CALLBACK (download_requested_cb), NULL);
+	g_signal_connect (webview, "create-web-view",
+			G_CALLBACK (create_web_view_cb), window);
+	g_signal_connect (webview, "web-view-ready",
+			G_CALLBACK (webview_ready_cb), window);
+	g_signal_connect (webview, "close-web-view",
+			G_CALLBACK (close_webview_cb), window);
 
 	/* Connect WebKit contextual menu items */
-	g_object_connect(G_OBJECT(webview), "signal::populate-popup",
-		G_CALLBACK(populate_menu_cb), webview, NULL);
+	g_object_connect (G_OBJECT (webview), "signal::populate-popup",
+		G_CALLBACK (populate_menu_cb), webview, NULL);
 
 	return browser;
 }
 
 static GtkWidget*
-create_toolbar(GtkWidget* urientry, GtkWidget* search, WebKitWebView* webview)
+create_toolbar (GtkWidget* urientry, GtkWidget* search, WebKitWebView* webview)
 {
 	GtkToolItem* item;
 	
-	toolbar = gtk_toolbar_new();
-	gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar),
+	toolbar = gtk_toolbar_new ();
+	gtk_toolbar_set_orientation (GTK_TOOLBAR (toolbar),
 			GTK_ORIENTATION_HORIZONTAL);
-	gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),
+	gtk_toolbar_set_style (GTK_TOOLBAR (toolbar),
 			GTK_TOOLBAR_BOTH_HORIZ);
 
 	/* The back button */
-    item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK);
-    g_signal_connect(G_OBJECT(item), "clicked",
-			G_CALLBACK(go_back_cb), webview);
-    gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+    item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
+    g_signal_connect (G_OBJECT (item), "clicked",
+			G_CALLBACK (go_back_cb), webview);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
     /* The forward button */
-    item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_FORWARD);
-    g_signal_connect(G_OBJECT(item), "clicked",
-			G_CALLBACK(go_forward_cb), webview);
-    gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+    item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+    g_signal_connect (G_OBJECT (item), "clicked",
+			G_CALLBACK (go_forward_cb), webview);
+    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
     /* Home button */
-	item = gtk_tool_button_new_from_stock(GTK_STOCK_HOME);
-	g_signal_connect(G_OBJECT(item), "clicked",
-			G_CALLBACK(go_home_cb), webview);
-	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+	item = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
+	g_signal_connect (G_OBJECT (item), "clicked",
+			G_CALLBACK (go_home_cb), webview);
+	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
 	/* URL entry */
-	item = gtk_tool_item_new();
-	gtk_tool_item_set_expand(item, TRUE);
-	gtk_widget_set_size_request(urientry, 0, 20);
-	gtk_container_add(GTK_CONTAINER(item), urientry);
-	g_signal_connect(G_OBJECT(urientry), "activate",
-			G_CALLBACK(uri_entry_cb), webview);
-	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+	item = gtk_tool_item_new ();
+	gtk_tool_item_set_expand (item, TRUE);
+	gtk_widget_set_size_request (urientry, 0, 20);
+	gtk_container_add (GTK_CONTAINER (item), urientry);
+	g_signal_connect (G_OBJECT (urientry), "activate",
+			G_CALLBACK (uri_entry_cb), webview);
+	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
 	/* Separator */
-	item = gtk_separator_tool_item_new();
-	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); 
+	item = gtk_separator_tool_item_new ();
+	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); 
 	
 	/* Search entry */
-	item = gtk_tool_item_new();
-	gtk_widget_set_size_request(search, 150, 20);
-	gtk_container_add(GTK_CONTAINER(item), search);
-	g_signal_connect(G_OBJECT(search), "activate",
-			G_CALLBACK(search_entry_cb), webview);
-	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+	item = gtk_tool_item_new ();
+	gtk_widget_set_size_request (search, 150, 20);
+	gtk_container_add (GTK_CONTAINER (item), search);
+	g_signal_connect (G_OBJECT (search), "activate",
+			G_CALLBACK (search_entry_cb), webview);
+	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
 	/* The Fullscreen button */
-	item = gtk_tool_button_new_from_stock(GTK_STOCK_FULLSCREEN);
-	g_signal_connect(G_OBJECT(item), "clicked",
-			G_CALLBACK(fullscreen_cb), NULL);
-	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
+	item = gtk_tool_button_new_from_stock (GTK_STOCK_FULLSCREEN);
+	g_signal_connect (G_OBJECT (item), "clicked",
+			G_CALLBACK (fullscreen_cb), NULL);
+	gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
 
 	return toolbar;
 }
 
 /* Main window */
 static GtkWidget*
-create_window(WebKitWebView** newwebview)
+create_window (WebKitWebView** newwebview)
 {
 	GtkWidget* window;
 	GtkWidget *urientry;
 	GtkWidget *search;
 	
-	g_atomic_int_inc(&count);
+	g_atomic_int_inc (&count);
 
 	/* Default TazWeb window */
-	window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	gtk_window_set_default_size(GTK_WINDOW(window), 800, 600);
-	gtk_window_set_icon(GTK_WINDOW(window),
-			create_pixbuf("/usr/share/pixmaps/tazweb.png"));
-	gtk_widget_set_name(window, "TazWeb");
-	g_signal_connect(window, "destroy", G_CALLBACK(destroy_cb), NULL);
+	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+	gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
+	gtk_window_set_icon (GTK_WINDOW (window),
+			create_pixbuf ("/usr/share/pixmaps/tazweb.png"));
+	gtk_widget_set_name (window, "TazWeb");
+	g_signal_connect (window, "destroy", G_CALLBACK (destroy_cb), NULL);
 
 	/* Webview and widgets */
-	webview = WEBKIT_WEB_VIEW(webkit_web_view_new());
-	urientry = gtk_entry_new();
-	search = gtk_entry_new();
-	vbox = gtk_vbox_new(FALSE, 0);
+	webview = WEBKIT_WEB_VIEW (webkit_web_view_new ());
+	urientry = gtk_entry_new ();
+	search = gtk_entry_new ();
+	vbox = gtk_vbox_new (FALSE, 0);
 	
 	/* Pack box and container */
-	gtk_box_pack_start(GTK_BOX(vbox),
-			create_browser(window, urientry, search, webview), TRUE, TRUE, 0);
-	gtk_box_pack_start(GTK_BOX(vbox),
-			create_toolbar(urientry, search, webview), FALSE, FALSE, 0);
-	gtk_container_add(GTK_CONTAINER(window), vbox);
+	gtk_box_pack_start (GTK_BOX (vbox),
+			create_browser (window, urientry, search, webview), TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox),
+			create_toolbar (urientry, search, webview), FALSE, FALSE, 0);
+	gtk_container_add (GTK_CONTAINER (window), vbox);
 	
 	if (newwebview)
 		*newwebview = webview;
@@ -404,27 +404,27 @@
 }
 
 int
-main(int argc, char* argv[])
+main (int argc, char* argv[])
 {
-	gtk_init(NULL, NULL);
-	if (!g_thread_supported())
-		g_thread_init(NULL);
+	gtk_init (NULL, NULL);
+	if (!g_thread_supported ())
+		g_thread_init (NULL);
 
 	/* Get a default home.html if missing */
-	if (! g_file_test(CONFIG, G_FILE_TEST_EXISTS))
-		system("cp -r /usr/share/tazweb $HOME/.config/tazweb");
+	if (! g_file_test (CONFIG, G_FILE_TEST_EXISTS))
+		system ("cp -r /usr/share/tazweb $HOME/.config/tazweb");
 
 	/* Load the start page file or the url in argument */
-	uri =(char*)(argc > 1 ? argv[1] : START);
+	uri = (char*) (argc > 1 ? argv[1] : START);
 	if (argv[1])
-		check_requested_uri();
+		check_requested_uri ();
 		
-	mainwindow = create_window(&webview);
+	mainwindow = create_window (&webview);
 	
-	gtk_widget_show_all(mainwindow);
-	webkit_web_view_load_uri(webview, uri);
-	gtk_widget_grab_focus(GTK_WIDGET(webview));
-	gtk_main();
+	gtk_widget_show_all (mainwindow);
+	webkit_web_view_load_uri (webview, uri);
+	gtk_widget_grab_focus (GTK_WIDGET (webview));
+	gtk_main ();
 	
 	return 0;
 }