tazweb rev 202

Small clean to tazweb.c and more update to NG
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 18 14:45:40 2017 +0100 (2017-03-18)
parents 8bc829832719
children d05a5c35a71e
files src/tazweb-ng.c src/tazweb.c
line diff
     1.1 --- a/src/tazweb-ng.c	Sat Mar 18 13:49:56 2017 +0100
     1.2 +++ b/src/tazweb-ng.c	Sat Mar 18 14:45:40 2017 +0100
     1.3 @@ -200,17 +200,25 @@
     1.4  	search_entry_cb(search_entry, ttb);
     1.5  }
     1.6  
     1.7 -/* Navigation button functions */
     1.8 +/*
     1.9 + *
    1.10 + * Navigation functions
    1.11 + *
    1.12 + */
    1.13 +
    1.14  static void
    1.15 -go_back_cb(GtkWidget *widget, struct tab *ttb)
    1.16 +bookmarks_edit_cb()
    1.17  {
    1.18 -	webkit_web_view_go_back(ttb->webview);
    1.19 +	system("/usr/lib/tazweb/helper.sh bookmarks_handler &");
    1.20  }
    1.21  
    1.22  static void
    1.23 -go_forward_cb(GtkWidget *widget, struct tab *ttb)
    1.24 +go_bookmarks_cb(GtkWidget* w, struct tab *ttb)
    1.25  {
    1.26 -	webkit_web_view_go_forward(ttb->webview);
    1.27 +	system("/usr/lib/tazweb/helper.sh html_bookmarks");
    1.28 +	uri = g_strdup_printf("file://%s/bookmarks.html", CONFIG);
    1.29 +	g_assert(uri);
    1.30 +	webkit_web_view_load_uri(ttb->webview, uri);
    1.31  }
    1.32  
    1.33  static void
    1.34 @@ -222,12 +230,15 @@
    1.35  }
    1.36  
    1.37  static void
    1.38 -go_bookmarks_cb(GtkWidget* w, struct tab *ttb)
    1.39 +go_back_cb(GtkWidget *widget, struct tab *ttb)
    1.40  {
    1.41 -	system("/usr/lib/tazweb/helper.sh html_bookmarks");
    1.42 -	uri = g_strdup_printf("file://%s/bookmarks.html", CONFIG);
    1.43 -	g_assert(uri);
    1.44 -	webkit_web_view_load_uri(ttb->webview, uri);
    1.45 +	webkit_web_view_go_back(ttb->webview);
    1.46 +}
    1.47 +
    1.48 +static void
    1.49 +go_forward_cb(GtkWidget *widget, struct tab *ttb)
    1.50 +{
    1.51 +	webkit_web_view_go_forward(ttb->webview);
    1.52  }
    1.53  
    1.54  /* Setup session cookies */
    1.55 @@ -255,7 +266,7 @@
    1.56  }
    1.57  
    1.58  static void
    1.59 -cookies_clean_cb(GtkWidget* widget, WebKitWebView* webview)
    1.60 +cookies_clean_cb()
    1.61  {
    1.62  	system("/usr/lib/tazweb/helper.sh clean_cookies");
    1.63  }
    1.64 @@ -270,14 +281,25 @@
    1.65  	item = gtk_separator_menu_item_new();
    1.66  	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.67  
    1.68 -	//if (! kiosk) {
    1.69 +	if (! kiosk) {
    1.70  		///* Add a bookmark */
    1.71  		//item = gtk_image_menu_item_new_with_label(_("Add a bookmark"));
    1.72  		//gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    1.73  		//gtk_image_new_from_stock(GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
    1.74  		//gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.75  		//g_signal_connect(item, "activate", G_CALLBACK(add_bookmark_cb), webview);
    1.76 -	//}
    1.77 +		
    1.78 +		/* Edit bookmarks */
    1.79 +		item = gtk_image_menu_item_new_with_label(_("Edit bookmarks"));
    1.80 +		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    1.81 +		gtk_image_new_from_stock(GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU));
    1.82 +		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.83 +		g_signal_connect(item, "activate", G_CALLBACK(bookmarks_edit_cb), NULL);
    1.84 +		
    1.85 +		/* Separator */
    1.86 +		item = gtk_separator_menu_item_new();
    1.87 +		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.88 +	}
    1.89  
    1.90  	///* Printing */
    1.91  	//item = gtk_image_menu_item_new_with_label(_("Print this page"));
    1.92 @@ -303,6 +325,25 @@
    1.93  	//gtk_image_new_from_stock(GTK_STOCK_HELP, GTK_ICON_SIZE_MENU));
    1.94  	//gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    1.95  	//g_signal_connect(item, "activate", G_CALLBACK(tazweb_doc_cb), webview);
    1.96 +	
    1.97 +	/* Cookies */
    1.98 +	if (! private) {
    1.99 +		//item = gtk_image_menu_item_new_with_label(_("View cookies"));
   1.100 +		//gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
   1.101 +		//gtk_image_new_from_stock(GTK_STOCK_HELP, GTK_ICON_SIZE_MENU));
   1.102 +		//gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   1.103 +		//g_signal_connect(item, "activate", G_CALLBACK(cookies_view_cb), webview);
   1.104 +
   1.105 +		item = gtk_image_menu_item_new_with_label(_("Clean all cookies"));
   1.106 +		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
   1.107 +		gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
   1.108 +		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   1.109 +		g_signal_connect(item, "activate", G_CALLBACK(cookies_clean_cb), NULL);
   1.110 +
   1.111 +		/* Separator */
   1.112 +		item = gtk_separator_menu_item_new();
   1.113 +		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
   1.114 +	}
   1.115  
   1.116  	/* Quit TazWeb */
   1.117  	item = gtk_image_menu_item_new_with_label(_("Quit TazWeb"));
     2.1 --- a/src/tazweb.c	Sat Mar 18 13:49:56 2017 +0100
     2.2 +++ b/src/tazweb.c	Sat Mar 18 14:45:40 2017 +0100
     2.3 @@ -172,7 +172,7 @@
     2.4   */
     2.5  
     2.6  static void
     2.7 -bookmarks_edit_cb(GtkWidget* widget, WebKitWebView* webview)
     2.8 +bookmarks_edit_cb()
     2.9  {
    2.10  	system("/usr/lib/tazweb/helper.sh bookmarks_handler &");
    2.11  }
    2.12 @@ -300,7 +300,7 @@
    2.13  }
    2.14  
    2.15  static void
    2.16 -cookies_clean_cb(GtkWidget* widget, WebKitWebView* webview)
    2.17 +cookies_clean_cb()
    2.18  {
    2.19  	system("/usr/lib/tazweb/helper.sh clean_cookies");
    2.20  }
    2.21 @@ -335,7 +335,7 @@
    2.22  		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    2.23  		gtk_image_new_from_stock(GTK_STOCK_EDIT, GTK_ICON_SIZE_MENU));
    2.24  		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    2.25 -		g_signal_connect(item, "activate", G_CALLBACK(bookmarks_edit_cb), webview);
    2.26 +		g_signal_connect(item, "activate", G_CALLBACK(bookmarks_edit_cb), NULL);
    2.27  
    2.28  		/* Separator */
    2.29  		item = gtk_separator_menu_item_new();
    2.30 @@ -372,7 +372,7 @@
    2.31  		gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
    2.32  		gtk_image_new_from_stock(GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
    2.33  		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
    2.34 -		g_signal_connect(item, "activate", G_CALLBACK(cookies_clean_cb), webview);
    2.35 +		g_signal_connect(item, "activate", G_CALLBACK(cookies_clean_cb), NULL);
    2.36  
    2.37  		/* Separator */
    2.38  		item = gtk_separator_menu_item_new();