tomboy r1877 - in trunk: . Tomboy Tomboy/dbus-sharp

[sharm svn gnome org]

Author: sharm
Date: Fri Feb 22 19:41:37 2008
New Revision: 1877
URL: http://svn.gnome.org/viewvc/tomboy?rev=1877&view=rev

Log:
* configure.in, Tomboy.mdp, Tomboy/dbus-sharp,
  Tomboy/dbus-sharp/dbus-sharp-glib,
  Tomboy/dbus-sharp/dbus-sharp-glib/COPYING,
  Tomboy/dbus-sharp/dbus-sharp-glib/glib,
  Tomboy/dbus-sharp/dbus-sharp-glib/glib/GLib.cs,
  Tomboy/dbus-sharp/dbus-sharp-glib/glib/GLib.IO.cs,
  Tomboy/dbus-sharp/dbus-sharp-glib/README,
  Tomboy/dbus-sharp/dbus-sharp, Tomboy/dbus-sharp/dbus-sharp/src,
  Tomboy/dbus-sharp/dbus-sharp/src/Authentication.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/BusObject.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Wrapper.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/IntrospectionSchema.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/MessageWriter.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Message.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/MatchRule.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Mapper.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/DProxy.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Address.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Bus.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/MessageFilter.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/AssemblyInfo.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Transport.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/DBus.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Connection.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Introspection.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/UnixTransport.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Protocol.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Signature.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/SocketTransport.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/Server.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/MessageReader.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/UnixNativeTransport.cs,
  Tomboy/dbus-sharp/dbus-sharp/src/ExportObject.cs,
  Tomboy/dbus-sharp/dbus-sharp/COPYING,
  Tomboy/dbus-sharp/dbus-sharp/README, Tomboy/Makefile.am: Removed
  bundled dbus-sharp, since it is a now a blessed GNOME dependency. 
  Fixes bug #509187.

Removed:
   trunk/Tomboy/dbus-sharp/
Modified:
   trunk/ChangeLog
   trunk/Tomboy.mdp
   trunk/Tomboy/Makefile.am
   trunk/configure.in

Modified: trunk/Tomboy.mdp
==============================================================================
--- trunk/Tomboy.mdp	(original)
+++ trunk/Tomboy.mdp	Fri Feb 22 19:41:37 2008
@@ -181,33 +181,6 @@
     <File name="Tomboy/Synchronization/TomboySyncClient.cs" subtype="Code" buildaction="Compile" />
     <File name="Tomboy/Synchronization/FileSystemSyncServer.cs" subtype="Code" buildaction="Compile" />
     <File name="Tomboy/Synchronization/SyncServiceAddin.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Address.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/AssemblyInfo.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Authentication.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Bus.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/BusObject.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Connection.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/DBus.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/DProxy.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/ExportObject.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Introspection.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/IntrospectionSchema.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Mapper.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/MatchRule.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Message.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/MessageFilter.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/MessageReader.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/MessageWriter.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Protocol.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Server.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Signature.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/SocketTransport.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Transport.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/UnixNativeTransport.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/UnixTransport.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp/src/Wrapper.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp-glib/glib/GLib.cs" subtype="Code" buildaction="Compile" />
-    <File name="Tomboy/dbus-sharp/dbus-sharp-glib/glib/GLib.IO.cs" subtype="Code" buildaction="Compile" />
     <File name="Tomboy/TagEntry.cs" subtype="Code" buildaction="Compile" />
     <File name="Tomboy/Search.cs" subtype="Code" buildaction="Compile" />
     <File name="Tomboy/Notebooks/Notebook.cs" subtype="Code" buildaction="Compile" />

Modified: trunk/Tomboy/Makefile.am
==============================================================================
--- trunk/Tomboy/Makefile.am	(original)
+++ trunk/Tomboy/Makefile.am	Fri Feb 22 19:41:37 2008
@@ -6,22 +6,11 @@
 WRAPPER = tomboy
 PANEL_WRAPPER = tomboy-panel
 
-DBUS_SHARP_CSFILES = \
-	$(srcdir)/dbus-sharp/dbus-sharp/src/*.cs	\
-	$(srcdir)/dbus-sharp/dbus-sharp-glib/glib/*.cs
-
 if ENABLE_DBUS
 DBUS_CSFLAGS = -define:ENABLE_DBUS
-if EXTERNAL_DBUS
 DBUS_CSFILES = 				\
 	$(srcdir)/RemoteControl.cs	\
 	$(srcdir)/RemoteControlProxy.cs
-else
-DBUS_CSFILES = 				\
-	$(DBUS_SHARP_CSFILES)		\
-	$(srcdir)/RemoteControl.cs	\
-	$(srcdir)/RemoteControlProxy.cs
-endif
 endif
 
 if FIXED_GTKSPELL
@@ -143,7 +132,6 @@
 
 EXTRA_DIST =            		\
 	$(CSFILES)      		\
-	$(DBUS_SHARP_CSFILES)		\
 	$(WRAPPER).in			\
 	$(PANEL_WRAPPER).in		\
 	$(TARGET).config.in		\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Feb 22 19:41:37 2008
@@ -116,13 +116,8 @@
 #
 DBUS_LIBS=
 if test "x$ENABLE_DBUS" != "xno" ; then
-	PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4 \
-		ndesk-dbus-glib-1.0 >= 0.3, have_external_dbus="yes", have_external_dbus="no")
-	if test "x$have_external_dbus" != "xyes"; then
-		AC_MSG_RESULT([using internal copy])
-	fi
+	PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4 ndesk-dbus-glib-1.0 >= 0.3)
 fi
-AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_external_dbus" = "xyes")
 AC_SUBST(DBUS_LIBS)
 
 #