seahorse r2760 - in seahorse-plugins/trunk: . plugins/epiphany
- From: sadam svn gnome org
- To: svn-commits-list gnome org
- Subject: seahorse r2760 - in seahorse-plugins/trunk: . plugins/epiphany
- Date: Wed, 4 Feb 2009 18:19:05 +0000 (UTC)
Author: sadam
Date: Wed Feb 4 18:19:05 2009
New Revision: 2760
URL: http://svn.gnome.org/viewvc/seahorse?rev=2760&view=rev
Log:
2009-02-04 Adam Schreiber <sadam clemson edu>
* configure.in:
* plugins/epiphany/seahorse-extension.c: Update version number to
2.25.91
Update epiphany checking code. Patch from Christian Persch.
Fixes bugs #570525 and #570494
Modified:
seahorse-plugins/trunk/ChangeLog
seahorse-plugins/trunk/configure.in
seahorse-plugins/trunk/plugins/epiphany/seahorse-extension.c
Modified: seahorse-plugins/trunk/configure.in
==============================================================================
--- seahorse-plugins/trunk/configure.in (original)
+++ seahorse-plugins/trunk/configure.in Wed Feb 4 18:19:05 2009
@@ -5,7 +5,7 @@
dnl ****************************************************************************
dnl MAIN SEAHORSE VERSION (update after release)
-AC_INIT(seahorse-plugins, 2.25.90)
+AC_INIT(seahorse-plugins, 2.25.91)
dnl ****************************************************************************
@@ -284,8 +284,7 @@
with_epiphany_plugin="no"
-EPIPHANY_API_VERSION=2.14
-EPIPHANY_REQUIRED=2.14.0
+EPIPHANY_REQUIRED=2.24.0
EPIPHANY_LIBXML_REQUIRED=2.6.0
EPIPHANY_LIBGLIB_REQUIRED=2.10.0
EPIPHANY_LIBGTK_REQUIRED=2.8.0
@@ -339,63 +338,28 @@
*firefox) min_version=1.5 ;;
*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
esac
+
+AC_MSG_CHECKING([for Epiphany API version])
+apis="2.26 2.25 2.24"
+epiphany_api_version=
+for api in $apis; do
+ PKG_CHECK_EXISTS([epiphany-$api],[epiphany_api_version=$api; break],[])
+done
+AC_MSG_RESULT([$epiphany_api_version])
+
+if test -z "$epiphany_api_version"; then
+ AC_MSG_ERROR([epiphany not found])
+fi
- PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.24 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.24 e_api_minor=24],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.23 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.23 e_api_minor=23],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.22 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.22 e_api_minor=22],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.20 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.20 e_api_minor=20],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.18 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.18 e_api_minor=18],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.16 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.16 e_api_minor=16],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.14 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.14 e_api_minor=14],[with_epiphany_plugin=no; echo "no"; echo "disabling epiphany plugin"])])])])])])])
+ PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
+ libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
+ libglade-2.0 \
+ glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
+ gmodule-2.0 \
+ gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
+ epiphany-$epiphany_api_version >= $EPIPHANY_REQUIRED],
+ [with_epiphany_plugin=yes E_API_VERSION=$epiphany_api_version],
+ [with_epiphany_plugin=no; echo "no"; echo "disabling epiphany plugin"])
else
echo "disabling epiphany plugin"
fi
@@ -415,12 +379,6 @@
if test "$with_epiphany_plugin" = "yes"; then
echo "enabling epiphany plugin"
- if test "$e_api_minor" -ge 21; then
- AC_DEFINE([EPHY_NOTAB], 1, [Defines whether EphyTab exists in the API])
- else
- AC_DEFINE([EPHY_NOTAB], 0, [Defines whether EphyTab exists in the API])
- fi
-
EPIPHANY_EXTENSION_INIT([$E_API_VERSION], [$EPIPHANY_REQUIRED])
AC_SUBST([E_API_VERSION])
Modified: seahorse-plugins/trunk/plugins/epiphany/seahorse-extension.c
==============================================================================
--- seahorse-plugins/trunk/plugins/epiphany/seahorse-extension.c (original)
+++ seahorse-plugins/trunk/plugins/epiphany/seahorse-extension.c Wed Feb 4 18:19:05 2009
@@ -603,44 +603,22 @@
}
-#if EPHY_NOTAB == 1
static void
impl_attach_tab (EphyExtension *extension,
EphyWindow *window,
EphyEmbed *embed)
{
-#else
-static void
-impl_attach_tab (EphyExtension *extension,
- EphyWindow *window,
- EphyTab *tab)
-{
- EphyEmbed *embed;
-
- embed = ephy_tab_get_embed (tab);
-#endif
g_return_if_fail (EPHY_IS_EMBED (embed));
g_signal_connect (embed, "ge_context_menu",
G_CALLBACK (context_menu_cb), window);
}
-#if EPHY_NOTAB == 1
static void
impl_detach_tab (EphyExtension *extension,
EphyWindow *window,
EphyEmbed *embed)
{
-#else
-static void
-impl_detach_tab (EphyExtension *extension,
- EphyWindow *window,
- EphyTab *tab)
-{
- EphyEmbed *embed;
-
- embed = ephy_tab_get_embed (tab);
-#endif
g_return_if_fail (EPHY_IS_EMBED (embed));
g_signal_handlers_disconnect_by_func
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
