# HG changeset patch # User Christophe Lincoln # Date 1303457030 -7200 # Node ID 0b5ed969f4f2c16f85918588a0f5bfc7dde827ec # Parent 79e6f575defb3052ca6d0c00fd532021796b6dce #define START for start page and make possible to request an uri without http:// (auto addes to string) diff -r 79e6f575defb -r 0b5ed969f4f2 src/main.c --- a/src/main.c Fri Apr 22 08:57:59 2011 +0200 +++ b/src/main.c Fri Apr 22 09:23:50 2011 +0200 @@ -11,7 +11,8 @@ #include #include -#define CONFIG g_strdup_printf ("%s/.config/tazweb", g_get_home_dir ()) +#define CONFIG g_strdup_printf ("%s/.config/tazweb", g_get_home_dir ()) +#define START "file:///usr/share/webhome/index.html" /* Loader color - #d66018 #7b705c */ static gchar *loader_color = "#351a0a"; @@ -36,6 +37,14 @@ return pixbuf; } +/* Can be: http://hg.slitaz.org or hg.slitaz.org */ +static void +check_requested_uri () +{ + uri = g_strrstr (uri, "://") ? g_strdup (uri) + : g_strdup_printf ("http://%s", uri); +} + /* Loader area */ static void draw_loader () @@ -137,6 +146,7 @@ { uri = gtk_entry_get_text (GTK_ENTRY (entry)); g_assert (uri); + check_requested_uri (); webkit_web_view_load_uri (web_view, uri); } @@ -211,7 +221,7 @@ { GtkWidget *item; - /* separator */ + /* Separator */ item = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); @@ -229,7 +239,7 @@ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); g_signal_connect (item, "activate", G_CALLBACK (zoom_out_cb), NULL); - /* separator */ + /* Separator */ item = gtk_separator_menu_item_new (); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); @@ -376,8 +386,10 @@ system ("cp -r /usr/share/tazweb $HOME/.config/tazweb"); /* Load the start page file or the url in argument */ - uri = (gchar*) (argc > 1 ? argv[1] : - "file:///usr/share/webhome/index.html"); + uri = (char*) (argc > 1 ? argv[1] : START); + if (argv[1]) + check_requested_uri (); + create_window (); webkit_web_view_load_uri (web_view, uri);