SliTaz Repositories

     1.1 --- a/src/main.c	Fri Apr 22 08:57:59 2011 +0200
     1.2 +++ b/src/main.c	Fri Apr 22 09:23:50 2011 +0200
     1.3 @@ -11,7 +11,8 @@
     1.4  #include <gtk/gtk.h>
     1.5  #include <webkit/webkit.h>
     1.6  
     1.7 -#define CONFIG g_strdup_printf ("%s/.config/tazweb", g_get_home_dir ())
     1.8 +#define CONFIG		g_strdup_printf ("%s/.config/tazweb", g_get_home_dir ())
     1.9 +#define START		"file:///usr/share/webhome/index.html"
    1.10  
    1.11  /* Loader color - #d66018 #7b705c */
    1.12  static gchar *loader_color = "#351a0a";
    1.13 @@ -36,6 +37,14 @@
    1.14  	return pixbuf;
    1.15  }
    1.16  
    1.17 +/* Can be: http://hg.slitaz.org or hg.slitaz.org */
    1.18 +static void
    1.19 +check_requested_uri ()
    1.20 +{
    1.21 +	uri = g_strrstr (uri, "://") ? g_strdup (uri)
    1.22 +		: g_strdup_printf ("http://%s", uri);
    1.23 +}
    1.24 +
    1.25  /* Loader area */
    1.26  static void
    1.27  draw_loader ()
    1.28 @@ -137,6 +146,7 @@
    1.29  {
    1.30  	uri = gtk_entry_get_text (GTK_ENTRY (entry));
    1.31  	g_assert (uri);
    1.32 +	check_requested_uri ();
    1.33  	webkit_web_view_load_uri (web_view, uri);
    1.34  }
    1.35  
    1.36 @@ -211,7 +221,7 @@
    1.37  {
    1.38  	GtkWidget *item;
    1.39  	
    1.40 -	/* separator */
    1.41 +	/* Separator */
    1.42  	item = gtk_separator_menu_item_new ();
    1.43  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
    1.44  
    1.45 @@ -229,7 +239,7 @@
    1.46  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
    1.47  	g_signal_connect (item, "activate", G_CALLBACK (zoom_out_cb), NULL);
    1.48  
    1.49 -	/* separator */
    1.50 +	/* Separator */
    1.51  	item = gtk_separator_menu_item_new ();
    1.52  	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
    1.53  
    1.54 @@ -376,8 +386,10 @@
    1.55  		system ("cp -r /usr/share/tazweb $HOME/.config/tazweb");
    1.56  
    1.57  	/* Load the start page file or the url in argument */
    1.58 -	uri = (gchar*) (argc > 1 ? argv[1] :
    1.59 -			"file:///usr/share/webhome/index.html");
    1.60 +	uri = (char*) (argc > 1 ? argv[1] : START);
    1.61 +	if (argv[1])
    1.62 +		check_requested_uri ();
    1.63 +	
    1.64  	
    1.65  	create_window ();
    1.66  	webkit_web_view_load_uri (web_view, uri);