[gjs] Rename GjsDBus to GjsPrivate

[Giovanni Campagna <gcampagna src gnome org>]

commit 4727b9c65ecf8c2203a0e7791f2787d1e1910a3f
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Sat Apr 28 14:05:54 2012 +0200

    Rename GjsDBus to GjsPrivate
    
    GjsDBus is likely to be present in system directories too, if
    an older version of gjs is installed, and this can cause symbol
    conflicts between system libgjs-gdbus.so and libgjs.so.
    Also, it could be that some day we want to do something else with
    it.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=675018

 Makefile.am              |   12 ++++++------
 modules/overrides/Gio.js |    6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7b42756..4d964bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,13 +145,13 @@ gdbus_wrapper_source_files = \
 	gjs-dbus/gjs-gdbus-wrapper.h
 libgjs_la_SOURCES += $(gdbus_wrapper_source_files)
 
-GjsDBus-1.0.gir: libgjs.la
-GjsDBus_1_0_gir_LIBS = libgjs.la
-GjsDBus_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
-GjsDBus_1_0_gir_FILES = $(gdbus_wrapper_source_files)
-GjsDBus_1_0_gir_SCANNERFLAGS = --identifier-prefix=GjsDBus --symbol-prefix=gjs_dbus --warn-all
+GjsPrivate-1.0.gir: libgjs.la
+GjsPrivate_1_0_gir_LIBS = libgjs.la
+GjsPrivate_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0
+GjsPrivate_1_0_gir_FILES = $(gdbus_wrapper_source_files)
+GjsPrivate_1_0_gir_SCANNERFLAGS = --identifier-prefix=Gjs --symbol-prefix=gjs_ --warn-all
 
-INTROSPECTION_GIRS += GjsDBus-1.0.gir
+INTROSPECTION_GIRS += GjsPrivate-1.0.gir
 
 if ENABLE_DTRACE
 gjs_gi_probes.h: gi/gjs_gi_probes.d
diff --git a/modules/overrides/Gio.js b/modules/overrides/Gio.js
index 2015cdb..8e2cdba 100644
--- a/modules/overrides/Gio.js
+++ b/modules/overrides/Gio.js
@@ -20,7 +20,7 @@
 // IN THE SOFTWARE.
 
 var GLib = imports.gi.GLib;
-var GjsDBus = imports.gi.GjsDBus;
+var GjsPrivate = imports.gi.GjsPrivate;
 var Lang = imports.lang;
 var Signals = imports.signals;
 var Gio;
@@ -269,7 +269,7 @@ function _wrapJSObject(interfaceInfo, jsObj) {
 	info = Gio.DBusInterfaceInfo.new_for_xml(interfaceInfo);
     info.cache_build();
 
-    var impl = new GjsDBus.Implementation({ g_interface_info: info });
+    var impl = new GjsPrivate.DBusImplementation({ g_interface_info: info });
     impl.connect('handle-method-call', function(impl, method_name, parameters, invocation) {
 	// prefer a sync version if available
 	if (jsObj[method_name]) {
@@ -382,6 +382,6 @@ function _init() {
     Gio.DBusInterfaceInfo.new_for_xml = _newInterfaceInfo;
 
     // More or less...
-    Gio.DBusExportedObject = GjsDBus.Implementation;
+    Gio.DBusExportedObject = GjsPrivate.DBusImplementation;
     Gio.DBusExportedObject.wrapJSObject = _wrapJSObject;
 }