[gnome-documents] lib: use GDataGoaAuthorizer

[Cosimo Cecchi <cosimoc src gnome org>]

commit b116eea5ee05648bf81990fcbc7870485b6eb1cb
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Aug 7 12:08:21 2012 +0200

    lib: use GDataGoaAuthorizer
    
    GData now exports a GOA authorizer similar to the one we use in our
    internal library. Use it instead of shipping our own copy.
    This also drops a direct dependency on liboauth.

 configure.ac                      |    6 +-
 src/Makefile-lib.am               |    3 -
 src/Makefile-miner.am             |    3 -
 src/documents.js                  |    2 +-
 src/lib/gd-gdata-goa-authorizer.c |  539 -------------------------------------
 src/lib/gd-gdata-goa-authorizer.h |   66 -----
 src/lib/gd-pdf-loader.c           |    2 -
 src/lib/gd-pdf-loader.h           |    2 +
 src/miner/gd-gdata-miner.c        |    6 +-
 src/miner/gd-zpj-miner.c          |    1 +
 10 files changed, 9 insertions(+), 621 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 44011fa..dfddb9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,8 +71,7 @@ PKG_CHECK_MODULES(DOCUMENTS,
                   tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
                   goa-1.0 >= $GOA_MIN_VERSION
                   libgdata >= $GDATA_MIN_VERSION
-                  zapojit-0.0 >= $ZAPOJIT_MIN_VERSION
-                  oauth)
+                  zapojit-0.0 >= $ZAPOJIT_MIN_VERSION)
 
 PKG_CHECK_MODULES(MINER,
                   tracker-sparql-0.14 >= $TRACKER_MIN_VERSION
@@ -80,8 +79,7 @@ PKG_CHECK_MODULES(MINER,
                   gio-2.0 >= $GLIB_MIN_VERSION
                   goa-1.0 >= $GOA_MIN_VERSION
                   libgdata >= $GDATA_MIN_VERSION
-                  zapojit-0.0 >= $ZAPOJIT_MIN_VERSION
-                  oauth)
+                  zapojit-0.0 >= $ZAPOJIT_MIN_VERSION)
 
 GJS_CONSOLE=`$PKG_CONFIG --variable=gjs_console gjs-1.0`
 AC_SUBST(GJS_CONSOLE)
diff --git a/src/Makefile-lib.am b/src/Makefile-lib.am
index 1ae8f87..42c2d88 100644
--- a/src/Makefile-lib.am
+++ b/src/Makefile-lib.am
@@ -4,11 +4,9 @@ gdprivate_cflags = \
     -DLIBDIR=\"$(libdir)\" \
     -DG_LOG_DOMAIN=\"Gdprivate\" \
     -DG_DISABLE_DEPRECATED \
-    -DGOA_API_IS_SUBJECT_TO_CHANGE \
     $(DOCUMENTS_CFLAGS)
 
 gdprivate_source_h = \
-    lib/gd-gdata-goa-authorizer.h \
     lib/gd-utils.h \
     lib/gd-fullscreen-filter.h \
     lib/gd-main-toolbar.h \
@@ -29,7 +27,6 @@ gdprivate_source_h = \
     $(NULL)
 
 gdprivate_source_c = \
-    lib/gd-gdata-goa-authorizer.c \
     lib/gd-utils.c \
     lib/gd-fullscreen-filter.c \
     lib/gd-main-toolbar.c \
diff --git a/src/Makefile-miner.am b/src/Makefile-miner.am
index 6c10eb9..e590a59 100644
--- a/src/Makefile-miner.am
+++ b/src/Makefile-miner.am
@@ -11,7 +11,6 @@ gdminer_source_c = \
 libgdminer_1_0_la_CPPFLAGS = \
     -DG_LOG_DOMAIN=\"Gdminer\" \
     -DG_DISABLE_DEPRECATED \
-    -DGOA_API_IS_SUBJECT_TO_CHANGE \
     $(DOCUMENTS_CFLAGS) \
     $(NULL)
 
@@ -38,7 +37,6 @@ gd_tracker_gdata_miner_SOURCES = \
 
 gd_tracker_gdata_miner_CFLAGS = \
     -DG_DISABLE_DEPRECATED \
