[gnome-books/wip/hadess/gnome-books: 6/10] Remove search provider



commit 711b99d4f87dd601569d68a21ad53df85acda128
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Jan 24 12:52:43 2019 +0100

    Remove search provider

 po/POTFILES.in                        |   1 -
 src/application.js                    |  32 ---
 src/meson.build                       |   1 -
 src/org.gnome.Books.src.gresource.xml |   1 -
 src/shellSearchProvider.js            | 452 ----------------------------------
 5 files changed, 487 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9240f857..9338b788 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -35,5 +35,4 @@ src/preview.js
 src/properties.js
 src/search.js
 src/selections.js
-src/shellSearchProvider.js
 src/trackerController.js
diff --git a/src/application.js b/src/application.js
index 54ee1d33..6a5ab431 100644
--- a/src/application.js
+++ b/src/application.js
@@ -40,7 +40,6 @@ const Properties = imports.properties;
 const Query = imports.query;
 const Search = imports.search;
 const Selections = imports.selections;
-const ShellSearchProvider = imports.shellSearchProvider;
 const TrackerController = imports.trackerController;
 const TrackerUtils = imports.trackerUtils;
 const Utils = imports.utils;
@@ -100,7 +99,6 @@ var Application = new Lang.Class({
         this.minersRunning = [];
         this._activationTimestamp = Gdk.CURRENT_TIME;
         this._extractPriority = null;
-        this._searchProvider = null;
 
         let appid;
         GLib.set_application_name(_("Books"));
@@ -199,7 +197,6 @@ var Application = new Lang.Class({
 
         // now init application components
         Search.initSearch(imports.application);
-        Search.initSearch(imports.shellSearchProvider);
 
         modeController = new WindowMode.ModeController();
         offsetCollectionsController = new Search.OffsetCollectionsController();
@@ -244,35 +241,6 @@ var Application = new Lang.Class({
         }
     },
 
-    vfunc_dbus_register: function(connection, path) {
-        this.parent(connection, path);
-
-        if (this._searchProvider != null)
-            throw(new Error('ShellSearchProvider already instantiated - dbus_register called twice?'));
-
-        this._searchProvider = new ShellSearchProvider.ShellSearchProvider();
-        this._searchProvider.connect('activate-result', Lang.bind(this, this._onActivateResult));
-        this._searchProvider.connect('launch-search', Lang.bind(this, this._onLaunchSearch));
-
-        try {
-            this._searchProvider.export(connection);
-        } catch(e) {
-            this._searchProvider = null;
-            throw(e);
-        }
-
-        return true;
-    },
-
-    vfunc_dbus_unregister: function(connection, path) {
-        if (this._searchProvider != null) {
-            this._searchProvider.unexport(connection);
-            this._searchProvider = null;
-        }
-
-        this.parent(connection, path);
-    },
-
     vfunc_handle_local_options: function(options) {
         if (options.contains('version')) {
             print(pkg.version);
diff --git a/src/meson.build b/src/meson.build
index c65feeda..069d0573 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -64,7 +64,6 @@ resource_data = files(
   'searchbar.js',
   'search.js',
   'selections.js',
-  'shellSearchProvider.js',
   'testentry.js',
   'trackerController.js',
   'trackerUtils.js',
diff --git a/src/org.gnome.Books.src.gresource.xml b/src/org.gnome.Books.src.gresource.xml
index 434a9558..d7ac2a3a 100644
--- a/src/org.gnome.Books.src.gresource.xml
+++ b/src/org.gnome.Books.src.gresource.xml
@@ -24,7 +24,6 @@
     <file>searchbar.js</file>
     <file>search.js</file>
     <file>selections.js</file>
-    <file>shellSearchProvider.js</file>
     <file>testentry.js</file>
     <file>trackerController.js</file>
     <file>trackerUtils.js</file>


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