gnome-bluetooth r301 - in trunk: . data obex src

[hadess svn gnome org]

Author: hadess
Date: Thu Feb 19 16:50:53 2009
New Revision: 301
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=301&view=rev

Log:
2009-02-19  Bastien Nocera  <hadess hadess net>

	* Makefile.am:
	* configure.in:
	* data/.cvsignore:
	* data/Makefile.am:
	* data/gnome-obex-server.schemas.in:
	* obex/.cvsignore:
	* obex/Makefile.am:
	* obex/gnome-obex-server.c:
	* obex/gnome-obex-server.desktop.in:
	* obex/util.c:
	* obex/util.h:
	* src/Makefile.am:
	* src/fileactiondialog.gob:
	* src/gnomebt-fileactiondialog-test.c:
	* src/gnomebt-icons.c:
	* src/gnomebt-icons.h:
	* src/gnomebt-permissiondialog-test.c:
	* src/permissiondialog.gob: Remove gnome-obex-server,
	it's been replaced by gnome-user-share a long time ago,
	remove unused permission and fileaction dialogues



Removed:
   trunk/data/
   trunk/obex/
   trunk/src/fileactiondialog.gob
   trunk/src/gnomebt-fileactiondialog-test.c
   trunk/src/gnomebt-icons.c
   trunk/src/gnomebt-icons.h
   trunk/src/gnomebt-permissiondialog-test.c
   trunk/src/permissiondialog.gob
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/src/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Feb 19 16:50:53 2009
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po src obex data pixmaps
+SUBDIRS = po src pixmaps
 
 EXTRA_DIST = \
 	intltool-extract.in intltool-merge.in intltool-update.in \

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb 19 16:50:53 2009
@@ -108,11 +108,9 @@
 AC_CONFIG_FILES([
 Makefile
 gnome-bluetooth.pc
-data/Makefile
 pixmaps/Makefile
 src/Makefile
 po/Makefile.in
-obex/Makefile
 ])
 
 AC_OUTPUT

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Feb 19 16:50:53 2009
@@ -10,24 +10,19 @@
 	-I$(srcdir) -I../src
 
 noinst_PROGRAMS=gconftest gnomebt-controller-test \
-	gnomebt-chooser-test gnomebt-permissiondialog-test \
-	gnomebt-fileactiondialog-test spinner-test
+	gnomebt-chooser-test spinner-test
 
 lib_LTLIBRARIES = libgnomebt.la
 py_LTLIBRARIES = controller.la chooser.la
 
 libgnomebt_la_SOURCES = \
 	gnomebt-controller.c gnomebt-controller.h \
-	gnomebt-permissiondialog.c gnomebt-permissiondialog.h \
 	gnomebt-spinner.c gnomebt-spinner.h \
-	gnomebt-chooser.c gnomebt-chooser.h \
-	gnomebt-icons.c gnomebt-icons.h \
-	gnomebt-fileactiondialog.c gnomebt-fileactiondialog.h
+	gnomebt-chooser.c gnomebt-chooser.h
 
 pkginclude_HEADERS = \
-	gnomebt-icons.h gnomebt-chooser.h gnomebt-spinner.h \
-	gnomebt-controller.h gnomebt-permissiondialog.h \
-	gnomebt-fileactiondialog.h
+	gnomebt-chooser.h gnomebt-spinner.h \
+	gnomebt-controller.h
 
 gnomebt-chooser.lo: gnomebt-controller.h gnomebt-spinner.h
 
@@ -47,18 +42,6 @@
 gnomebt_controller_test_LDADD = \
 	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
 
-gnomebt_fileactiondialog_test_SOURCES = \
-	gnomebt-fileactiondialog-test.c
-
-gnomebt_fileactiondialog_test_LDADD = \
-	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
-
-gnomebt_permissiondialog_test_SOURCES = \
-	gnomebt-permissiondialog-test.c
-
-gnomebt_permissiondialog_test_LDADD = \
-	libgnomebt.la $(GNOME_BLUETOOTH_LIBS)
-
 spinner_test_SOURCES = \
 	spinner-test.c
 
@@ -72,8 +55,7 @@
 	$(GNOME_BLUETOOTH_LIBS) $(BLUETOOTH_LIBS)
 
 GOB_DIST = \
-	spinner.gob chooser.gob controller.gob permissiondialog.gob \
-	fileactiondialog.gob
+	spinner.gob chooser.gob controller.gob
 
 CTAGS_ARGS = --langmap=c++:.gob \
 	$(GOB_DIST)
@@ -81,9 +63,7 @@
 BUILT_SOURCES = \
 	gnomebt-spinner.c gnomebt-spinner.h gnomebt-spinner-private.h \
 	gnomebt-chooser.c gnomebt-chooser.h gnomebt-chooser-private.h \
-	gnomebt-controller.c gnomebt-controller.h gnomebt-controller-private.h \
-	gnomebt-permissiondialog.c gnomebt-permissiondialog.h gnomebt-permissiondialog-private.h \
-	gnomebt-fileactiondialog.c gnomebt-fileactiondialog.h gnomebt-fileactiondialog-private.h
+	gnomebt-controller.c gnomebt-controller.h gnomebt-controller-private.h
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
@@ -102,7 +82,6 @@
 	     gnomebt-chooser.c gnomebt-chooser.h gnomebt-chooser-private.h		\
 	     gnomebt-controller.c gnomebt-controller.h gnomebt-controller-private.h	\
 	     gnomebt-fileactiondialog.c gnomebt-fileactiondialog.h gnomebt-fileactiondialog-private.h	\
-	     gnomebt-permissiondialog.c gnomebt-permissiondialog.h gnomebt-permissiondialog-private.h	\
 	     gnomebt-spinner.c gnomebt-spinner.h gnomebt-spinner-private.h
 
 gnomebt-controller.defs: gnomebt-controller.h