GNOME.org
 

[yelp/webkit: 23/23] Merge branch 'master' into webkit

commit f26a70b84182e20a09f6231a41cd5d0626cc6d60
Merge: b4a68d7... c41ad98...
Author: Frédéric Péters <fpeters 0d be>
Date:   Thu Aug 20 15:37:11 2009 +0200

    Merge branch 'master' into webkit
    
    Conflicts:
    	configure.in
    	po/nb.po
    	src/Makefile.am
    	src/yelp-main.c

 Makefile.am                   |    2 +-
 NEWS                          |   13 +
 configure.in                  |   37 +-
 po/POTFILES.in                |    2 +
 po/bg.po                      |  266 +++++----
 po/de.po                      |  309 ++++++----
 po/es.po                      |  210 ++++--
 po/et.po                      |   58 ++-
 po/fi.po                      |  206 ++++--
 po/fr.po                      |  208 ++++--
 po/ga.po                      |  402 +++++++-----
 po/gl.po                      |  317 +++++----
 po/it.po                      |  281 +++++---
 po/nb.po                      |  265 ++++----
 po/pt_BR.po                   |  310 ++++++----
 po/sv.po                      |  215 ++++---
 po/zh_HK.po                   |  279 +++++---
 po/zh_TW.po                   |  279 +++++---
 src/Makefile.am               |   33 +-
 src/eggdesktopfile.c          | 1477 +++++++++++++++++++++++++++++++++++++++++
 src/eggdesktopfile.h          |  159 +++++
 src/eggsmclient-osx.c         |  235 +++++++
 src/eggsmclient-private.h     |   53 ++
 src/eggsmclient-win32.c       |  353 ++++++++++
 src/eggsmclient-xsmp.c        | 1405 +++++++++++++++++++++++++++++++++++++++
 src/eggsmclient.c             |  610 +++++++++++++++++
 src/eggsmclient.h             |  123 ++++
 src/test-uri.c                |  137 ----
 src/yelp-main.c               |   88 ++--
 src/yelp-mallard.c            |    2 +-
 src/yelp-utils.c              |   37 +-
 tests/Makefile.am             |   10 +
 tests/test-uri.c              |  208 ++++++
 tests/uri/man-1.test          |    4 +
 tests/uri/man-2.test          |    4 +
 tests/uri/path-docbook-1.test |    4 +
 tests/uri/path-mallard-1.test |    4 +
 37 files changed, 6992 insertions(+), 1613 deletions(-)
---
diff --cc Makefile.am
index 521669c,f79bc3b..9ccead5
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,5 -1,7 +1,5 @@@
- SUBDIRS = src stylesheets po data
+ SUBDIRS = src stylesheets po data tests
  
 -ACLOCAL_AMFLAGS = -I m4
 -
  @INTLTOOL_DESKTOP_RULE@
  
  desktopdir = $(datadir)/applications
diff --cc configure.in
index 41b18cb,7bc3abb..c4ed293
--- a/configure.in
+++ b/configure.in
@@@ -212,21 -224,72 +210,49 @@@ dnl <= Check for bzip2 > 1.0.
      dnl =>
  AC_SUBST(BZ_LIBS)
  
 -
  # *****
 -# Gecko
 +# Webkit
  # *****
 -
 -GECKO_INIT([MOZILLA])
 -GECKO_DEFINES
 -
 -AC_SUBST([MOZILLA])
 -AC_SUBST([MOZILLA_FLAVOUR])
 -AC_SUBST([MOZILLA_INCLUDE_ROOT])
 -AC_SUBST([MOZILLA_HOME])
 -AC_SUBST([MOZILLA_PREFIX])
 -AC_SUBST([MOZILLA_EXTRA_LIBS])
 -AC_SUBST([MOZILLA_GLUE_LIBS])
 -
 -case "$MOZILLA" in
 -xulrunner) gecko_min_version=1.8 ;;
 -libxul*) gecko_min_version=1.9 ;;
 -*firefox) gecko_min_version=1.5 ;;
 -*) AC_MSG_ERROR([$gecko_cv_gecko is not supported])
 -esac
 -
 -if test "$MOZILLA" = "libxul-embedding" -o "$MOZILLA" = "libxul"; then
 -	PKG_CHECK_MODULES([MOZILLA_COMPONENT],[$MOZILLA $gecko_cv_extra_pkg_dependencies])
 -	MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS `$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --define-variable=includetype=unstable --cflags ${gecko_cv_gecko}`"
 -else
 -	PKG_CHECK_MODULES([MOZILLA_COMPONENT],[${gecko_cv_gecko}-xpcom >= $gecko_min_version $gecko_cv_extra_pkg_dependencies])
 -fi
 +  PKG_CHECK_MODULES(YELP_WEBKIT, "webkit-1.0")
 +  AC_SUBST(YELP_WEBKIT_CFLAGS)
 +  AC_SUBST(YELP_WEBKIT_LIBS)
 +  AC_DEFINE(WEBKIT_BACKEND, 1, [Webkit Backend])
  
