diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebKitTools/GtkLauncher | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebKitTools/GtkLauncher')
| -rw-r--r-- | WebKitTools/GtkLauncher/main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/WebKitTools/GtkLauncher/main.c b/WebKitTools/GtkLauncher/main.c index e6d69a9..17ed40f 100644 --- a/WebKitTools/GtkLauncher/main.c +++ b/WebKitTools/GtkLauncher/main.c @@ -25,7 +25,6 @@ */ #include <gtk/gtk.h> -#include <stdlib.h> #include <webkit/webkit.h> static GtkWidget* main_window; @@ -192,12 +191,9 @@ static gchar* filenameToURL(const char* filename) if (!g_file_test(filename, G_FILE_TEST_EXISTS)) return 0; - gchar *fullPath = realpath(filename, 0); - if (!fullPath) - return 0; - - gchar *fileURL = g_filename_to_uri(fullPath, 0, 0); - free(fullPath); + GFile *gfile = g_file_new_for_path(filename); + gchar *fileURL = g_file_get_uri(gfile); + g_object_unref(gfile); return fileURL; } |