seahorse r2063 - in trunk: . plugins/epiphany
- From: sadam svn gnome org
- To: svn-commits-list gnome org
- Subject: seahorse r2063 - in trunk: . plugins/epiphany
- Date: Thu, 31 Jan 2008 03:18:40 +0000 (GMT)
Author: sadam
Date: Thu Jan 31 03:18:40 2008
New Revision: 2063
URL: http://svn.gnome.org/viewvc/seahorse?rev=2063&view=rev
Log:
2008-01-30 Adam Schreiber <sadam clemson edu>
* configure.in:
* plugins/epiphany/seahorse-extension.c: Fix building with new
Epiphany API.
Fixes bug #512837
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/plugins/epiphany/seahorse-extension.c
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Thu Jan 31 03:18:40 2008
@@ -522,7 +522,7 @@
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
epiphany-2.22 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.22],
+ [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 \
@@ -530,7 +530,7 @@
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
epiphany-2.21 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.21],
+ [with_epiphany_plugin=yes E_API_VERSION=2.21 e_api_minor=21],
[PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
libglade-2.0 \
@@ -538,7 +538,7 @@
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
epiphany-2.20 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.20],
+ [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 \
@@ -546,7 +546,7 @@
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
epiphany-2.19 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.19],
+ [with_epiphany_plugin=yes E_API_VERSION=2.19 e_api_minor=19],
[PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
libglade-2.0 \
@@ -554,7 +554,7 @@
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
epiphany-2.18 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.18],
+ [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 \
@@ -562,7 +562,7 @@
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
epiphany-2.17 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.17],
+ [with_epiphany_plugin=yes E_API_VERSION=2.17 e_api_minor=17],
[PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
libglade-2.0 \
@@ -570,7 +570,7 @@
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
epiphany-2.16 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.16],
+ [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 \
@@ -578,7 +578,7 @@
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
epiphany-2.15 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.15],
+ [with_epiphany_plugin=yes E_API_VERSION=2.15 e_api_minor=15],
[PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
libglade-2.0 \
@@ -586,7 +586,7 @@
gmodule-2.0 \
gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
epiphany-2.14 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.14],[with_epiphany_plugin=no; echo "no"; echo "disabling epiphany plugin"])])])])])])])])])
+ [with_epiphany_plugin=yes E_API_VERSION=2.14 e_api_minor=14],[with_epiphany_plugin=no; echo "no"; echo "disabling epiphany plugin"])])])])])])])])])
else
echo "disabling epiphany plugin"
fi
@@ -600,6 +600,12 @@
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: trunk/plugins/epiphany/seahorse-extension.c
==============================================================================
--- trunk/plugins/epiphany/seahorse-extension.c (original)
+++ trunk/plugins/epiphany/seahorse-extension.c Thu Jan 31 03:18:40 2008
@@ -567,6 +567,14 @@
gtk_ui_manager_ensure_update (manager);
}
+
+#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,
@@ -575,12 +583,20 @@
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,
@@ -589,6 +605,7 @@
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]
