tazweb rev 86

#define SEARCH and small fix
author Christophe Lincoln <pankso@slitaz.org>
date Wed Apr 27 01:29:25 2011 +0200 (2011-04-27)
parents b996219a1a5a
children cd4cb6fdd65d
files src/main.c
line diff
     1.1 --- a/src/main.c	Wed Apr 27 00:14:00 2011 +0200
     1.2 +++ b/src/main.c	Wed Apr 27 01:29:25 2011 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4   * as a contextual menu, but no menu bar or tabs. Commented line code
     1.5   * starts with // and comments are between * *
     1.6   *
     1.7 - * Copyright(C) 2011 SliTaz GNU/Linux - BSD License
     1.8 + * Copyright (C) 2011 SliTaz GNU/Linux - BSD License
     1.9   * See AUTHORS and LICENSE for detailed information
    1.10   * 
    1.11   */
    1.12 @@ -14,6 +14,7 @@
    1.13  
    1.14  #define CONFIG   g_strdup_printf("%s/.config/tazweb", g_get_home_dir())
    1.15  #define START    "file:///usr/share/webhome/index.html"
    1.16 +#define SEARCH   "http://www.google.com/search?q=%s"
    1.17  
    1.18  /* Needs AppleWebKit/531.2+ to handle all sites ? */
    1.19  static gchar *useragent = "TazWeb (X11; SliTaz GNU/Linux; U; en_US)";
    1.20 @@ -21,7 +22,7 @@
    1.21  static GtkWidget* create_window(WebKitWebView** newwebview);
    1.22  static GtkWidget *mainwindow, *vbox, *browser, *toolbar;
    1.23  static WebKitWebView *webview;
    1.24 -static WebKitWebFrame* frame;
    1.25 +static WebKitWebFrame *frame;
    1.26  static gint count = 0;
    1.27  const gchar* uri;
    1.28  
    1.29 @@ -74,7 +75,7 @@
    1.30  	update_title(GTK_WINDOW(window), webview);
    1.31  }
    1.32  
    1.33 -/* Notify loader and url entry */
    1.34 +/* Notify url entry */
    1.35  static void
    1.36  notify_load_status_cb(WebKitWebView* webview, GParamSpec* pspec, GtkWidget* urientry)
    1.37  {
    1.38 @@ -122,8 +123,7 @@
    1.39  static void
    1.40  search_entry_cb(GtkWidget* search, WebKitWebView* webview)
    1.41  {
    1.42 -	uri = g_strdup_printf("http://www.google.com/search?q=%s",
    1.43 -			gtk_entry_get_text(GTK_ENTRY(search)));
    1.44 +	uri = g_strdup_printf(SEARCH, gtk_entry_get_text(GTK_ENTRY(search)));
    1.45  	g_assert(uri);
    1.46  	webkit_web_view_load_uri(webview, uri);
    1.47  }
    1.48 @@ -282,7 +282,7 @@
    1.49  
    1.50  	/* User agent */
    1.51  	settings = webkit_web_view_get_settings (webview);
    1.52 -	g_object_set (G_OBJECT (settings), "user-agent", useragent, NULL);
    1.53 +	g_object_set(G_OBJECT(settings), "user-agent", useragent, NULL);
    1.54  
    1.55  	/* Connect WebKit events */
    1.56  	g_signal_connect(webview, "notify::title",
    1.57 @@ -370,7 +370,7 @@
    1.58  static GtkWidget*
    1.59  create_window(WebKitWebView** newwebview)
    1.60  {
    1.61 -	GtkWidget* window;
    1.62 +	GtkWidget *window;
    1.63  	GtkWidget *urientry;
    1.64  	GtkWidget *search;
    1.65