GNOME.org
 

[f-spot] Remove Beagle plugin at the request of openSUSE.

commit b1888d6460618d1ef23c9af745f9c846271412f0
Author: Ruben Vermeersch <ruben savanne be>
Date:   Fri May 14 16:13:10 2010 +0200

    Remove Beagle plugin at the request of openSUSE.
    
    Beagle is being deprecated anyway.

 NEWS                                               |    1 +
 configure.ac                                       |   16 ------
 extensions/Services/BeagleService/.gitignore       |    5 --
 .../Services/BeagleService/BeagleNotifier.cs       |   49 ------------------
 .../Services/BeagleService/BeagleService.addin.xml |   15 ------
 extensions/Services/BeagleService/BeagleService.cs |   53 --------------------
 extensions/Services/BeagleService/Makefile.am      |   17 ------
 extensions/Services/Makefile.am                    |    1 -
 f-spot.csproj                                      |    6 +--
 lib/dpap-sharp/DPAPBrowser/Makefile.am             |    2 -
 lib/dpap-sharp/DPAPService/DPAPService.cs          |   24 ---------
 lib/dpap-sharp/DPAPService/Makefile.am             |    2 -
 src/f-spot.in                                      |    5 --
 13 files changed, 2 insertions(+), 194 deletions(-)
---
diff --git a/NEWS b/NEWS
index 132c3ef..adbdc7a 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ f-spot 0.6.2 - May X 2010 - Bulldozer Time
  - Avoid leakage in straighten and softfocus editor (Stephane Delcroix)
  - Allow to copy files to clipboard (Stephane Delcroix)
  - Large number of color management related fixes (Stephane Delcroix)
+ - Removed the Beagle plugin at the request of the openSUSE team (Ruben Vermeersch)
  - A pile of other cleanups and fixes (Ruben Vermeersch)
  - Tons of translation updates (seriously)
 
diff --git a/configure.ac b/configure.ac
index 5d14303..a24ad1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,7 +143,6 @@ GIOSHARP_REQUIRED=2.13.92
 GTKSHARPBEANS_REQUIRED=2.13.92
 GTKSHARP_REQUIRED=2.12.2
 GTK_REQUIRED=2.14
-BEAGLE_REQUIRED=0.3.0
 NDESK_DBUS_REQUIRED=0.4.2
 NDESK_DBUS_GLIB_REQUIRED=0.3.0
 MONO_CAIRO_REQUIRED=1.2.4
@@ -196,20 +195,6 @@ if pkg-config --at-least-version=2.16 gtk+-2.0; then
 	CSC_DEFINES="$CSC_DEFINES -d:GTK_2_16"
 fi
 
-PKG_CHECK_MODULES(BEAGLE, beagle-0.0 >= $BEAGLE_REQUIRED,
-[
-	dnl this is a work around to avoid linking against beagles Util.dll
-	BEAGLE_DIR=`$PKG_CONFIG --variable=dlldir beagle-0.0`	
-	LINK_BEAGLE="-r:$BEAGLE_DIR/Beagle"
-	CSC_DEFINES="$CSC_DEFINES -d:ENABLE_BEAGLE"
-],
-[
-	AC_MSG_RESULT([beagle not found])
-])
-AC_SUBST(BEAGLE_DIR)
-AC_SUBST(LINK_BEAGLE)
-
-
 dnl -- dbus-sharp
 PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED)
 AC_SUBST(NDESK_DBUS_LIBS)
@@ -403,7 +388,6 @@ extensions/Exporters/PicasaWebExport/Makefile
 extensions/Exporters/PicasaWebExport/google-sharp/Makefile
 extensions/Exporters/ZipExport/Makefile
 extensions/Services/Makefile
-extensions/Services/BeagleService/Makefile
 extensions/Services/DBusService/Makefile
 extensions/Tools/Makefile
 extensions/Tools/RawPlusJpeg/Makefile
diff --git a/extensions/Services/Makefile.am b/extensions/Services/Makefile.am
index 27ea46f..a6f990e 100644
--- a/extensions/Services/Makefile.am
+++ b/extensions/Services/Makefile.am
@@ -1,3 +1,2 @@
 SUBDIRS = 			\
-	BeagleService		\
 	DBusService
diff --git a/f-spot.csproj b/f-spot.csproj
index f86adb4..0b75537 100644
--- a/f-spot.csproj
+++ b/f-spot.csproj
@@ -392,8 +392,6 @@
     <Compile Include="extensions\Exporters\TabbloExport\Tabblo\Uploader.cs" />
     <Compile Include="extensions\Exporters\ZipExport\ZipExport.cs" />
     <Compile Include="extensions\Misc\LightTable\LightTable.cs" />
-    <Compile Include="extensions\Services\BeagleService\BeagleNotifier.cs" />
-    <Compile Include="extensions\Services\BeagleService\BeagleService.cs" />
     <Compile Include="extensions\Services\DBusService\DBusProxy.cs" />
     <Compile Include="extensions\Services\DBusService\DBusService.cs" />
     <Compile Include="extensions\Tools\ChangePhotoPath\ChangePhotoPathController.cs" />
@@ -921,8 +919,6 @@
     <None Include="extensions\Exporters\ZipExport\ZipExport.glade" />
     <None Include="extensions\Misc\LightTable\LightTable.addin.xml" />
     <None Include="extensions\Misc\LightTable\Photo.xaml" />
