GNOME.org
 

[gnome-terminal/wip/remove-search-provider] server: Remove search provider


commit 29f0d84eb5ebb8c2619c3b83ec682e2c5d78ebca
Author: Christian Persch <chpe src gnome org>
Date:   Tue Sep 6 19:15:33 2022 +0200

    server: Remove search provider

 README.md                               |   5 +-
 data/org.gnome.Terminal.metainfo.xml.in |   1 -
 meson.build                             |   4 -
 meson_options.txt                       |   6 +-
 src/gnome-terminal-search-provider.ini  |  20 --
 src/meson.build                         |  30 ---
 src/org.gnome.Terminal.gschema.xml      |   4 +-
 src/terminal-app.cc                     |  36 ---
 src/terminal-defines.hh                 |   1 -
 src/terminal-schemas.hh                 |   1 -
 src/terminal-search-provider.cc         | 380 --------------------------------
 src/terminal-search-provider.hh         |  51 -----
 12 files changed, 6 insertions(+), 533 deletions(-)
---
diff --git a/README.md b/README.md
index 84c66032..934922f1 100644
--- a/README.md
+++ b/README.md
@@ -46,10 +46,7 @@ $ # Don't forget to make sure that pkg-config can find your self-build vte!
 $ # e.g. by doing:
 $ # export PKG_CONFIG_PATH=/some/where/lib64/pkg-config:$PKG_CONFIG_PATH
 $ #
-$ # If you compiled gnome-shell into the same prefix, you can omit disabling
-$ # the search provider.
-$ #
-$ meson _build --prefix=/some/where -Dsearch_provider=false
+$ meson _build --prefix=/some/where
 $
 $ # Build
 $ ninja -C _build
diff --git a/data/org.gnome.Terminal.metainfo.xml.in b/data/org.gnome.Terminal.metainfo.xml.in
index 6a4e7de5..5a0d7b5a 100644
--- a/data/org.gnome.Terminal.metainfo.xml.in
+++ b/data/org.gnome.Terminal.metainfo.xml.in
@@ -53,7 +53,6 @@
     <kudo>HiDpiIcon</kudo>
     <kudo>HighContrast</kudo>
     <kudo>ModernToolkit</kudo>
-    <kudo>SearchProvider</kudo>
     <kudo>UserDocs</kudo>
   </kudos>
   <url type="homepage">https://wiki.gnome.org/Apps/Terminal</url>
diff --git a/meson.build b/meson.build
index 4f886a5d..1c5f4393 100644
--- a/meson.build
+++ b/meson.build
@@ -83,8 +83,6 @@ gt_pkglibdir  = gt_libdir  / gt_name
 
 gt_schemadir = gt_datadir / 'glib-2.0' / 'schemas'
 
-gt_searchproviderdir = gt_datadir / 'gnome-shell' / 'search-providers'
-
 gt_nautilusextensiondir = gt_libdir / 'nautilus' / 'extensions-4'
 
 gt_dbusinterfacedir = gt_datadir / 'dbus-1' / 'interfaces'
@@ -157,7 +155,6 @@ config_h = configuration_data()
 config_h.set_quoted('GETTEXT_PACKAGE', gt_gettext_domain)
 config_h.set_quoted('VERSION', gt_version)
 config_h.set('ENABLE_DEBUG', enable_debug)
-config_h.set('ENABLE_SEARCH_PROVIDER', get_option('search_provider'))
 
 # Enable libc features
 
@@ -424,7 +421,6 @@ output += '\n'
 output += '  Prefix:             ' + get_option('prefix') + '\n'
 output += '\n'
 output += '  Nautilus extension: ' + get_option('nautilus_extension').to_string() + '\n'
-output += '  Search provider:    ' + get_option('search_provider').to_string() + '\n'
 message(output)
 
 # Done
diff --git a/meson_options.txt b/meson_options.txt
index b555ab66..9b370bc8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -37,7 +37,7 @@ option(
 option(
   'search_provider',
   type: 'boolean',
-  value: true,
-  description: 'Provide search integration for gnome-shell',
+  value: false,
+  description: '',
+  deprecated: true,
 )
-
diff --git a/src/meson.build b/src/meson.build
index df24c102..d9e45118 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -220,24 +220,6 @@ server_sources = app_sources + client_util_sources + debug_sources + dbus_source
   'terminal-window.hh',
 )
 