- # More flags
+ # *****
+ # SMClient
+ # *****
+ 
+ GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
+ 
+ SMCLIENT_PKGS=
+ AC_MSG_CHECKING([which smclient backend to use])
+ AC_ARG_WITH([smclient],
+   [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
+   [],
+   [case "$GDK_TARGET" in
+     x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
+     win32|quartz) with_smclient=$GDK_TARGET ;;
+     *) with_smclient=no ;;
+    esac])
+ AC_MSG_RESULT([$with_smclient])
+ 
+ if test "$with_smclient" != "no"; then
+   PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
+   AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+ fi
+ 
+ AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
+ AM_CONDITIONAL([WITH_SMCLIENT_XSMP],[test "$with_smclient" = "xsmp"])
+ AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])
+ AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
+ 
+ # Set flags
 -
  AM_CPPFLAGS="$AM_CPPFLAGS $DEPRECATION_FLAGS"
  AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS $MORE_WARN_FLAGS"
 -AM_CXXFLAGS="$AM_CXXFLAGS $WARN_CXXFLAGS $MOZILLA_WARN_CXXFLAGS"
 +
 +
  AC_SUBST([AM_CPPFLAGS])
  AC_SUBST([AM_CFLAGS])
 -AC_SUBST([AM_CXXFLAGS])
  AC_SUBST([AM_LDFLAGS])
  
  AC_CONFIG_FILES([
@@@ -256,4 -320,7 +283,6 @@@ yelp-$VERSION
  
  	Debug enabled:            ${enable_debug}
  	Search backend:           ${search_backend}
 -	Mozilla version:          ${MOZILLA}
+ 	Using SMClient:           ${with_smclient}
+ 
  "
diff --cc src/Makefile.am
index f0fec29,4d7cb70..39575fb
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@@ -64,6 -97,33 +64,29 @@@ yelp_LDADD =				
  
  yelp_LDFLAGS = $(AM_LDFLAGS)
  
 -if !HAVE_GECKO_XPCOM_GLUE
 -yelp_LDFLAGS += -R$(MOZILLA_HOME)
 -endif
 -
+ if WITH_SMCLIENT
+ yelp_SOURCES += \
+ 	eggdesktopfile.c \
+ 	eggdesktopfile.h \
+ 	eggsmclient.c \
+ 	eggsmclient.h \
+ 	eggsmclient-private.h \
+ 	$(NULL)
+ yelp_CFLAGS += $(SMCLIENT_CFLAGS)
+ yelp_LDADD += $(SMCLIENT_LIBS)
+ 
+ if WITH_SMCLIENT_XSMP
+ yelp_SOURCES += eggsmclient-xsmp.c
+ yelp_CPPFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP
+ endif
+ if WITH_SMCLIENT_WIN32
+ yelp_SOURCES += eggsmclient-win32.c
+ endif
+ if WITH_SMCLIENT_QUARTZ
+ yelp_SOURCES += eggsmclient-osx.c
+ endif
+ endif
+ 
  #check_PROGRAMS =		\
  #	test-document		\
  #	test-man-parser		\
diff --cc src/yelp-main.c
index b6b1e47,41e7051..c88f26f
--- a/src/yelp-main.c
+++ b/src/yelp-main.c
@@@ -30,11 -30,10 +30,11 @@@
  #include <dbus/dbus-glib-bindings.h>
  #include <string.h>
  #include <stdlib.h>
 +#include <libxslt/xslt.h>
  
+ #ifdef WITH_SMCLIENT
+ #include "eggsmclient.h"
+ #endif /* WITH_SMCLIENT */
  #include "client-bindings.h"
  #include "yelp-window.h"
  #include "yelp-base.h"
@@@ -345,8 -343,6 +344,7 @@@ main (int argc, char **argv
  	bindtextdomain(GETTEXT_PACKAGE, GNOMELOCALEDIR);  
          bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
  	textdomain(GETTEXT_PACKAGE);
 + 	xsltInit ();
- 	g_thread_init (NULL);
  
  	local_id = (gchar *) g_getenv ("DESKTOP_STARTUP_ID");
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]