[gnome-builder/wip/chergert/git-oop] remove some ggit.h includes
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder/wip/chergert/git-oop] remove some ggit.h includes
- Date: Thu, 21 Mar 2019 21:48:02 +0000 (UTC)
commit b76a31d0fd9432ee318cd5efa67a942a4ddf2dd1
Author: Christian Hergert <chergert redhat com>
Date: Thu Mar 21 14:47:43 2019 -0700
remove some ggit.h includes
src/plugins/git/gbp-git-buffer-addin.c | 1 -
src/plugins/git/gbp-git-vcs-initializer.c | 1 -
src/plugins/git/gbp-git-workbench-addin.c | 1 -
src/plugins/git/git-plugin.c | 76 +++++++++----------------------
4 files changed, 22 insertions(+), 57 deletions(-)
---
diff --git a/src/plugins/git/gbp-git-buffer-addin.c b/src/plugins/git/gbp-git-buffer-addin.c
index 274366e88..9d21af2ba 100644
--- a/src/plugins/git/gbp-git-buffer-addin.c
+++ b/src/plugins/git/gbp-git-buffer-addin.c
@@ -41,7 +41,6 @@ gbp_git_buffer_addin_file_laoded (IdeBufferAddin *addin,
GFile *file)
{
GbpGitBufferAddin *self = (GbpGitBufferAddin *)addin;
- g_autoptr(GbpGitBufferChangeMonitor) monitor = NULL;
g_autoptr(IdeContext) context = NULL;
GgitRepository *repository;
IdeObjectBox *box;
diff --git a/src/plugins/git/gbp-git-vcs-initializer.c b/src/plugins/git/gbp-git-vcs-initializer.c
index d587d38b2..2044588a5 100644
--- a/src/plugins/git/gbp-git-vcs-initializer.c
+++ b/src/plugins/git/gbp-git-vcs-initializer.c
@@ -22,7 +22,6 @@
#include "config.h"
-#include <libgit2-glib/ggit.h>
#include <libide-threading.h>
#include "gbp-git-client.h"
diff --git a/src/plugins/git/gbp-git-workbench-addin.c b/src/plugins/git/gbp-git-workbench-addin.c
index ce989a39c..58a14a6cc 100644
--- a/src/plugins/git/gbp-git-workbench-addin.c
+++ b/src/plugins/git/gbp-git-workbench-addin.c
@@ -22,7 +22,6 @@
#include "config.h"
-#include <libgit2-glib/ggit.h>
#include <libide-editor.h>
#include <libide-io.h>
#include <libide-threading.h>
diff --git a/src/plugins/git/git-plugin.c b/src/plugins/git/git-plugin.c
index 85ae8d074..fe90ddb1a 100644
--- a/src/plugins/git/git-plugin.c
+++ b/src/plugins/git/git-plugin.c
@@ -23,7 +23,6 @@
#include "config.h"
#include <libpeas/peas.h>
-#include <libgit2-glib/ggit.h>
#include <libide-editor.h>
#include <libide-foundry.h>
#include <libide-vcs.h>
@@ -31,66 +30,35 @@
#include "gbp-git-buffer-addin.h"
#include "gbp-git-dependency-updater.h"
#include "gbp-git-pipeline-addin.h"
-#include "gbp-git-remote-callbacks.h"
#include "gbp-git-vcs-cloner.h"
#include "gbp-git-vcs-config.h"
#include "gbp-git-vcs-initializer.h"
#include "gbp-git-workbench-addin.h"
-static gboolean
-register_ggit (void)
-{
- GgitFeatureFlags ggit_flags;
-
- ggit_init ();
-
- ggit_flags = ggit_get_features ();
-
- if ((ggit_flags & GGIT_FEATURE_THREADS) == 0)
- {
- g_printerr ("Builder requires libgit2-glib with threading support.");
- return FALSE;
- }
-
- if ((ggit_flags & GGIT_FEATURE_SSH) == 0)
- {
- g_printerr ("Builder requires libgit2-glib with SSH support.");
- return FALSE;
- }
-
- return TRUE;
-}
-
-
_IDE_EXTERN void
_gbp_git_register_types (PeasObjectModule *module)
{
- if (register_ggit ())
- {
- ide_g_file_add_ignored_pattern (".git");
-
- peas_object_module_register_extension_type (module,
- IDE_TYPE_BUFFER_ADDIN,
- GBP_TYPE_GIT_BUFFER_ADDIN);
- peas_object_module_register_extension_type (module,
- IDE_TYPE_PIPELINE_ADDIN,
- GBP_TYPE_GIT_PIPELINE_ADDIN);
- peas_object_module_register_extension_type (module,
- IDE_TYPE_DEPENDENCY_UPDATER,
- GBP_TYPE_GIT_DEPENDENCY_UPDATER);
- peas_object_module_register_extension_type (module,
- IDE_TYPE_VCS_CONFIG,
- GBP_TYPE_GIT_VCS_CONFIG);
- peas_object_module_register_extension_type (module,
- IDE_TYPE_VCS_CLONER,
- GBP_TYPE_GIT_VCS_CLONER);
- peas_object_module_register_extension_type (module,
- IDE_TYPE_VCS_INITIALIZER,
- GBP_TYPE_GIT_VCS_INITIALIZER);
- peas_object_module_register_extension_type (module,
- IDE_TYPE_WORKBENCH_ADDIN,
- GBP_TYPE_GIT_WORKBENCH_ADDIN);
+ ide_g_file_add_ignored_pattern (".git");
- g_type_ensure (GBP_TYPE_GIT_REMOTE_CALLBACKS);
- }
+ peas_object_module_register_extension_type (module,
+ IDE_TYPE_BUFFER_ADDIN,
+ GBP_TYPE_GIT_BUFFER_ADDIN);
+ peas_object_module_register_extension_type (module,
+ IDE_TYPE_PIPELINE_ADDIN,
+ GBP_TYPE_GIT_PIPELINE_ADDIN);
+ peas_object_module_register_extension_type (module,
+ IDE_TYPE_DEPENDENCY_UPDATER,
+ GBP_TYPE_GIT_DEPENDENCY_UPDATER);
+ peas_object_module_register_extension_type (module,
+ IDE_TYPE_VCS_CONFIG,
+ GBP_TYPE_GIT_VCS_CONFIG);
+ peas_object_module_register_extension_type (module,
+ IDE_TYPE_VCS_CLONER,
+ GBP_TYPE_GIT_VCS_CLONER);
+ peas_object_module_register_extension_type (module,
+ IDE_TYPE_VCS_INITIALIZER,
+ GBP_TYPE_GIT_VCS_INITIALIZER);
+ peas_object_module_register_extension_type (module,
+ IDE_TYPE_WORKBENCH_ADDIN,
+ GBP_TYPE_GIT_WORKBENCH_ADDIN);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]