-    -DGOA_API_IS_SUBJECT_TO_CHANGE \
     -I$(top_srcdir)/src/lib \
     $(MINER_CFLAGS) \
     $(DOCUMENTS_CFLAGS) \
@@ -61,7 +59,6 @@ gd_tracker_zpj_miner_SOURCES = \
 
 gd_tracker_zpj_miner_CFLAGS = \
     -DG_DISABLE_DEPRECATED \
-    -DGOA_API_IS_SUBJECT_TO_CHANGE \
     -I$(top_srcdir)/src/lib \
     $(MINER_CFLAGS) \
     $(DOCUMENTS_CFLAGS) \
diff --git a/src/documents.js b/src/documents.js
index 3641c8a..ca3c1b7 100644
--- a/src/documents.js
+++ b/src/documents.js
@@ -698,7 +698,7 @@ const GoogleDocument = new Lang.Class({
     _createGDataEntry: function(cancellable, callback) {
         let source = Global.sourceManager.getItemById(this.resourceUrn);
 
-        let authorizer = new Gd.GDataGoaAuthorizer({ goa_object: source.object });
+        let authorizer = new GData.GoaAuthorizer({ goa_object: source.object });
         let service = new GData.DocumentsService({ authorizer: authorizer });
 
         service.query_single_entry_async
diff --git a/src/lib/gd-pdf-loader.c b/src/lib/gd-pdf-loader.c
index 1f46788..dcbe774 100644
--- a/src/lib/gd-pdf-loader.c
+++ b/src/lib/gd-pdf-loader.c
@@ -22,8 +22,6 @@
 #include "gd-pdf-loader.h"
 #include "gd-utils.h"
 
-#include "gd-gdata-goa-authorizer.h"
-
 #include <string.h>
 #include <gdata/gdata.h>
 #include <evince-document.h>
diff --git a/src/lib/gd-pdf-loader.h b/src/lib/gd-pdf-loader.h
index f0c2a60..22b05b4 100644
--- a/src/lib/gd-pdf-loader.h
+++ b/src/lib/gd-pdf-loader.h
@@ -25,6 +25,8 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <evince-view.h>
+
+#define GOA_API_IS_SUBJECT_TO_CHANGE
 #include <gdata/gdata.h>
 #include <zpj/zpj.h>
 
diff --git a/src/miner/gd-gdata-miner.c b/src/miner/gd-gdata-miner.c
index 296e357..836d499 100644
--- a/src/miner/gd-gdata-miner.c
+++ b/src/miner/gd-gdata-miner.c
@@ -19,11 +19,11 @@
  *
  */
 
+#define GOA_API_IS_SUBJECT_TO_CHANGE
 #include <gdata/gdata.h>
 #include <goa/goa.h>
 #include <unistd.h>
 
-#include "gd-gdata-goa-authorizer.h"
 #include "gd-gdata-miner.h"
 #include "gd-miner-tracker.h"
 #include "gd-utils.h"
@@ -216,7 +216,7 @@ account_miner_job_new (GdGDataMiner *self,
                        GoaObject *object)
 {
   AccountMinerJob *retval;
-  GdGDataGoaAuthorizer *authorizer;
+  GDataGoaAuthorizer *authorizer;
   GoaAccount *account;
 
   account = goa_object_get_account (object);
@@ -237,7 +237,7 @@ account_miner_job_new (GdGDataMiner *self,
                                G_CALLBACK (miner_cancellable_cancelled_cb),
                                retval, NULL);
 
-  authorizer = gd_gdata_goa_authorizer_new (object);
+  authorizer = gdata_goa_authorizer_new (object);
   retval->service = gdata_documents_service_new (GDATA_AUTHORIZER (authorizer));
 
   /* the service takes ownership of the authorizer */
diff --git a/src/miner/gd-zpj-miner.c b/src/miner/gd-zpj-miner.c
index cd51b5a..1797839 100644
--- a/src/miner/gd-zpj-miner.c
+++ b/src/miner/gd-zpj-miner.c
@@ -19,6 +19,7 @@
  *
  */
 
+#define GOA_API_IS_SUBJECT_TO_CHANGE
 #include <goa/goa.h>
 #include <zpj/zpj.h>
 #include <unistd.h>