SliTaz Repositories

     1.1 --- a/COPYING	Tue Apr 19 13:35:52 2011 +0200
     1.2 +++ b/COPYING	Thu Apr 21 00:55:07 2011 +0200
     1.3 @@ -5,11 +5,12 @@
     1.4  Copyright (C)  2011  SliTaz GNU/Linux <devel@slitaz.org>
     1.5  
     1.6  
     1.7 -When TazWeb started, some code had been taken from GtkLauncher example browser
     1.8 -found in the GTKWebkit source tarball and is:
     1.9 +When TazWeb started, some code had been taken from the GTKWebkit source
    1.10 +tarball as well as code from the surf web browser and is:
    1.11  
    1.12  	Copyright (C) 2006, 2007 Apple Inc.
    1.13  	Copyright (C) 2007 Alp Toker <alp@atoker.com>
    1.14 +	Copyright (C) 2009 Enno Boland <g s01 de>
    1.15  
    1.16  BSD License
    1.17  -----------

     2.1 --- a/src/main.c	Tue Apr 19 13:35:52 2011 +0200
     2.2 +++ b/src/main.c	Thu Apr 21 00:55:07 2011 +0200
     2.3 @@ -93,25 +93,6 @@
     2.4      webkit_web_view_load_uri (web_view, uri);
     2.5  }
     2.6  
     2.7 -/* Navigation button function */
     2.8 -static void
     2.9 -go_back_cb (GtkWidget* widget, gpointer data)
    2.10 -{
    2.11 -    webkit_web_view_go_back (web_view);
    2.12 -}
    2.13 -
    2.14 -static void
    2.15 -go_forward_cb (GtkWidget* widget, gpointer data)
    2.16 -{
    2.17 -    webkit_web_view_go_forward (web_view);
    2.18 -}
    2.19 -
    2.20 -static void
    2.21 -refresh_cb (GtkWidget* widget, gpointer data)
    2.22 -{
    2.23 -    webkit_web_view_reload (web_view);
    2.24 -}
    2.25 -
    2.26  /* Fullscreen and unfullscreen function */
    2.27  static void
    2.28  fullscreen_cb (GtkWindow* window, gpointer data)
    2.29 @@ -186,30 +167,6 @@
    2.30      gtk_toolbar_set_orientation (GTK_TOOLBAR (toolbar), GTK_ORIENTATION_HORIZONTAL);
    2.31      gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH_HORIZ);
    2.32  
    2.33 -    /* The back button */
    2.34 -    item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_BACK);
    2.35 -    g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (go_back_cb), NULL);
    2.36 -    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
    2.37 -
    2.38 -    /* The forward button */
    2.39 -    item = gtk_tool_button_new_from_stock (GTK_STOCK_GO_FORWARD);
    2.40 -    g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (go_forward_cb), NULL);
    2.41 -    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
    2.42 -
    2.43 -    /* The Reload button */
    2.44 -    item = gtk_tool_button_new_from_stock (GTK_STOCK_REFRESH);
    2.45 -    g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (refresh_cb), NULL);
    2.46 -    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
    2.47 -
    2.48 -    /* The URL entry */
    2.49 -    item = gtk_tool_item_new ();
    2.50 -    gtk_tool_item_set_expand (item, TRUE);
    2.51 -    uri_entry = gtk_entry_new ();
    2.52 -    gtk_container_add (GTK_CONTAINER (item), uri_entry);
    2.53 -    g_signal_connect (G_OBJECT (uri_entry), "activate",
    2.54 -                      G_CALLBACK (activate_uri_entry_cb), NULL);
    2.55 -    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
    2.56 -
    2.57      /* The Home button */
    2.58      item = gtk_tool_button_new_from_stock (GTK_STOCK_HOME);
    2.59      g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (go_home_cb), NULL);
    2.60 @@ -219,6 +176,15 @@
    2.61      item = gtk_tool_button_new_from_stock (GTK_STOCK_PREFERENCES);
    2.62      g_signal_connect (G_OBJECT (item), "clicked", G_CALLBACK (my_page_cb), NULL);
    2.63      gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
    2.64 +    
    2.65 +    /* The URL entry */
    2.66 +    item = gtk_tool_item_new ();
    2.67 +    gtk_tool_item_set_expand (item, TRUE);
    2.68 +    uri_entry = gtk_entry_new ();
    2.69 +    gtk_container_add (GTK_CONTAINER (item), uri_entry);
    2.70 +    g_signal_connect (G_OBJECT (uri_entry), "activate",
    2.71 +                      G_CALLBACK (activate_uri_entry_cb), NULL);
    2.72 +    gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1);
    2.73  
    2.74      /* The TazWeb doc button */
    2.75      item = gtk_tool_button_new_from_stock (GTK_STOCK_INFO);