-    <None Include="extensions\Services\BeagleService\BeagleService.addin.xml" />
-    <None Include="extensions\Services\BeagleService\BeagleService.dll.mdb" />
     <None Include="extensions\Services\DBusService\DBusService.addin.xml" />
     <None Include="extensions\Services\DBusService\DBusService.dll.mdb" />
     <None Include="extensions\Tools\ChangePhotoPath\ChangeLog" />
@@ -3267,4 +3263,4 @@
   <ItemGroup>
     <Folder Include="extensions\Tools\LiveWebGallery\ui\" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/lib/dpap-sharp/DPAPBrowser/Makefile.am b/lib/dpap-sharp/DPAPBrowser/Makefile.am
index 1126e6f..3c6b424 100644
--- a/lib/dpap-sharp/DPAPBrowser/Makefile.am
+++ b/lib/dpap-sharp/DPAPBrowser/Makefile.am
@@ -8,7 +8,6 @@ PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
 
 PLUGIN_SOURCES =			\
 	$(srcdir)/DPAPBrowser.cs	
-#	$(srcdir)/BeagleNotifier.cs
 
 
 REFS =					\
@@ -17,7 +16,6 @@ REFS =					\
 	-r:../../src/FSpot.Widgets.dll \
 	-r:../../src/FSpot.Utils.dll	\
 	-r:../lib/dpap-sharp.dll	
-#	$(LINK_BEAGLE)
 
 PKGS =					\
 	-pkg:gtk-sharp-2.0
diff --git a/lib/dpap-sharp/DPAPService/DPAPService.cs b/lib/dpap-sharp/DPAPService/DPAPService.cs
index 56e5b5f..8d04893 100644
--- a/lib/dpap-sharp/DPAPService/DPAPService.cs
+++ b/lib/dpap-sharp/DPAPService/DPAPService.cs
@@ -42,14 +42,6 @@ namespace DPAP {
 			uint timer = Log.InformationTimerStart ("Starting DPAP");
 			StartServer ();
 			
-
-		/*	try {
-				Core.Database.Photos.ItemsChanged += HandleDbItemsChanged;
-			} catch {
-				Log.Warning ("unable to hook the BeagleNotifier. are you running --view mode?");
-			}*/
-		//	Log.DebugTimerPrint (timer, "BeagleService startup took {0}");
-			
 			return true;
 		}
 		private void StartServer ()
@@ -133,7 +125,6 @@ namespace DPAP {
                 //locator.Removed -= OnServiceRemoved;
                 sd = null;
             }
-			//Log.DebugTimerPrint (timer, "BeagleService shutdown took {0}");	
 			return true;
 		}
 
@@ -169,20 +160,5 @@ namespace DPAP {
 			//client.Logout ();
 		//	Console.WriteLine ("Press <enter> to exit...");
 		}		
-		
-		/*private void HandleDbItemsChanged (object sender, DbItemEventArgs args)
-		{
-#if ENABLE_BEAGLE
-			Log.Debug ("Notifying beagle");
-			foreach (DbItem item in args.Items) {
-				if (item as Photo != null)
-					try {
-						BeagleNotifier.SendUpdate (item as Photo);
-					} catch (Exception e) {
-						Log.Debug ("BeagleNotifier.SendUpdate failed with {0}", e.Message);
-					}
-			}
-#endif
-		}*/
 	}
 }
diff --git a/lib/dpap-sharp/DPAPService/Makefile.am b/lib/dpap-sharp/DPAPService/Makefile.am
index 5792034..12a0cf9 100644
--- a/lib/dpap-sharp/DPAPService/Makefile.am
+++ b/lib/dpap-sharp/DPAPService/Makefile.am
@@ -8,7 +8,6 @@ PLUGIN_ASSEMBLY = $(PLUGIN_NAME).dll
 
 PLUGIN_SOURCES =			\
 	$(srcdir)/DPAPService.cs	
-#	$(srcdir)/BeagleNotifier.cs
 
 
 REFS =					\
@@ -17,7 +16,6 @@ REFS =					\
 	-r:../../src/FSpot.Widgets.dll \
 	-r:../../src/FSpot.Utils.dll	\
 	-r:../lib/dpap-sharp.dll	
-#	$(LINK_BEAGLE)
 
 PKGS =					\
 	-pkg:gnome-sharp-2.0		\
diff --git a/src/f-spot.in b/src/f-spot.in
index fc7d296..0145a95 100644
--- a/src/f-spot.in
+++ b/src/f-spot.in
@@ -4,7 +4,6 @@ prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@ 
 turtledir= TURTLEDIR@
-beagledir= BEAGLE_DIR@
 
 EXE_TO_RUN="$libdir/f-spot/f-spot.exe"
 
@@ -19,10 +18,6 @@ if test "x$turtledir" != "x"; then
     export MONO_PATH=$turtledir/lib:$turtledir/gui:$MONO_PATH
 fi
 
-if test "x$beagledir" != "x"; then
-    export MONO_PATH=$beagledir:$MONO_PATH
-fi
-
 [ -n "$FSPOT_DEBUG" ] && FSPOT_DEBUG="--debug"
 [ -n "$FSPOT_TRACE" ] && FSPOT_TRACE="--trace=$FSPOT_TRACE"
 [ -n "$FSPOT_PROFILE" ] && FSPOT_PROFILE="--profile=$FSPOT_PROFILE"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]