diff options
| author | JP Rosevear <jpr@novell.com> | 2004-10-01 13:30:22 +0800 |
|---|---|---|
| committer | JP Rosevear <jpr@src.gnome.org> | 2004-10-01 13:30:22 +0800 |
| commit | 490736b2b985784d5ee203a47fc38c84f4a8238b (patch) | |
| tree | 5cc06fc112ad2dedae8f3a49c376ac24a3dc595f | |
| parent | 985ea02bdba960ab49e4992cd86d2827548c41cf (diff) | |
| download | gsoc2013-evolution-490736b2b985784d5ee203a47fc38c84f4a8238b.tar.gz gsoc2013-evolution-490736b2b985784d5ee203a47fc38c84f4a8238b.tar.zst gsoc2013-evolution-490736b2b985784d5ee203a47fc38c84f4a8238b.zip | |
set a GTKHTML_API_VERSION variable
2004-10-01 JP Rosevear <jpr@novell.com>
* configure.in: set a GTKHTML_API_VERSION variable
2004-10-01 JP Rosevear <jpr@novell.com>
* e-msg-composer.c: uses GTKHTML_API_VERSION for the bonobo server
look up
svn path=/trunk/; revision=27442
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | composer/ChangeLog | 5 | ||||
| -rw-r--r-- | composer/e-msg-composer.c | 2 | ||||
| -rw-r--r-- | configure.in | 6 |
4 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2004-10-01 JP Rosevear <jpr@novell.com> + + * configure.in: set a GTKHTML_API_VERSION variable + 2004-09-13 Not Zed <NotZed@Ximian.com> * configure.in: change the way ipv6 stuff is done. separate ipv6 diff --git a/composer/ChangeLog b/composer/ChangeLog index a6649e0df6..8eabcbdc64 100644 --- a/composer/ChangeLog +++ b/composer/ChangeLog @@ -1,3 +1,8 @@ +2004-10-01 JP Rosevear <jpr@novell.com> + + * e-msg-composer.c: uses GTKHTML_API_VERSION for the bonobo server + look up + 2004-10-01 Not Zed <NotZed@Ximian.com> * e-msg-composer.c (create_composer): enable ask drop action and diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index e80b222f3b..e02f333a5b 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -130,7 +130,7 @@ #include "Editor.h" #include "listener.h" -#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor:3.1" +#define GNOME_GTKHTML_EDITOR_CONTROL_ID "OAFIID:GNOME_GtkHTML_Editor:" GTKHTML_API_VERSION #define d(x) x diff --git a/configure.in b/configure.in index 938ccd9d73..7383d2f487 100644 --- a/configure.in +++ b/configure.in @@ -45,8 +45,8 @@ dnl The controls whether things like the development warning in shell/main.c are dnl dnl This should be set to 0 for stable releases and 1 for unstable releases dnl ************************************************************************************************* -AC_SUBST(UPGRADE_REVISION) AC_DEFINE(DEVELOPMENT, 1, [If we are in development mode or not]) +AC_SUBST(DEVELOPMENT) AC_ISC_POSIX AC_PROG_CC @@ -516,6 +516,10 @@ AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.6` AC_SUBST(GTKHTML_DATADIR) +GTKHTML_API_VERSION=`$PKG_CONFIG --variable gtkhtml_apiversion libgtkhtml-3.6` +AC_DEFINE_UNQUOTED(GTKHTML_API_VERSION, "$GTKHTML_API_VERSION", [The gtkhtml api version]) + + dnl ****************************** |