[yelp] [yelp-application] Finish transition to GDBus

[Shaun McCance <shaunm src gnome org>]

commit a0850704edae13921c3674a278de6708cd8a12e7
Author: Shaun McCance <shaunm gnome org>
Date:   Sun Jun 27 13:54:06 2010 -0400

    [yelp-application] Finish transition to GDBus

 configure.ac           |    1 -
 src/Makefile.am        |   17 -----------------
 src/yelp-application.c |   10 +---------
 src/yelp-dbus.xml      |   10 ----------
 4 files changed, 1 insertions(+), 37 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 867ead5..33b04eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,6 @@ PKG_CHECK_MODULES(YELP,
 	libxml-2.0 >= 2.6.5
 	libxslt >= 1.1.4
 	libexslt >= 0.8.1
-	dbus-glib-1
 	webkit-1.0 >= 1.3.1
 	yelp-xsl >= 2.31.3
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index fa4cdd9..d4655b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,23 +39,6 @@ yelp_LDADD =					\
 
 yelp_LDFLAGS = $(AM_LDFLAGS)
 
-
-BUILT_SOURCES = yelp-dbus.h
-
-noinst_HEADERS = $(BUILT_SOURCES)
-
-yelp-dbus.h: yelp-dbus.xml
-	dbus-binding-tool --prefix=yelp --mode=glib-server $<> $@
-
-MAINTAINERCLEANFILES = $(BUILT_SOURCES)
-
-EXTRA_DIST = yelp-dbus.xml
-
 install-exec-hook:
 	rm -f $(DESTDIR)$(bindir)/gnome-help && \
 	$(LN_S) yelp $(DESTDIR)$(bindir)/gnome-help
-
-distclean-local:
-	if test $(srcdir) != .; then \
-	  rm -f $(MAINTAINERCLEANFILES); \
-	fi
diff --git a/src/yelp-application.c b/src/yelp-application.c
index 5ac5d34..9fcba5d 100644
--- a/src/yelp-application.c
+++ b/src/yelp-application.c
@@ -26,8 +26,6 @@
 
 #define G_SETTINGS_ENABLE_BACKEND
 
-#include <dbus/dbus-glib-bindings.h>
-#include <dbus/dbus-glib.h>
 #include <gio/gio.h>
 #include <gio/gsettingsbackend.h>
 #include <glib/gi18n.h>
@@ -38,7 +36,6 @@
 #include "yelp-view.h"
 
 #include "yelp-application.h"
-#include "yelp-dbus.h"
 #include "yelp-window.h"
 
 #define DEFAULT_URI "ghelp:user-guide"
@@ -173,9 +170,6 @@ yelp_application_class_init (YelpApplicationClass *klass)
                       g_cclosure_marshal_VOID__STRING,
                       G_TYPE_NONE, 1, G_TYPE_STRING);
 
-    dbus_g_object_type_install_info (YELP_TYPE_APPLICATION,
-                                     &dbus_glib_yelp_object_info);
-
     g_type_class_add_private (klass, sizeof (YelpApplicationPrivate));
 }
 
@@ -365,9 +359,7 @@ yelp_application_run (YelpApplication  *app,
     g_variant_get (ret, "(u)", &request);
     g_variant_unref (ret);
 
-    if (request == DBUS_REQUEST_NAME_REPLY_EXISTS ||
-        request == DBUS_REQUEST_NAME_REPLY_IN_QUEUE) {
-
+    if (request == 2 || request == 3) { /* IN_QUEUE | EXISTS */
         gchar *newuri;
 
         if (uri && (strchr (uri, ':') || (uri[0] == '/')))