[bijiben] Fix path of user custom folder

[Pierre-Yves Luyten <pyluyten src gnome org>]

commit 6d68467e3c366c6533c5eba07712081a9d4b79dc
Author: Chunyang Xu <xuchunyang56 gmail com>
Date:   Sat Aug 16 01:47:48 2014 +0200

    Fix path of user custom folder
    
    Use g_filename_to_uri
    Fixes 734817

 src/bjb-app-menu.c                          |    4 +++-
 src/bjb-bijiben.c                           |   12 ++++++++----
 src/bjb-import-dialog.c                     |    2 +-
 src/libbiji/provider/biji-import-provider.c |    2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/src/bjb-app-menu.c b/src/bjb-app-menu.c
index 9c40701..a088b37 100644
--- a/src/bjb-app-menu.c
+++ b/src/bjb-app-menu.c
@@ -74,7 +74,9 @@ external_activated (GSimpleAction *action,
     locations = bjb_import_dialog_get_paths (BJB_IMPORT_DIALOG (dialog));
     for (l=locations; l!= NULL; l=l->next)
     {
-      bijiben_import_notes (user_data, l->data);
+      gchar *uri = g_filename_to_uri (l->data, NULL, NULL);
+      bijiben_import_notes (user_data, uri);
+      g_free (uri);
     }
 
     g_list_free (locations);
diff --git a/src/bjb-bijiben.c b/src/bjb-bijiben.c
index 8e86541..e157fa7 100644
--- a/src/bjb-bijiben.c
+++ b/src/bjb-bijiben.c
@@ -1,5 +1,5 @@
 /*
- * bijiben.c
+ * bjb-bijiben.c
  * Copyright (C) Pierre-Yves LUYTEN 2011 <py luyten fr>
  * 
  * bijiben is free software: you can redistribute it and/or modify it
@@ -357,7 +357,7 @@ bijiben_startup (GApplication *application)
   gchar          *storage_path, *default_color;
   GFile          *storage;
   GError         *error;
-  gchar          *path;
+  gchar          *path, *uri;
   GdkRGBA         color = {0,0,0,0};
 
 
@@ -414,12 +414,16 @@ bijiben_startup (GApplication *application)
   if (self->priv->first_run == TRUE)
   {
     path = g_build_filename (g_get_user_data_dir (), "tomboy", NULL);
-    bijiben_import_notes (self, path);
+    uri = g_filename_to_uri (path, NULL, NULL);
+    bijiben_import_notes (self, uri);
     g_free (path);
+    g_free (uri);
 
     path = g_build_filename (g_get_user_data_dir (), "gnote", NULL);
-    bijiben_import_notes (self, path);
+    uri = g_filename_to_uri (path, NULL, NULL);
+    bijiben_import_notes (self, uri);
     g_free (path);
+    g_free (uri);
   }
 
   /* Create the first window */
diff --git a/src/bjb-import-dialog.c b/src/bjb-import-dialog.c
index f00099e..4b89780 100644
--- a/src/bjb-import-dialog.c
+++ b/src/bjb-import-dialog.c
@@ -264,7 +264,7 @@ on_file_set_cb (GtkWidget *chooser,
   /* Handle the new : force toggle */
 
   location = dialog->priv->custom->location =
-    gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (chooser));
+    gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
 
   if (location)
   {
diff --git a/src/libbiji/provider/biji-import-provider.c b/src/libbiji/provider/biji-import-provider.c
index ff201eb..90b16a7 100644
--- a/src/libbiji/provider/biji-import-provider.c
+++ b/src/libbiji/provider/biji-import-provider.c
@@ -240,7 +240,7 @@ biji_import_provider_constructed (GObject *object)
   priv->info.user = NULL;
 
   
-  to_import = g_file_new_for_path (self->priv->uri);
+  to_import = g_file_new_for_uri (self->priv->uri);
 
   g_file_enumerate_children_async (to_import, ATTRIBUTES_FOR_NOTEBOOK,
                                    G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT,