gtkhtml r8784 - in branches/mbarnes-composer: . components/editor

[mbarnes svn gnome org]

Author: mbarnes
Date: Wed Mar 12 21:06:56 2008
New Revision: 8784
URL: http://svn.gnome.org/viewvc/gtkhtml?rev=8784&view=rev

Log:
Enable the old Bonobo-based editor by default until the new editor is
fully integrated into Evolution.


Modified:
   branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
   branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.h
   branches/mbarnes-composer/configure.in

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.c	Wed Mar 12 21:06:56 2008
@@ -79,15 +79,6 @@
  * "style-list-roman"	(radio)
  * "style-normal"	(radio)
  * "style-preformat"	(radio)
- * "template-none"	(radio)
- * "template-1"		(radio)
- * "template-2"		(radio)
- * "template-3"		(radio)
- * "template-4"		(radio)
- * "template-5"		(radio)
- * "template-6"		(radio)
- * "template-7"		(radio)
- * "template-8"		(radio)
  * "test-url"
  * "undo"
  * "unindent"

Modified: branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.h
==============================================================================
--- branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.h	(original)
+++ branches/mbarnes-composer/components/editor/gtkhtml-editor-actions.h	Wed Mar 12 21:06:56 2008
@@ -140,8 +140,6 @@
 	GTKHTML_EDITOR_ACTION ((editor), "style-h6")
 #define GTKHTML_EDITOR_ACTION_STYLE_NORMAL(editor) \
 	GTKHTML_EDITOR_ACTION ((editor), "style-normal")
-#define GTKHTML_EDITOR_ACTION_TEMPLATE_NONE(editor) \
-	GTKHTML_EDITOR_ACTION ((editor), "template-none")
 #define GTKHTML_EDITOR_ACTION_TEST_URL(editor) \
 	GTKHTML_EDITOR_ACTION ((editor), "test-url")
 #define GTKHTML_EDITOR_ACTION_UNDERLINE(editor) \

Modified: branches/mbarnes-composer/configure.in
==============================================================================
--- branches/mbarnes-composer/configure.in	(original)
+++ branches/mbarnes-composer/configure.in	Wed Mar 12 21:06:56 2008
@@ -94,8 +94,8 @@
 # Bonobo editor module
 AC_ARG_WITH(bonobo-editor,
         AC_HELP_STRING([--with-bonobo-editor],
-                [build the older Bonobo-based editor [default=no]]),
-        bonobo_editor="$withval", bonobo_editor="no")
+                [build the older Bonobo-based editor [default=yes]]),
+        bonobo_editor="$withval", bonobo_editor="yes")
 if test "x$bonobo_editor" = "xyes"; then
         EDITOR_MODULES="${GTKHTML_MODULES} libbonobo-2.0 >= libbonobo_mimimum_version libbonoboui-2.0 >= libbonoboui_minimum_version"
         PKG_CHECK_MODULES(EDITOR, $EDITOR_MODULES)