f-spot r3911 - in trunk: extensions/RawPlusJpeg src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Tue May 13 11:13:13 2008
New Revision: 3911
URL: http://svn.gnome.org/viewvc/f-spot?rev=3911&view=rev

Log:
start a dbus session if none available

Modified:
   trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml
   trunk/src/f-spot.in

Modified: trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml
==============================================================================
--- trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml	(original)
+++ trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml	Tue May 13 11:13:13 2008
@@ -1,5 +1,6 @@
 <Addin namespace="FSpot"
 	id="RawPlusJpeg"
+	name="RawPlusJpeg"
 	version="0.4.3.0"
 	description="Merge RAW+Jpeg as multiple versions of the same photo"
 	author="Stephane Delcroix"

Modified: trunk/src/f-spot.in
==============================================================================
--- trunk/src/f-spot.in	(original)
+++ trunk/src/f-spot.in	Tue May 13 11:13:13 2008
@@ -8,6 +8,13 @@
 
 EXE_TO_RUN="$libdir/f-spot/f-spot.exe"
 
+if test "x$DBUS_SESSION_BUS_ADDRESS" == "x"; then
+    echo "** No session dbus found. Starting one **"
+    DBUSLAUNCH="dbus-launch" 
+else
+    DBUSLAUNCH=""
+fi
+
 if test "x$turtledir" != "x"; then
     export MONO_PATH=$turtledir/lib:$turtledir/gui:$MONO_PATH
 fi
@@ -60,5 +67,5 @@
 elif $run_gdb; then
 	gdb --eval-command=run --args mono $MONO_OPTIONS $EXE_TO_RUN "$@"
 else
-	exec -a @PACKAGE@ mono $MONO_OPTIONS $EXE_TO_RUN "$@"
+	exec -a @PACKAGE@ $DBUSLAUNCH mono $MONO_OPTIONS $EXE_TO_RUN "$@"
 fi