aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@it.gnome.org>2003-07-13 17:07:08 +0800
committerMarco Pesenti Gritti <mpeseng@src.gnome.org>2003-07-13 17:07:08 +0800
commit42d8a8cb91e46a1ac29334c054ac95c5cfc9a348 (patch)
tree1a866ff0a076494805766a2f0834be80c5824cc2
parent9f70e82e7fd4d8888f55c63cf3eb911d27b0fbec (diff)
downloadgsoc2013-epiphany-42d8a8cb91e46a1ac29334c054ac95c5cfc9a348.tar
gsoc2013-epiphany-42d8a8cb91e46a1ac29334c054ac95c5cfc9a348.tar.gz
gsoc2013-epiphany-42d8a8cb91e46a1ac29334c054ac95c5cfc9a348.tar.bz2
gsoc2013-epiphany-42d8a8cb91e46a1ac29334c054ac95c5cfc9a348.tar.lz
gsoc2013-epiphany-42d8a8cb91e46a1ac29334c054ac95c5cfc9a348.tar.xz
gsoc2013-epiphany-42d8a8cb91e46a1ac29334c054ac95c5cfc9a348.tar.zst
gsoc2013-epiphany-42d8a8cb91e46a1ac29334c054ac95c5cfc9a348.zip
Add plugins dir
2003-07-13 Marco Pesenti Gritti <marco@it.gnome.org> * Makefile.am: Add plugins dir * plugins/sample/Makefile.am: * plugins/sample/sample.c: (window_focus_in_cb): Make it compile with not installed headers * src/Makefile.am: Remove an obsolete include dir
-rw-r--r--ChangeLog15
-rw-r--r--Makefile.am2
-rw-r--r--plugins/sample/Makefile.am5
-rw-r--r--plugins/sample/sample.c8
-rw-r--r--src/Makefile.am1
5 files changed, 25 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 7755a6e75..c6267e0af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
2003-07-13 Marco Pesenti Gritti <marco@it.gnome.org>
* Makefile.am:
+
+ Add plugins dir
+
+ * plugins/sample/Makefile.am:
+ * plugins/sample/sample.c: (window_focus_in_cb):
+
+ Make it compile with not installed headers
+
+ * src/Makefile.am:
+
+ Remove an obsolete include dir
+
+2003-07-13 Marco Pesenti Gritti <marco@it.gnome.org>
+
+ * Makefile.am:
* configure.in:
* embed/Makefile.am:
* embed/ephy-embed-shell.c: (ephy_embed_shell_get_favicon_cache),
diff --git a/Makefile.am b/Makefile.am
index 7107e68ec..26075a087 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = lib embed src data po help
+SUBDIRS = lib embed src data po help plugins
distcleancheck_listfiles = find . -type f -print | grep -v 'omf\.out'
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
index 45b79e024..2c735e923 100644
--- a/plugins/sample/Makefile.am
+++ b/plugins/sample/Makefile.am
@@ -1,7 +1,10 @@
plugindir = $(libdir)/epiphany/plugins
INCLUDES = \
- -I/opt/gnome/include/epiphany-1.0 \
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/embed \
+ -I$(top_srcdir)/lib \
+ -I$(top_srcdir)/src/bookmarks \
$(EPIPHANY_DEPENDENCY_CFLAGS) \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-DG_DISABLE_DEPRECATED \
diff --git a/plugins/sample/sample.c b/plugins/sample/sample.c
index c36352e6f..fb5e9ed64 100644
--- a/plugins/sample/sample.c
+++ b/plugins/sample/sample.c
@@ -20,8 +20,8 @@
#include <gmodule.h>
#include <glib-object.h>
-#include "epiphany/ephy-shell.h"
-#include "epiphany/session.h"
+#include "ephy-shell.h"
+#include "session.h"
static void
bmk_added (EphyNode *node, EphyNode *child)
@@ -53,13 +53,15 @@ switch_page_cb (GtkWidget *widget)
g_print ("New active tab is %p\n", tab);
}
-static void
+static gboolean
window_focus_in_cb (GtkWidget *widget, GdkEventFocus *event)
{
EphyTab *tab;
tab = ephy_window_get_active_tab (EPHY_WINDOW (widget));
g_print ("New active tab is %p\n", tab);
+
+ return FALSE;
}
static void
diff --git a/src/Makefile.am b/src/Makefile.am
index e47c8331b..1d3035800 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,6 @@ INCLUDES = \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/lib/egg \
-I$(top_srcdir)/lib/widgets \
- -I$(top_srcdir)/lib/toolbar \
-I$(top_srcdir)/src/bookmarks \
$(WARN_CFLAGS) \
$(EPIPHANY_DEPENDENCY_CFLAGS) \