Commit f94e48bf authored by David Emory Watson's avatar David Emory Watson

Require eel 1.1.5.



	* configure.in: Require eel 1.1.5.

	* src/nautilus-sidebar-tabs.c
	(nautilus_sidebar_tabs_set_color): Use eel_gdk_color_parse () for
	backward compatible color spec. parsing.

	* src/nautilus-property-browser.c:
	(make_color_drag_image): Same as above.
	(nautilus_property_browser_drag_data_get): Same as above.
parent 99e2574c
2002-02-15 David Emory Watson <dwatson@cs.ucr.edu>
* configure.in: Require eel 1.1.5.
* src/nautilus-sidebar-tabs.c
(nautilus_sidebar_tabs_set_color): Use eel_gdk_color_parse () for
backward compatible color spec. parsing.
* src/nautilus-property-browser.c:
(make_color_drag_image): Same as above.
(nautilus_property_browser_drag_data_get): Same as above.
2002-02-15 jacob berkman <jacob@ximian.com>
* src/Makefile.am (EXTRA_DIST): remove nautilus-shell-marshal.list
......
......@@ -6,7 +6,7 @@ ART_REQUIRED=2.3.6
BONOBO_ACTIVATION_REQUIRED=0.9.3
BONOBO_REQUIRED=1.110
BONOBO_UI_REQUIRED=1.110.2
EEL_REQUIRED=1.1.3
EEL_REQUIRED=1.1.5
ESOUND_REQUIRED=0.2.23
GLIB_REQUIRED=1.3.10
GNOME_CANVAS_REQUIRED=1.105
......
......@@ -558,12 +558,13 @@ nautilus_property_browser_drag_data_get (GtkWidget *widget,
/* handle the "reset" case as an image */
if (eel_strcmp (property_browser->details->dragged_file, RESET_IMAGE_NAME) != 0) {
gdk_color_parse(property_browser->details->dragged_file, &color);
eel_gdk_color_parse (property_browser->details->dragged_file, &color);
colorArray[0] = color.red;
colorArray[1] = color.green;
colorArray[2] = color.blue;
colorArray[3] = 0xffff;
gtk_selection_data_set(selection_data,
selection_data->target, 16, (const char *) &colorArray[0], 8);
return;
......@@ -689,7 +690,7 @@ make_color_drag_image (NautilusPropertyBrowser *property_browser, const char *co
color_square = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, COLOR_SQUARE_SIZE, COLOR_SQUARE_SIZE);
gdk_color_parse(color_spec, &color);
eel_gdk_color_parse (color_spec, &color);
color.red >>= 8;
color.green >>= 8;
color.blue >>= 8;
......
......@@ -1606,8 +1606,8 @@ nautilus_sidebar_tabs_set_color (NautilusSidebarTabs *sidebar_tabs,
{
g_return_if_fail (NAUTILUS_IS_SIDEBAR_TABS (sidebar_tabs));
g_return_if_fail (color_spec != NULL);
gdk_color_parse (color_spec, &sidebar_tabs->details->tab_color);
eel_gdk_color_parse (color_spec, &sidebar_tabs->details->tab_color);
gdk_colormap_alloc_color (gtk_widget_get_colormap (GTK_WIDGET (sidebar_tabs)),
&sidebar_tabs->details->tab_color, FALSE, TRUE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment