[gjs] Remove standalone DBus module wrappers

From: Jasper St. Pierre <jstpierre src gnome org>
To: commits-list gnome org
Cc:
Subject: [gjs] Remove standalone DBus module wrappers
Date: Wed, 2 Jan 2013 18:40:20 +0000 (UTC)
commit 7b52973727103b6ec47ce920397fcfd345ba1bdd
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Jan 2 13:11:14 2013 -0500

    Remove standalone DBus module wrappers
    
    Now that we have GDBus wrapped in Gio with all users ported,
    we can safely remove our own libdbus-based DBus implementation.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=691029

 .gitignore                |    1 -
 Makefile-gjs-dbus.am      |   30 -
 Makefile-modules.am       |   21 +-
 Makefile.am               |    1 -
 configure.ac              |   11 +-
 doc/overview-gjs-dbus.txt |  134 --
 examples/dbus.js          |   35 -
 gjs-dbus-1.0.pc.in        |   15 -
 gjs-dbus/dbus-private.h   |   71 --
 gjs-dbus/dbus-proxy.c     |  661 ----------
 gjs-dbus/dbus-proxy.h     |   80 --
 gjs-dbus/dbus-signals.c   | 1316 --------------------
 gjs-dbus/dbus.c           | 2994 ---------------------------------------------
 gjs-dbus/dbus.h           |  238 ----
 gjs/mem.c                 |    2 -
 gjs/mem.h                 |    1 -
 modules/dbus-exports.c    | 1880 ----------------------------
 modules/dbus-exports.h    |   37 -
 modules/dbus-values.c     | 1077 ----------------
 modules/dbus-values.h     |   52 -
 modules/dbus.c            | 1916 -----------------------------
 modules/dbus.h            |   37 -
 modules/dbus.js           |  609 ---------
 test/js/testDBus.js       |  996 ---------------
 util/log.c                |    6 -
 util/log.h                |   15 -
 26 files changed, 2 insertions(+), 12234 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1f98645..5597c9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ configure
 depcomp
 gjs-1.0.pc
 gjs-console
-gjs-dbus-1.0.pc
 gjs-internals-1.0.pc
 gjs-gi-1.0.pc
 gjs-tests
diff --git a/Makefile-modules.am b/Makefile-modules.am
index 29af3cb..539c629 100644
--- a/Makefile-modules.am
+++ b/Makefile-modules.am
@@ -13,11 +13,10 @@ dist_gjsjs_DATA +=		\
 	modules/lang.js		\
 	modules/jsUnit.js	\
 	modules/signals.js	\
-	modules/dbus.js		\
 	modules/promise.js	\
 	modules/format.js
 
-gjsnative_LTLIBRARIES += console.la debugger.la langNative.la mainloop.la gettextNative.la dbusNative.la system.la formatNative.la
+gjsnative_LTLIBRARIES += console.la debugger.la langNative.la mainloop.la gettextNative.la system.la formatNative.la
 
 if ENABLE_CAIRO
 dist_gjsjs_DATA +=		\
@@ -137,24 +136,6 @@ debugger_la_SOURCES =		\
 	modules/debugger.h	\
 	modules/debugger.c
 
-dbusNative_la_SOURCES =	\
-	modules/dbus-exports.h	\
-	modules/dbus-values.h	\
-	modules/dbus.h		\
-	modules/dbus-exports.c	\
-	modules/dbus-values.c	\
-	modules/dbus.c
-dbusNative_la_CFLAGS = 					\
-	$(JS_NATIVE_MODULE_CFLAGS) 		\
-	$(GJS_DBUS_CFLAGS)
-dbusNative_la_LIBADD = \
-	libgjs.la				\
-	libgjs-dbus.la				\
-	$(JS_NATIVE_MODULE_LIBADD) 		\
-	$(GJS_DBUS_LIBS)
-dbusNative_la_LDFLAGS = 				\
-	$(JS_NATIVE_MODULE_LDFLAGS)
-
 formatNative_la_CFLAGS = \
 	$(JS_NATIVE_MODULE_CFLAGS)
 formatNative_la_LIBADD = \
diff --git a/Makefile.am b/Makefile.am
index 97ea9ca..0083020 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -189,7 +189,6 @@ tapsetdir   = $(DESTDIR)$(datadir)/systemtap/tapset
 tapset_DATA = $(tapset_in_files:.stp.in=.stp)
 endif
 
-include Makefile-gjs-dbus.am
 include Makefile-modules.am
 include Makefile-examples.am
 
diff --git a/configure.ac b/configure.ac
index ccc13ed..726ba29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,6 @@ common_packages="gmodule-2.0 gthread-2.0 gio-2.0 >= glib_required_version mozjs1
 gjs_packages="gobject-introspection-1.0 libffi $common_packages"
 gjs_cairo_gobject_packages="cairo-gobject $common_packages"
 gjs_cairo_packages="cairo $common_packages"
-gjs_dbus_packages="dbus-glib-1 $common_packages"
 gjs_gdbus_packages="gobject-2.0 >= glib_required_version gio-2.0"
 # gjs-tests links against everything
 gjstests_packages="$gjstests_packages $gjs_packages"
@@ -119,19 +118,11 @@ AS_IF([test x$with_cairo = xyes], [
   ])
 ])
 AM_CONDITIONAL(ENABLE_CAIRO, test x$with_cairo = xyes)
-PKG_CHECK_MODULES([GJS_DBUS], [$gjs_dbus_packages])
 PKG_CHECK_MODULES([GJS_GDBUS], [$gjs_gdbus_packages])
 
 AC_ARG_ENABLE(tests,[  --disable-tests           disable test libraries ], enable_tests=$enableval,enable_tests=yes)
 AM_CONDITIONAL(ENABLE_TESTS, test x$with_cairo = xyes && test x$enable_tests = xyes)
 
-saved_CFLAGS=$CFLAGS
-CFLAGS=$GJS_DBUS_CFLAGS
-saved_LIBS=$LIBS
-LIBS=$GJS_DBUS_LIBS
-AC_CHECK_FUNCS(dbus_message_iter_abandon_container)
-CFLAGS=$saved_CFLAGS
-LIBS=$saved_LIBS
 PKG_CHECK_MODULES([GJSTESTS], [$gjstests_packages])
 
 GI_DATADIR=$($PKG_CONFIG --variable=gidatadir gobject-introspection-1.0)
@@ -242,5 +233,5 @@ gjsnativedir="\${libdir}/gjs-1.0"
 AC_SUBST([gjsjsdir])
 AC_SUBST([gjsnativedir])
 
-AC_CONFIG_FILES([Makefile gjs-1.0.pc gjs-dbus-1.0.pc gjs-internals-1.0.pc])
+AC_CONFIG_FILES([Makefile gjs-1.0.pc gjs-internals-1.0.pc])
 AC_OUTPUT
diff --git a/gjs/mem.c b/gjs/mem.c
index e6a65e3..02a23a3 100644
--- a/gjs/mem.c
+++ b/gjs/mem.c
@@ -39,7 +39,6 @@ GJS_DEFINE_COUNTER(boxed)
 GJS_DEFINE_COUNTER(gerror)
 GJS_DEFINE_COUNTER(closure)
 GJS_DEFINE_COUNTER(database)
-GJS_DEFINE_COUNTER(dbus_exports)
 GJS_DEFINE_COUNTER(function)
 GJS_DEFINE_COUNTER(importer)
 GJS_DEFINE_COUNTER(ns)
@@ -58,7 +57,6 @@ static GjsMemCounter* counters[] = {
     GJS_LIST_COUNTER(gerror),
     GJS_LIST_COUNTER(closure),
     GJS_LIST_COUNTER(database),
-    GJS_LIST_COUNTER(dbus_exports),
     GJS_LIST_COUNTER(function),
     GJS_LIST_COUNTER(importer),
     GJS_LIST_COUNTER(ns),
diff --git a/gjs/mem.h b/gjs/mem.h
index a23a68d..1ee2604 100644
--- a/gjs/mem.h
+++ b/gjs/mem.h
@@ -47,7 +47,6 @@ GJS_DECLARE_COUNTER(boxed)
 GJS_DECLARE_COUNTER(gerror)
 GJS_DECLARE_COUNTER(closure)
 GJS_DECLARE_COUNTER(database)
-GJS_DECLARE_COUNTER(dbus_exports)
 GJS_DECLARE_COUNTER(function)
 GJS_DECLARE_COUNTER(importer)
 GJS_DECLARE_COUNTER(ns)
diff --git a/util/log.c b/util/log.c
index 64971a0..1475d25 100644
--- a/util/log.c
+++ b/util/log.c
@@ -219,12 +219,6 @@ gjs_debug(GjsDebugTopic topic,
     case GJS_DEBUG_NATIVE:
         prefix = "JS NATIVE";
         break;
-    case GJS_DEBUG_DBUS:
-        prefix = "JS DBUS";
-        break;
-    case GJS_DEBUG_DBUS_MARSHAL:
-        prefix = "JS DBUS MARSHAL";
-        break;
     case GJS_DEBUG_KEEP_ALIVE:
         prefix = "JS KP ALV";
         break;
diff --git a/util/log.h b/util/log.h
index 777fe28..05937fb 100644
--- a/util/log.h
+++ b/util/log.h
@@ -42,8 +42,6 @@ typedef enum {
     GJS_DEBUG_CONTEXT,
     GJS_DEBUG_IMPORTER,
     GJS_DEBUG_NATIVE,
-    GJS_DEBUG_DBUS,
-    GJS_DEBUG_DBUS_MARSHAL,
     GJS_DEBUG_KEEP_ALIVE,
     GJS_DEBUG_GREPO,
     GJS_DEBUG_GNAMESPACE,
@@ -113,12 +111,6 @@ typedef enum {
 #define GJS_VERBOSE_ENABLE_GSIGNAL 0
 #endif
 
-/* Whether to log dbus argument marshaling
- */
-#ifndef GJS_VERBOSE_ENABLE_DBUS_MARSHAL
-#define GJS_VERBOSE_ENABLE_DBUS_MARSHAL 0
-#endif
-
 #if GJS_VERBOSE_ENABLE_PROPS
 #define gjs_debug_jsprop(topic, format...) \
     do { gjs_debug(topic, format); } while(0)
@@ -161,13 +153,6 @@ typedef enum {
 #define gjs_debug_gsignal(format...)
 #endif
 
-#if GJS_VERBOSE_ENABLE_DBUS_MARSHAL
-#define gjs_debug_dbus_marshal(format...) \
-    do { gjs_debug(GJS_DEBUG_DBUS_MARSHAL, format); } while(0)
-#else
-#define gjs_debug_dbus_marshal(format...)
-#endif
-
 void gjs_fatal(const char *format,
                ...) G_GNUC_PRINTF (1, 2) G_GNUC_NORETURN;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]