[gnome-documents] Port to gnome-online-miners

[Debarshi Ray <debarshir src gnome org>]

commit cc374b2e257ed466ee7ae07ca528d2d0daa4ee83
Author: Debarshi Ray <debarshir gnome org>
Date:   Tue Jul 9 11:41:10 2013 +0200

    Port to gnome-online-miners
    
    Adjust the D-Bus names and interfaces, and nuke the miner code.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703852

 .gitignore                                     |    2 -
 data/Makefile.am                               |   21 +-
 data/org.gnome.Documents.GDataMiner.service.in |    3 -
 data/org.gnome.Documents.ZpjMiner.service.in   |    3 -
 src/Makefile-miner.am                          |   80 ---
 src/Makefile.am                                |    1 -
 src/miner/gd-gdata-miner.c                     |  376 ------------
 src/miner/gd-gdata-miner.h                     |   70 ---
 src/miner/gd-miner-tracker.c                   |  475 ---------------
 src/miner/gd-miner-tracker.h                   |   84 ---
 src/miner/gd-miner.c                           |  739 ------------------------
 src/miner/gd-miner.h                           |  100 ----
 src/miner/gd-zpj-miner.c                       |  288 ---------
 src/miner/gd-zpj-miner.h                       |   70 ---
 src/miner/gdata-miner-main.c                   |   29 -
 src/miner/miner-main.c                         |  269 ---------
 src/miner/zpj-miner-main.c                     |   29 -
 src/miners.js                                  |   12 +-
 18 files changed, 7 insertions(+), 2644 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 506e6b4..0d66e76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,8 +20,6 @@ configure
 data/gnome-documents.desktop
 data/gnome-documents.desktop.in
 data/org.gnome.Documents.enums.xml
-data/org.gnome.Documents.GDataMiner.service
-data/org.gnome.Documents.ZpjMiner.service
 data/org.gnome.documents.gschema.valid
 data/org.gnome.documents.gschema.xml
 intltool-extract.in
diff --git a/data/Makefile.am b/data/Makefile.am
index 643f8ae..1db6ae0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,23 +12,6 @@ searchprovider_DATA = gnome-documents-search-provider.ini
 check-local: gnome-documents.desktop
        $(DESKTOP_FILE_VALIDATE) gnome-documents.desktop
 
-servicedir = $(datadir)/dbus-1/services
-service_DATA = $(service_in_files:.service.in=.service)
-
-org.gnome.Documents.GDataMiner.service: org.gnome.Documents.GDataMiner.service.in Makefile
-       $(AM_V_GEN)     \
-               [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
-               sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $  tmp && mv $  tmp $@
-
-org.gnome.Documents.ZpjMiner.service: org.gnome.Documents.ZpjMiner.service.in Makefile
-       $(AM_V_GEN)     \
-               [ -d $(@D) ] || $(mkdir_p) $(@D) ; \
-               sed -e "s|\ libexecdir\@|$(libexecdir)|" $< > $  tmp && mv $  tmp $@
-
-service_in_files = \
-    org.gnome.Documents.GDataMiner.service.in \
-    org.gnome.Documents.ZpjMiner.service.in
-
 gsettings_ENUM_NAMESPACE = org.gnome.Documents
 gsettings_ENUM_FILES = \
     $(top_srcdir)/libgd/libgd/gd-main-view.h
@@ -42,12 +25,10 @@ gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
 
 EXTRA_DIST= \
     gnome-documents.desktop \
-    $(service_in_files) \
     $(desktop_in_files) \
     $(searchprovider_DATA) \
     $(gsettingsschema_in_files)
 
 CLEANFILES = \
     $(desktop_DATA) \
-    $(gsettings_SCHEMAS) \
-    $(service_DATA)
+    $(gsettings_SCHEMAS)
diff --git a/src/Makefile.am b/src/Makefile.am
index f8d7966..20b32e1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,7 +38,6 @@ do_subst = sed -e 's|@abs_top_srcdir[ ]|$(abs_top_srcdir)|g' \
 
 include $(INTROSPECTION_MAKEFILE)
 include Makefile-lib.am
-include Makefile-miner.am
 include Makefile-js.am
 
 resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies 
$(srcdir)/gnome-documents.gresource.xml)
diff --git a/src/miners.js b/src/miners.js
index f5bbf54..b8fa11e 100644
--- a/src/miners.js
+++ b/src/miners.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Red Hat, Inc.
+ * Copyright (c) 2012, 2013 Red Hat, Inc.
  *
  * Gnome Documents is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by the
@@ -23,7 +23,7 @@
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 
-const MinerIface = <interface name="org.gnome.Documents.Miner">
+const MinerIface = <interface name="org.gnome.OnlineMiners.Miner">
     <method name="RefreshDB" />
     <property name="DisplayName" type="s" access="read"/>
 </interface>;
@@ -37,11 +37,11 @@ function _makeMinerProxy(iface, path) {
 }
 
 function GDataMiner() {
-    return _makeMinerProxy('org.gnome.Documents.GDataMiner',
-                           '/org/gnome/Documents/GDataMiner');
+    return _makeMinerProxy('org.gnome.OnlineMiners.GData',
+                           '/org/gnome/OnlineMiners/GData');
 }
 
 function ZpjMiner() {
-    return _makeMinerProxy('org.gnome.Documents.ZpjMiner',
-                           '/org/gnome/Documents/ZpjMiner');
+    return _makeMinerProxy('org.gnome.OnlineMiners.Zpj',
+                           '/org/gnome/OnlineMiners/Zpj');
 }