tomboy r2061 - in trunk: . Tomboy

[sharm svn gnome org]

Author: sharm
Date: Sun Aug  3 22:49:40 2008
New Revision: 2061
URL: http://svn.gnome.org/viewvc/tomboy?rev=2061&view=rev

Log:
* Tomboy/tomboy.in: Borrow code from Banshee to enable running tomboy
  with --debug, --profile, and --trace, without having to set
  $MONO_EXTRA_ARGS (which is still supported).  Only supported when
  running installed, for now.
* NEWS: Draft for 0.11.1.

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/Tomboy/tomboy.in

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Aug  3 22:49:40 2008
@@ -9,6 +9,13 @@
 Please report bugs using http://bugzilla.gnome.org/
 (http://bugzilla.gnome.org/enter_bug.cgi?product=Tomboy).
 
+Version 0.11.1
+* New tray icon code using GtkStatusIcon (kill libegg, #349265, Stefan Cosma).
+* Fix crashers: #544406, #460642, #544996, #523035
+* Fix bugzilla addin to accept bug IDs of one or more digits (#533024).
+* Fix behavior when start note is recreated (#508982, Jon Lund Steffensen)
+* Include .mdb files during install. Enable --debug, --trace, and --profile.
+
 Version 0.11.0
 * Update printing to use Gtk.Print (#512369, John Anderson).  Formatting and
   styles not supported yet, patches welcome.

Modified: trunk/Tomboy/tomboy.in
==============================================================================
--- trunk/Tomboy/tomboy.in	(original)
+++ trunk/Tomboy/tomboy.in	Sun Aug  3 22:49:40 2008
@@ -14,10 +14,34 @@
     export TOMBOY_WRAPPER_PATH="@bindir@/@wrapper@"
 
     THIS_EXE="@pkglibdir@/@target@"
+
+    [ -n "$TOMBOY_DEBUG" ] && TOMBOY_DEBUG="--debug"
+    [ -n "$TOMBOY_TRACE" ] && TOMBOY_TRACE="--trace=$TOMBOY_TRACE"
+    [ -n "$TOMBOY_PROFILE" ] && TOMBOY_PROFILE="--profile=$TOMBOY_PROFILE"
+
+    for arg in $*; do
+        case "x--debug" in ("x$arg")
+            TOMBOY_DEBUG=$arg
+        esac
+
+        case "x--trace=" in ("x${arg:0:8}")
+            TOMBOY_TRACE=$arg
+        esac
+
+        case "x--profile=" in ("x${arg:0:10}")
+            TOMBOY_PROFILE=$arg
+        esac
+    done
+
+    if [ -n "$TOMBOY_DEBUG" -o -n "$TOMBOY_TRACE" -o -n "$TOMBOY_PROFILE" -o -n "$MONO_EXTRA_ARGS" ]; then
+        MONO_OPTIONS="$TOMBOY_DEBUG $TOMBOY_TRACE $TOMBOY_PROFILE $MONO_EXTRA_ARGS"
+        echo "** Running Mono with $MONO_OPTIONS **"
+    fi
+
 fi
 
 if [ -n "@extragac@" ]; then
     export MONO_GAC_PREFIX="@extragac@:$MONO_GAC_PREFIX"
 fi
 
-exec mono $MONO_EXTRA_ARGS $THIS_EXE "$@"
+exec mono $MONO_OPTIONS $THIS_EXE "$@"