[gimp] app, plug-ins: remove file-uri completely

[Michael Natterer <mitch src gnome org>]

commit 57e6b22b9d26b73cfaf0323c80bd2fa74ff76db2
Author: Michael Natterer <mitch gimp org>
Date:   Tue Jul 22 00:08:59 2014 +0200

    app, plug-ins: remove file-uri completely
    
    and enable the new file-remote code in app unconditionally.

 app/file/file-open.c                 |    2 +-
 app/file/file-procedure.c            |    7 +-
 app/file/file-save.c                 |    2 +-
 app/widgets/gimpfiledialog.c         |   11 +-
 configure.ac                         |    1 -
 plug-ins/Makefile.am                 |    1 -
 plug-ins/file-uri/.gitignore         |    7 -
 plug-ins/file-uri/Makefile.am        |   48 ----
 plug-ins/file-uri/uri-backend-gvfs.c |  313 --------------------------
 plug-ins/file-uri/uri-backend.h      |   46 ----
 plug-ins/file-uri/uri.c              |  400 ----------------------------------
 po-plug-ins/POTFILES.in              |    2 -
 12 files changed, 5 insertions(+), 835 deletions(-)
---
diff --git a/app/file/file-open.c b/app/file/file-open.c
index ec0376f..ce6778a 100644
--- a/app/file/file-open.c
+++ b/app/file/file-open.c
@@ -148,7 +148,7 @@ file_open_image (Gimp                *gimp,
     {
       path = g_file_get_path (file);
 
-      if (! path && g_getenv ("GIMP_HANDLE_REMOTE_FILES"))
+      if (! path)
         {
           GError *my_error = NULL;
 
diff --git a/app/file/file-procedure.c b/app/file/file-procedure.c
index 850dcbb..f390fe3 100644
--- a/app/file/file-procedure.c
+++ b/app/file/file-procedure.c
@@ -254,7 +254,6 @@ file_procedure_in_group (GimpPlugInProcedure *file_proc,
   const gchar *name        = gimp_object_get_name (file_proc);
   gboolean     is_xcf_save = FALSE;
   gboolean     is_filter   = FALSE;
-  gboolean     is_uri      = FALSE;
 
   is_xcf_save = (strcmp (name, "gimp-xcf-save") == 0);
 
@@ -262,17 +261,15 @@ file_procedure_in_group (GimpPlugInProcedure *file_proc,
                  strcmp (name, "file-bz2-save") == 0 ||
                  strcmp (name, "file-xz-save")  == 0);
 
-  is_uri      = (strcmp (name, "file-uri-save") == 0);
-
   switch (group)
     {
     case FILE_PROCEDURE_GROUP_SAVE:
       /* Only .xcf shall pass */
-      return is_xcf_save || is_filter || is_uri;
+      return is_xcf_save || is_filter;
 
     case FILE_PROCEDURE_GROUP_EXPORT:
       /* Anything but .xcf shall pass */
-      return ! is_xcf_save || is_uri;
+      return ! is_xcf_save;
 
     case FILE_PROCEDURE_GROUP_OPEN:
       /* No filter applied for Open */
diff --git a/app/file/file-save.c b/app/file/file-save.c
index a710c3c..32d34b2 100644
--- a/app/file/file-save.c
+++ b/app/file/file-save.c
@@ -129,7 +129,7 @@ file_save (Gimp                *gimp,
     {
       path = g_file_get_path (file);
 
-      if (! path && g_getenv ("GIMP_HANDLE_REMOTE_FILES"))
+      if (! path)
         {
           GError *my_error = NULL;
 
diff --git a/app/widgets/gimpfiledialog.c b/app/widgets/gimpfiledialog.c
index c3fe93d..8d2cae6 100644
--- a/app/widgets/gimpfiledialog.c
+++ b/app/widgets/gimpfiledialog.c
@@ -310,7 +310,6 @@ gimp_file_dialog_new (Gimp                  *gimp,
   GSList               *file_procs_all_images = NULL;
   const gchar          *automatic             = NULL;
   const gchar          *automatic_help_id     = NULL;
-  gboolean              local_only            = FALSE;
   GtkFileChooserAction  gtk_action            = 0;
 
   g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
@@ -327,10 +326,6 @@ gimp_file_dialog_new (Gimp                  *gimp,
       file_procs_all_images = NULL;
       automatic             = _("Automatically Detected");
       automatic_help_id     = GIMP_HELP_FILE_OPEN_BY_EXTENSION;
-
-      local_only = (gimp_pdb_lookup_procedure (gimp->pdb,
-                                               "file-uri-load") == NULL &&
-                    ! g_getenv ("GIMP_HANDLE_REMOTE_FILES"));
       break;
 
     case GIMP_FILE_CHOOSER_ACTION_SAVE:
@@ -344,10 +339,6 @@ gimp_file_dialog_new (Gimp                  *gimp,
                                gimp->plug_in_manager->save_procs);
       automatic             = _("By Extension");
       automatic_help_id     = GIMP_HELP_FILE_SAVE_BY_EXTENSION;
-
-      local_only = (gimp_pdb_lookup_procedure (gimp->pdb,
-                                               "file-uri-save") == NULL &&
-                    ! g_getenv ("GIMP_HANDLE_REMOTE_FILES"));
       break;
 
     default:
@@ -359,7 +350,7 @@ gimp_file_dialog_new (Gimp                  *gimp,
                          "title",                     title,
                          "role",                      role,
                          "action",                    gtk_action,
-                         "local-only",                local_only,
+                         "local-only",                FALSE,
                          "do-overwrite-confirmation", TRUE,
                          NULL);
 
diff --git a/configure.ac b/configure.ac
index 6f7f1b0..db7af4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2201,7 +2201,6 @@ plug-ins/file-ico/Makefile
 plug-ins/file-jpeg/Makefile
 plug-ins/file-psd/Makefile
 plug-ins/file-sgi/Makefile
-plug-ins/file-uri/Makefile
 plug-ins/flame/Makefile
 plug-ins/fractal-explorer/Makefile
 plug-ins/fractal-explorer/examples/Makefile
diff --git a/plug-ins/Makefile.am b/plug-ins/Makefile.am
index abd265c..b483e09 100644
--- a/plug-ins/Makefile.am
+++ b/plug-ins/Makefile.am
@@ -42,7 +42,6 @@ SUBDIRS = \
        file-jpeg               \
        file-psd                \
        file-sgi                \
-       file-uri                \
        flame                   \
        fractal-explorer        \
        gfig                    \
diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in
index 5789dbe..3e2712b 100644
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@ -139,8 +139,6 @@ plug-ins/file-psd/psd-thumb-load.c
 plug-ins/file-psd/psd-util.c
 plug-ins/file-psd/psd.c
 plug-ins/file-sgi/sgi.c
-plug-ins/file-uri/uri-backend-gvfs.c
-plug-ins/file-uri/uri.c
 plug-ins/flame/flame.c
 plug-ins/fractal-explorer/fractal-explorer-dialogs.c
 plug-ins/fractal-explorer/fractal-explorer.c