From 44592d8463a27f756746201136a97e2d47dcc4f8 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@gnome.org>
Date: Fri, 10 Oct 2003 19:24:33 +0000
Subject: Reenable deprecated api where necessary, fixup some header
 inclusions.

2003-10-10  Marco Pesenti Gritti  <marco@gnome.org>

        * embed/mozilla/FilePicker.cpp:
        * embed/mozilla/FilePicker.h:
        * embed/mozilla/mozilla-embed-single.cpp:
        * lib/Makefile.am:
        * lib/ephy-dialog.c: (get_pref_type_from_widget),
        (prefs_connect_signals), (load_props), (save_props):
        * lib/ephy-gui.h:
        * lib/widgets/Makefile.am:
        * src/Makefile.am:
        * src/bookmarks/Makefile.am:
        * src/bookmarks/ephy-topic-action.c:
        * src/ephy-history-window.c:

        Reenable deprecated api where necessary, fixup some
        header inclusions.
        Remove unused color picker control in ephy-dialog.
        Remove unused file types optionmenu in Filepicker.
---
 src/Makefile.am                   | 1 -
 src/bookmarks/Makefile.am         | 1 -
 src/bookmarks/ephy-topic-action.c | 1 +
 src/ephy-history-window.c         | 1 +
 4 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index 268d6e34f..38c1a5195 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,6 @@ INCLUDES = \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGNOME_DISABLE_DEPRECATED
 
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 5b1865d31..9a051c521 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -11,7 +11,6 @@ INCLUDES = \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGNOME_DISABLE_DEPRECATED
 
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index 9d2d049a0..3459a6c1f 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -23,6 +23,7 @@
 #endif
 
 #include <gtk/gtktoolitem.h>
+#include <bonobo/bonobo-i18n.h>
 
 #include "ephy-topic-action.h"
 #include "ephy-node-common.h"
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 5406e5895..97b889197 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -35,6 +35,7 @@
 #include <bonobo/bonobo-i18n.h>
 #include <libgnomeui/gnome-stock-icons.h>
 #include <string.h>
+#include <time.h>
 
 #include "ephy-node-view.h"
 #include "ephy-window.h"
-- 
cgit v1.2.3