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.

4 files changed, 2 insertions, 71 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f70c0c170..bc0c0901c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = \
 	-DSHARE_DIR=\"$(pkgdatadir)\"	\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGNOME_DISABLE_DEPRECATED
 
diff --git a/lib/ephy-dialog.c b/lib/ephy-dialog.c
index 973aca87a..721cfa4cf 100644
--- a/lib/ephy-dialog.c
+++ b/lib/ephy-dialog.c
@@ -24,6 +24,7 @@
 #include "ephy-gui.h"
 #include "eel-gconf-extensions.h"
 
+#include <stdlib.h>
 #include <string.h>
 #include <gtk/gtktogglebutton.h>
 
@@ -80,7 +81,6 @@ typedef enum
         PT_TOGGLEBUTTON,
         PT_RADIOBUTTON,
         PT_SPINBUTTON,
-        PT_COLOR,
         PT_OPTIONMENU,
         PT_ENTRY,
 	PT_UNKNOWN
@@ -335,23 +335,6 @@ set_config_from_togglebutton (GtkWidget *togglebutton, const char *config_name)
 }
 
 static void
-set_config_from_color (GtkWidget *colorpicker, const char *config_name)
-{
-	guint8 r, g, b, a;
-	gchar color_string[9];
-
-	/* get color values from color picker */
-	gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (colorpicker),
-				   &r, &g, &b, &a);
-
-	/* write into string (bounded size) */
-	g_snprintf (color_string, 9, "#%02X%02X%02X", r, g, b);
-
-	/* set the configuration value */
-	eel_gconf_set_string (config_name, color_string);
-}
-
-static void
 set_editable_from_config (GtkWidget *editable, const char *config_name)
 {
 	GConfValue *gcvalue = eel_gconf_get_value (config_name);
@@ -502,26 +485,6 @@ set_togglebutton_from_config (GtkWidget *togglebutton, const char *config_name)
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (togglebutton), value);
 }
 
-static void
-set_color_from_config (GtkWidget *colorpicker, const char *config_name)
-{
-	gchar *color_string;
-	guint r, g, b;
-
-	/* get the string from config */
-	color_string = eel_gconf_get_string (config_name);
-
-	if (color_string)
-	{
-		/* parse it and setup the color picker */
-		sscanf (color_string, "#%2X%2X%2X", &r, &g, &b);
-		gnome_color_picker_set_i8 (GNOME_COLOR_PICKER (colorpicker),
-					   r, g, b, 0);
-		/* free the string */
-		g_free (color_string);
-	}
-}
-
 static PrefType
 get_pref_type_from_widget (GtkWidget *widget)
 {
@@ -545,10 +508,6 @@ get_pref_type_from_widget (GtkWidget *widget)
 	{
 		return PT_ENTRY;
 	}
-	else if (GNOME_IS_COLOR_PICKER (widget))
-	{
-		return PT_COLOR;
-	}
 
 	return PT_UNKNOWN;
 }
@@ -705,16 +664,6 @@ prefs_spinbutton_changed_cb (GtkWidget *widget, PropertyInfo *pi)
 }
 
 static void
-prefs_color_changed_cb (GtkWidget *widget, guint r, guint g,
-			guint b, guint a, const PropertyInfo *pi)
-{
-	if (pi->type == PT_AUTOAPPLY)
-	{
-		set_config_from_color (widget,  pi->pref);
-	}
-}
-
-static void
 prefs_entry_changed_cb (GtkWidget *widget, PropertyInfo *pi)
 {
 	if (pi->type == PT_AUTOAPPLY)
@@ -779,11 +728,6 @@ prefs_connect_signals (EphyDialog *dialog)
 					  G_CALLBACK(prefs_spinbutton_changed_cb),
 					  (gpointer)info);
 			break;
-		case PT_COLOR:
-			g_signal_connect (G_OBJECT (info->widget), "color_set",
-					  G_CALLBACK(prefs_color_changed_cb),
-					  (gpointer)info);
-			break;
 		case PT_OPTIONMENU:
 			g_signal_connect (G_OBJECT (info->widget),
 					  "changed",
@@ -875,11 +819,6 @@ load_props (PropertyInfo *props)
 						    props[i].pref,
 						    props[i].string_enum);
 		}
-		else if (GNOME_IS_COLOR_PICKER(props[i].widget))
-		{
-			set_color_from_config (props[i].widget,
-					       props[i].pref);
-		}
 	}
 
 }
@@ -922,11 +861,6 @@ save_props (PropertyInfo *props)
 						    props[i].pref,
 						    props[i].string_enum);
 		}
-		else if (GNOME_IS_COLOR_PICKER(props[i].widget))
-		{
-			set_config_from_color (props[i].widget,
-					       props[i].pref);
-		}
 	}
 }
 
diff --git a/lib/ephy-gui.h b/lib/ephy-gui.h
index 17063388d..203eba975 100644
--- a/lib/ephy-gui.h
+++ b/lib/ephy-gui.h
@@ -19,10 +19,9 @@
 #ifndef EPHY_GUI_H
 #define EPHY_GUI_H
 
-/* system includes */
 #include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gnome.h>
+#include <gdk/gdkkeysyms.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index e89a98023..7331079a5 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -6,7 +6,6 @@ INCLUDES = \
 	-DSHARE_DIR=\"$(pkgdatadir)\"	\
 	-DG_DISABLE_DEPRECATED		\
 	-DGDK_DISABLE_DEPRECATED	\
-	-DGTK_DISABLE_DEPRECATED	\
 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
 	-DGNOME_DISABLE_DEPRECATED