SliTaz Repositories

     1.1 --- a/src/main.c	Mon Apr 25 02:34:46 2011 +0200
     1.2 +++ b/src/main.c	Mon Apr 25 03:17:02 2011 +0200
     1.3 @@ -20,7 +20,7 @@
     1.4  
     1.5  static GtkWidget* create_window(WebKitWebView** newwebview);
     1.6  static GtkWidget *mainwindow, *vbox, *browser, *toolbar;
     1.7 -static WebKitWebView* webview;
     1.8 +static WebKitWebView *webview;
     1.9  static WebKitWebFrame* frame;
    1.10  static gint count = 0;
    1.11  const gchar* uri;
    1.12 @@ -96,7 +96,7 @@
    1.13  
    1.14  /* Show page source */
    1.15  static void
    1.16 -view_source_cb()
    1.17 +view_source_cb(GtkWidget* widget, WebKitWebView* webview)
    1.18  {
    1.19  	gboolean source;
    1.20  	
    1.21 @@ -110,7 +110,7 @@
    1.22  
    1.23  /* URL entry callback function */
    1.24  static void
    1.25 -uri_entry_cb(GtkWidget* urientry, gpointer data)
    1.26 +uri_entry_cb(GtkWidget* urientry, WebKitWebView* webview)
    1.27  {
    1.28  	uri = gtk_entry_get_text(GTK_ENTRY(urientry));
    1.29  	g_assert(uri);
    1.30 @@ -120,7 +120,7 @@
    1.31  
    1.32  /* Search entry callback function */
    1.33  static void
    1.34 -search_entry_cb(GtkWidget* search, gpointer data)
    1.35 +search_entry_cb(GtkWidget* search, WebKitWebView* webview)
    1.36  {
    1.37  	uri = g_strdup_printf("http://www.google.com/search?q=%s",
    1.38  			gtk_entry_get_text(GTK_ENTRY(search)));
    1.39 @@ -128,7 +128,7 @@
    1.40  	webkit_web_view_load_uri(webview, uri);
    1.41  }
    1.42  
    1.43 -/* Home button callback function */
    1.44 +/* Navigation button function */
    1.45  static void
    1.46  go_home_cb(GtkWidget* widget, WebKitWebView* webview)
    1.47  {
    1.48 @@ -137,7 +137,6 @@
    1.49  	webkit_web_view_load_uri(webview, uri);
    1.50  }
    1.51  
    1.52 -/* Navigation button function */
    1.53  static void
    1.54  go_back_cb(GtkWidget* widget, WebKitWebView* webview)
    1.55  {
    1.56 @@ -165,7 +164,7 @@
    1.57  
    1.58  /* TazWeb doc callback function */
    1.59  static void
    1.60 -tazweb_doc_cb(GtkWidget* widget, gpointer data)
    1.61 +tazweb_doc_cb(GtkWidget* widget, WebKitWebView *webview)
    1.62  {
    1.63  	uri = ("file:///usr/share/doc/tazweb/tazweb.html");
    1.64  	g_assert(uri);
    1.65 @@ -187,13 +186,13 @@
    1.66  
    1.67  /* Zoom out and in callback function */
    1.68  static void
    1.69 -zoom_out_cb(GtkWidget *window)
    1.70 +zoom_out_cb(GtkWidget *widget, WebKitWebView* webview)
    1.71  {
    1.72  	webkit_web_view_zoom_out(webview);
    1.73  }
    1.74  
    1.75  static void
    1.76 -zoom_in_cb(GtkWidget *window)
    1.77 +zoom_in_cb(GtkWidget *widget, WebKitWebView* webview)
    1.78  {
    1.79  	webkit_web_view_zoom_in(webview);
    1.80  }
    1.81 @@ -238,14 +237,14 @@
    1.82  	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    1.83  	gtk_image_new_from_stock(GTK_STOCK_ZOOM_IN, GTK_ICON_SIZE_MENU));
    1.84  	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.85 -	g_signal_connect(item, "activate", G_CALLBACK(zoom_in_cb), NULL);
    1.86 +	g_signal_connect(item, "activate", G_CALLBACK(zoom_in_cb), webview);
    1.87  	
    1.88  	/* Zoom out */
    1.89  	item = gtk_image_menu_item_new_with_label("Zoom out");
    1.90  	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    1.91  	gtk_image_new_from_stock(GTK_STOCK_ZOOM_OUT, GTK_ICON_SIZE_MENU));
    1.92  	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.93 -	g_signal_connect(item, "activate", G_CALLBACK(zoom_out_cb), NULL);
    1.94 +	g_signal_connect(item, "activate", G_CALLBACK(zoom_out_cb), webview);
    1.95  
    1.96  	/* Separator */
    1.97  	item = gtk_separator_menu_item_new();
    1.98 @@ -256,14 +255,14 @@
    1.99  	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
   1.100  	gtk_image_new_from_stock(GTK_STOCK_INFO, GTK_ICON_SIZE_MENU));
   1.101  	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   1.102 -	g_signal_connect(item, "activate", G_CALLBACK(tazweb_doc_cb), NULL);
   1.103 +	g_signal_connect(item, "activate", G_CALLBACK(tazweb_doc_cb), webview);
   1.104  
   1.105  	/* View source mode */
   1.106  	item = gtk_image_menu_item_new_with_label("View source mode");
   1.107  	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
   1.108  	gtk_image_new_from_stock(GTK_STOCK_PROPERTIES, GTK_ICON_SIZE_MENU));
   1.109  	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   1.110 -	g_signal_connect(item, "activate", G_CALLBACK(view_source_cb), NULL);
   1.111 +	g_signal_connect(item, "activate", G_CALLBACK(view_source_cb), webview);
   1.112  	
   1.113  	gtk_widget_show_all(GTK_WIDGET(menu));
   1.114  }
   1.115 @@ -343,7 +342,7 @@
   1.116  	gtk_widget_set_size_request(urientry, 0, 20);
   1.117  	gtk_container_add(GTK_CONTAINER(item), urientry);
   1.118  	g_signal_connect(G_OBJECT(urientry), "activate",
   1.119 -			G_CALLBACK(uri_entry_cb), NULL);
   1.120 +			G_CALLBACK(uri_entry_cb), webview);
   1.121  	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
   1.122  
   1.123  	/* Separator */
   1.124 @@ -355,7 +354,7 @@
   1.125  	gtk_widget_set_size_request(search, 150, 20);
   1.126  	gtk_container_add(GTK_CONTAINER(item), search);
   1.127  	g_signal_connect(G_OBJECT(search), "activate",
   1.128 -			G_CALLBACK(search_entry_cb), NULL);
   1.129 +			G_CALLBACK(search_entry_cb), webview);
   1.130  	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1);
   1.131  
   1.132  	/* The Fullscreen button */
   1.133 @@ -407,8 +406,6 @@
   1.134  int
   1.135  main(int argc, char* argv[])
   1.136  {
   1.137 -	WebKitWebView *webView;
   1.138 -	
   1.139  	gtk_init(NULL, NULL);
   1.140  	if (!g_thread_supported())
   1.141  		g_thread_init(NULL);