[gnome-builder/wip/chergert/perspective] libide: move fal lback → directory

[Christian Hergert <chergert src gnome org>]

commit 70bcbb9583883bf1abdffdf498b4dac59f76fca1
Author: Christian Hergert <chergert redhat com>
Date:   Sun Nov 29 17:19:59 2015 -0800

    libide: move fallback → directory
    
    This was directory only stuff, and we will have more of that for the create
    project abstractions.

 libide/Makefile.am                                 |   12 +++++++-----
 .../fallback.plugin => directory/directory.plugin} |    6 +++---
 .../ide-directory-build-system.c                   |    0
 .../ide-directory-build-system.h                   |    0
 .../ide-directory-plugin.c}                        |    4 ++--
 libide/{fallback => directory}/ide-directory-vcs.c |    0
 libide/{fallback => directory}/ide-directory-vcs.h |    0
 libide/ide-application-plugins.c                   |   13 +++----------
 libide/resources/libide.gresource.xml              |    4 ++--
 9 files changed, 17 insertions(+), 22 deletions(-)
---
diff --git a/libide/Makefile.am b/libide/Makefile.am
index 818da9d..a64e5bd 100644
--- a/libide/Makefile.am
+++ b/libide/Makefile.am
@@ -7,6 +7,11 @@ pkglibdir = $(libdir)/gnome-builder
 pkglib_LTLIBRARIES = libide-1.0.la
 
 libide_1_0_la_public_sources = \
+       directory/ide-directory-build-system.c \
+       directory/ide-directory-build-system.h \
+       directory/ide-directory-vcs.c \
+       directory/ide-directory-vcs.h \
+       directory/ide-directory-plugin.c \
        doap/ide-doap-person.c \
        doap/ide-doap-person.h \
        doap/ide-doap.c \
@@ -17,11 +22,8 @@ libide_1_0_la_public_sources = \
        editor/ide-editor-view-addin.h \
        editor/ide-editor-view.c \
        editor/ide-editor-view.h \
-       fallback/ide-directory-build-system.c \
-       fallback/ide-directory-build-system.h \
-       fallback/ide-directory-vcs.c \
-       fallback/ide-directory-vcs.h \
-       fallback/ide-fallback-plugin.c \
+       greeter/ide-greeter-assistant.c \
+       greeter/ide-greeter-assistant.h \
        ide-application.c \
        ide-application.h \
        ide-application-addin.c \
diff --git a/libide/fallback/fallback.plugin b/libide/directory/directory.plugin
similarity index 55%
rename from libide/fallback/fallback.plugin
rename to libide/directory/directory.plugin
index ea693cb..5864f1a 100644
--- a/libide/fallback/fallback.plugin
+++ b/libide/directory/directory.plugin
@@ -1,10 +1,10 @@
 [Plugin]
-Module=fallback-plugin
+Module=directory-plugin
 Name=Fallback
-Description=Provides fallback implementations for Builder subsystems.
+Description=Provides simple directory based implementations of core services
 Authors=Christian Hergert <christian hergert me>
 Copyright=Copyright © 2015 Christian Hergert
 Builtin=true
 Hidden=true
 X-Build-System-Priority=10000000
-Embedded=ide_fallback_register_types
+Embedded=ide_directory_register_types
diff --git a/libide/fallback/ide-directory-build-system.c b/libide/directory/ide-directory-build-system.c
similarity index 100%
rename from libide/fallback/ide-directory-build-system.c
rename to libide/directory/ide-directory-build-system.c
diff --git a/libide/fallback/ide-directory-build-system.h b/libide/directory/ide-directory-build-system.h
similarity index 100%
rename from libide/fallback/ide-directory-build-system.h
rename to libide/directory/ide-directory-build-system.h
diff --git a/libide/fallback/ide-fallback-plugin.c b/libide/directory/ide-directory-plugin.c
similarity index 93%
rename from libide/fallback/ide-fallback-plugin.c
rename to libide/directory/ide-directory-plugin.c
index 84485f6..d24a7b7 100644
--- a/libide/fallback/ide-fallback-plugin.c
+++ b/libide/directory/ide-directory-plugin.c
@@ -1,4 +1,4 @@
-/* fallback-plugin.c
+/* ide-directory-plugin.c
  *
  * Copyright (C) 2015 Christian Hergert <christian hergert me>
  *
@@ -23,7 +23,7 @@
 #include "ide-directory-vcs.h"
 
 void
-ide_fallback_register_types (PeasObjectModule *module)
+ide_directory_register_types (PeasObjectModule *module)
 {
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_BUILD_SYSTEM,
diff --git a/libide/fallback/ide-directory-vcs.c b/libide/directory/ide-directory-vcs.c
similarity index 100%
rename from libide/fallback/ide-directory-vcs.c
rename to libide/directory/ide-directory-vcs.c
diff --git a/libide/fallback/ide-directory-vcs.h b/libide/directory/ide-directory-vcs.h
similarity index 100%
rename from libide/fallback/ide-directory-vcs.h
rename to libide/directory/ide-directory-vcs.h
diff --git a/libide/ide-application-plugins.c b/libide/ide-application-plugins.c
index bd223b2..5af0eba 100644
--- a/libide/ide-application-plugins.c
+++ b/libide/ide-application-plugins.c
@@ -56,9 +56,7 @@ void
 ide_application_discover_plugins (IdeApplication *self)
 {
   PeasEngine *engine = peas_engine_get_default ();
-  static const gchar *embedded [] = { "editor", "fallback", "git", NULL };
   const GList *list;
-  gint i;
 
   g_return_if_fail (IDE_IS_APPLICATION (self));
 
@@ -95,14 +93,9 @@ ide_application_discover_plugins (IdeApplication *self)
                                        PACKAGE_DATADIR"/gnome-builder/plugins");
     }
 
-  for (i = 0; embedded [i]; i++)
-    {
-      gchar *path;
-
-      path = g_strdup_printf ("resource:///org/gnome/builder/plugins/%s", embedded [i]);
-      peas_engine_prepend_search_path (engine, path, path);
-      g_free (path);
-    }
+  peas_engine_prepend_search_path (engine,
+                                   "resource:///org/gnome/builder/plugins",
+                                   "resource:///org/gnome/builder/plugins");
 
   peas_engine_rescan_plugins (engine);
 
diff --git a/libide/resources/libide.gresource.xml b/libide/resources/libide.gresource.xml
index 9e8814c..2a3b78b 100644
--- a/libide/resources/libide.gresource.xml
+++ b/libide/resources/libide.gresource.xml
@@ -69,7 +69,7 @@
     <file alias="editor.plugin">../editor/editor.plugin</file>
   </gresource>
 
-  <gresource prefix="/org/gnome/builder/plugins/fallback">
-    <file alias="fallback.plugin">../fallback/fallback.plugin</file>
+  <gresource prefix="/org/gnome/builder/plugins/directory">
+    <file alias="directory.plugin">../directory/directory.plugin</file>
   </gresource>
 </gresources>