[gnome-builder/wip/gtk4-port: 219/736] libide/greeter: move clone surface to vcsui




commit 41e778955e0d1418f158fbb5147c027ebffb59b8
Author: Christian Hergert <chergert redhat com>
Date:   Wed Mar 30 13:58:38 2022 -0700

    libide/greeter: move clone surface to vcsui
    
    This really belongs in the plugin that bridges VCS capabilities rather
    than in the default greeter flow.

 src/libide/greeter/ide-greeter-workspace.c                 | 6 ++----
 src/libide/greeter/ide-greeter-workspace.ui                | 9 ---------
 src/libide/greeter/meson.build                             | 2 --
 src/{libide/greeter => plugins/vcsui}/ide-clone-surface.c  | 0
 src/{libide/greeter => plugins/vcsui}/ide-clone-surface.h  | 0
 src/{libide/greeter => plugins/vcsui}/ide-clone-surface.ui | 0
 src/plugins/vcsui/meson.build                              | 1 +
 7 files changed, 3 insertions(+), 15 deletions(-)
---
diff --git a/src/libide/greeter/ide-greeter-workspace.c b/src/libide/greeter/ide-greeter-workspace.c
index 6900a9e57..b96257627 100644
--- a/src/libide/greeter/ide-greeter-workspace.c
+++ b/src/libide/greeter/ide-greeter-workspace.c
@@ -22,11 +22,9 @@
 
 #include "config.h"
 
-#include <dazzle.h>
 #include <glib/gi18n.h>
 #include <libpeas/peas.h>
 
-#include "ide-clone-surface.h"
 #include "ide-greeter-buttons-section.h"
 #include "ide-greeter-private.h"
 #include "ide-greeter-workspace.h"
@@ -55,7 +53,6 @@ struct _IdeGreeterWorkspace
   GSimpleAction            *purge_action;
 
   /* Template Widgets */
-  IdeCloneSurface          *clone_surface;
   IdeHeaderBar             *header_bar;
   DzlPriorityBox           *sections;
   DzlPriorityBox           *left_box;
@@ -366,6 +363,7 @@ void
 ide_greeter_workspace_open_project (IdeGreeterWorkspace *self,
                                     IdeProjectInfo      *project_info)
 {
+#if 0
   IdeWorkbench *workbench;
   const gchar *vcs_uri = NULL;
   GFile *file;
@@ -430,6 +428,7 @@ ide_greeter_workspace_open_project (IdeGreeterWorkspace *self,
                                     g_object_ref (self));
 
   IDE_EXIT;
+#endif
 }
 
 static void
@@ -638,7 +637,6 @@ ide_greeter_workspace_class_init (IdeGreeterWorkspaceClass *klass)
   gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, action_bar);
   gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, back_button);
   gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, buttons_section);
-  gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, clone_surface);
   gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, empty_state);
   gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, header_bar);
   gtk_widget_class_bind_template_child (widget_class, IdeGreeterWorkspace, left_box);
diff --git a/src/libide/greeter/ide-greeter-workspace.ui b/src/libide/greeter/ide-greeter-workspace.ui
index 2857e23c4..f615eec1b 100644
--- a/src/libide/greeter/ide-greeter-workspace.ui
+++ b/src/libide/greeter/ide-greeter-workspace.ui
@@ -183,15 +183,6 @@
             <property name="name">sections</property>
           </packing>
         </child>
-        <child>
-          <object class="IdeCloneSurface" id="clone_surface">
-            <property name="title" translatable="yes" context="title">Clone Repository</property>
-            <property name="visible">true</property>
-          </object>
-          <packing>
-            <property name="name">clone</property>
-          </packing>
-        </child>
       </object>
     </child>
   </template>
diff --git a/src/libide/greeter/meson.build b/src/libide/greeter/meson.build
index 1a3feac65..b009e8737 100644
--- a/src/libide/greeter/meson.build
+++ b/src/libide/greeter/meson.build
@@ -8,7 +8,6 @@ libide_greeter_generated_headers = []
 #
 
 libide_greeter_public_headers = [
-  'ide-clone-surface.h',
   'ide-greeter-row.h',
   'ide-greeter-section.h',
   'ide-greeter-workspace.h',
@@ -28,7 +27,6 @@ install_headers(libide_greeter_public_headers, subdir: libide_greeter_header_sub
 #
 
 libide_greeter_public_sources = [
-  'ide-clone-surface.c',
   'ide-greeter-row.c',
   'ide-greeter-section.c',
   'ide-greeter-workspace.c',
diff --git a/src/libide/greeter/ide-clone-surface.c b/src/plugins/vcsui/ide-clone-surface.c
similarity index 100%
rename from src/libide/greeter/ide-clone-surface.c
rename to src/plugins/vcsui/ide-clone-surface.c
diff --git a/src/libide/greeter/ide-clone-surface.h b/src/plugins/vcsui/ide-clone-surface.h
similarity index 100%
rename from src/libide/greeter/ide-clone-surface.h
rename to src/plugins/vcsui/ide-clone-surface.h
diff --git a/src/libide/greeter/ide-clone-surface.ui b/src/plugins/vcsui/ide-clone-surface.ui
similarity index 100%
rename from src/libide/greeter/ide-clone-surface.ui
rename to src/plugins/vcsui/ide-clone-surface.ui
diff --git a/src/plugins/vcsui/meson.build b/src/plugins/vcsui/meson.build
index 35d44e02c..007528169 100644
--- a/src/plugins/vcsui/meson.build
+++ b/src/plugins/vcsui/meson.build
@@ -3,6 +3,7 @@ plugins_sources += files([
   'gbp-vcsui-tree-addin.c',
   'gbp-vcsui-editor-page-addin.c',
   'gbp-vcsui-workbench-addin.c',
+  'ide-clone-surface.c',
 ])
 
 plugin_vcsui_resources = gnome.compile_resources(


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]