getting rid of stupid dbus client-server

svn path=/trunk/; revision=178

3 files changed, 1 insertions, 113 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index d79e0ad..cf543b9 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,16 +1,5 @@
 noinst_PROGRAMS = gkbd-indicator-test \
-                  gkbd-keyboard-drawing-test \
-                  gkbd-config-registry-server
-
-gkbd_config_registry_server_CFLAGS=			\
-	$(WARN_CFLAGS) -I$(top_srcdir) -Wall -Werror			\
-	$(DBUS_CFLAGS)					\
-	$(LIBXKLAVIER_CFLAGS)				
-
-gkbd_config_registry_server_LDFLAGS=			\
-	$(DBUS_LIBS)					\
-	$(LIBXKLAVIER_LIBS)				\
-	$(top_builddir)/libgnomekbd/libgnomekbd.la
+                  gkbd-keyboard-drawing-test
 
 gkbd_indicator_test_CFLAGS=			\
 	$(WARN_CFLAGS) -I$(top_srcdir) -Wall -Werror			\
@@ -40,5 +29,3 @@ gkbd_keyboard_drawing_test_LDFLAGS=				\
 	$(LIBXKLAVIER_LIBS)				\
 	$(top_builddir)/libgnomekbd/libgnomekbd.la	\
 	$(top_builddir)/libgnomekbd/libgnomekbdui.la
-
-EXTRA_DIST = gkbd-config-registry-client.sh
diff --git a/test/gkbd-config-registry-client.sh b/test/gkbd-config-registry-client.sh
deleted file mode 100755
index 6b98fc2..0000000
--- a/test/gkbd-config-registry-client.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-# 
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU Library General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-
-#
-# $Id$
-#
-# This tiny script is expected to test the available keyboard config registry, 
-# getting descriptions out of it
-#
-
-objname=GkbdConfigRegistry
-method=GetDescriptionsAsUtf8
-
-# Old:
-#objname=KeyboardConfigRegistry
-#method=GetCurrentDescriptionsAsUtf8
-
-dbus-send --session \
-          --dest=org.gnome.$objname \
-          --type=method_call \
-          --print-reply \
-          --reply-timeout=20000 \
-          /org/gnome/$objname \
-          org.gnome.$objname.$method \
-	  array:string:"us","ru","fr","de","il" \
-	  array:string:"basic","winkeys","","deadkeys","dummy"
diff --git a/test/gkbd-config-registry-server.c b/test/gkbd-config-registry-server.c
deleted file mode 100644
index b4c0fac..0000000
--- a/test/gkbd-config-registry-server.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2006 Sergey V. Udaltsov <svu@gnome.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <X11/Xlib.h>
-#include <libxklavier/xklavier.h>
-#include <dbus/dbus-glib-bindings.h>
-
-#ifdef HAVE_SETLOCALE
-# include <locale.h>
-#endif
-
-#include "libgnomekbd/gkbd-config-registry.h"
-
-static GMainLoop *loop;
-
-int
-main ()
-{
-	GkbdConfigRegistry *reg;
-
-	g_type_init_with_debug_flags (G_TYPE_DEBUG_OBJECTS |
-				      G_TYPE_DEBUG_SIGNALS);
-
-#ifdef HAVE_SETLOCALE
-	setlocale(LC_ALL, "");
-#endif
-
-	reg = GKBD_CONFIG_REGISTRY (g_object_new
-				    (gkbd_config_registry_get_type
-				     (), NULL));
-
-	loop = g_main_loop_new (NULL, FALSE);
-
-	g_main_loop_run (loop);
-
-	g_object_unref (reg);
-
-	return 0;
-}