-if get_option('search_provider')
-
-  server_sources += files(
-    'terminal-search-provider.cc',
-    'terminal-search-provider.hh',
-  )
-
-  server_sources += gnome.gdbus_codegen(
-    'terminal-search-provider-gdbus-generated',
-    gt_prefix / gt_dbusinterfacedir / 'org.gnome.ShellSearchProvider2.xml',
-    autocleanup: 'none',
-    install_header: false,
-    interface_prefix: 'org.gnome.Shell',
-    namespace: 'Terminal',
-  )
-
-endif
-
 server_incs = [
   top_inc,
   src_inc,
@@ -293,18 +275,6 @@ configure_file(
   install_dir: gt_prefix / gt_systemduserdir
 )
 
-# Search provider
-
-if get_option('search_provider')
-
-  provider_ini = files(gt_name + '-search-provider.ini')
-
-  install_data(
-    provider_ini,
-    install_dir: gt_prefix / gt_searchproviderdir,
-  )
-endif # option 'search_provider'
-
 # Preferences
 
 prefs_resources_sources = gnome.compile_resources(
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index 36a0230e..bb07bd2b 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -659,9 +659,9 @@
       </description>
     </key>
 
+    <!-- Deprecated, unused -->
     <key name="shell-integration-enabled" type="b">
-      <default>true</default>
-      <summary>Whether the shell integration is enabled</summary>
+      <default>false</default>
     </key>
 
     <key name="confirm-close" type="b">
diff --git a/src/terminal-app.cc b/src/terminal-app.cc
index 59a4db15..59407423 100644
--- a/src/terminal-app.cc
+++ b/src/terminal-app.cc
@@ -52,14 +52,6 @@
 #include "terminal-prefs.hh"
 #endif
 
-#ifndef TERMINAL_SERVER
-#undef ENABLE_SEARCH_PROVIDER
-#endif
-
-#ifdef ENABLE_SEARCH_PROVIDER
-#include "terminal-search-provider.hh"
-#endif /* ENABLE_SEARCH_PROVIDER */
-
 #include <sys/wait.h>
 #include <errno.h>
 #include <string.h>
@@ -124,10 +116,6 @@ struct _TerminalApp
   GDBusObjectManagerServer *object_manager;
   GHashTable *screen_map;
 
-#ifdef ENABLE_SEARCH_PROVIDER
-  TerminalSearchProvider *search_provider;
-#endif /* ENABLE_SEARCH_PROVIDER */
-
   GMenuModel *menubar;
   GMenu *menubar_new_terminal_section;
   GMenu *menubar_set_profile_section;
@@ -1091,22 +1079,6 @@ terminal_app_dbus_register (GApplication    *application,
                                                                        error))
     return FALSE;
 
-#ifdef ENABLE_SEARCH_PROVIDER
-  if (g_settings_get_boolean (app->global_settings, TERMINAL_SETTING_SHELL_INTEGRATION_KEY)) {
-    gs_unref_object TerminalSearchProvider *search_provider;
-
-    search_provider = terminal_search_provider_new ();
-
-    if (!terminal_search_provider_dbus_register (search_provider,
-                                                 connection,
-                                                 TERMINAL_SEARCH_PROVIDER_PATH,
-                                                 error))
-      return FALSE;
-
-    gs_transfer_out_value (&app->search_provider, &search_provider);
-  }
-#endif /* ENABLE_SEARCH_PROVIDER */
-
   object = terminal_object_skeleton_new (TERMINAL_FACTORY_OBJECT_PATH);
   factory = terminal_factory_impl_new ();
   terminal_object_skeleton_set_factory (object, factory);
@@ -1132,14 +1104,6 @@ terminal_app_dbus_unregister (GApplication    *application,
     app->object_manager = nullptr;
   }
 
-#ifdef ENABLE_SEARCH_PROVIDER
-  if (app->search_provider) {
-    terminal_search_provider_dbus_unregister (app->search_provider, connection, 
TERMINAL_SEARCH_PROVIDER_PATH);
-    g_object_unref (app->search_provider);
-    app->search_provider = nullptr;
-  }
-#endif /* ENABLE_SEARCH_PROVIDER */
-
   G_APPLICATION_CLASS (terminal_app_parent_class)->dbus_unregister (application,
                                                                     connection,
                                                                     object_path);
diff --git a/src/terminal-defines.hh b/src/terminal-defines.hh
index cd85d60c..03b357d3 100644
--- a/src/terminal-defines.hh
+++ b/src/terminal-defines.hh
@@ -38,7 +38,6 @@ enum {
 #define TERMINAL_RECEIVER_OBJECT_PATH_FORMAT    TERMINAL_OBJECT_PATH_PREFIX "/screen/%s"
 #define TEMRINAL_RECEIVER_INTERFACE_NAME        TERMINAL_OBJECT_INTERFACE_PREFIX ".Terminal0"
 
-#define TERMINAL_SEARCH_PROVIDER_PATH           TERMINAL_OBJECT_PATH_PREFIX "/SearchProvider"
 
 #define TERMINAL_SETTINGS_BRIDGE_INTERFACE_NAME "org.gnome.Terminal.SettingsBridge0"
 #define TERMINAL_SETTINGS_BRIDGE_OBJECT_PATH    TERMINAL_OBJECT_PATH_PREFIX "/SettingsBridge"
diff --git a/src/terminal-schemas.hh b/src/terminal-schemas.hh
index b146ba82..baa5055d 100644
--- a/src/terminal-schemas.hh
+++ b/src/terminal-schemas.hh
@@ -88,7 +88,6 @@ G_BEGIN_DECLS
 #define TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY          "new-terminal-mode"
 #define TERMINAL_SETTING_NEW_TAB_POSITION_KEY           "new-tab-position"
 #define TERMINAL_SETTING_SCHEMA_VERSION                 "schema-version"
-#define TERMINAL_SETTING_SHELL_INTEGRATION_KEY          "shell-integration-enabled"
 #define TERMINAL_SETTING_TAB_POLICY_KEY                 "tab-policy"
 #define TERMINAL_SETTING_TAB_POSITION_KEY               "tab-position"
 #define TERMINAL_SETTING_THEME_VARIANT_KEY              "theme-variant"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]