diff options
| author | Søren Sandmann <sandmann@redhat.com> | 2008-05-31 03:34:36 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2008-05-31 03:34:36 +0000 |
| commit | 063e25eface7baec5cc0cc952cbadc493abf4249 (patch) | |
| tree | e1deea20e87b2f2853025ff53de74b93fd3b7870 | |
| parent | 1b1ae3c81188b496a51d209f940383a15ce6e95e (diff) | |
| download | nautilus-063e25eface7baec5cc0cc952cbadc493abf4249.tar.gz | |
Revert last commit as we do still need to deal with uris.
Fri May 30 23:33:17 2008 Søren Sandmann <sandmann@redhat.com>
* Revert last commit as we do still need to deal with uris.
svn path=/trunk/; revision=14213
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory-background.c | 6 | ||||
| -rw-r--r-- | src/nautilus-information-panel.c | 6 | ||||
| -rw-r--r-- | test/test.c | 8 |
5 files changed, 15 insertions, 15 deletions
@@ -1,3 +1,7 @@ +Fri May 30 23:33:17 2008 Søren Sandmann <sandmann@redhat.com> + + * Revert last commit as we do still need to deal with uris. + Fri May 30 22:16:51 2008 Søren Sandmann <sandmann@redhat.com> * libnautilus-private/nautilus-directory-background.c @@ -7,10 +11,6 @@ Fri May 30 22:16:51 2008 Søren Sandmann <sandmann@redhat.com> API * configure.in: Require SVN version of eel -Fri May 30 22:16:10 2008 Søren Sandmann <sandmann@redhat.com> - - * libnautilus-private/nautilus-directory-background.c - Fri May 30 21:25:59 2008 Søren Sandmann <sandmann@redhat.com> * libnautilus-private/nautilus-directory-background.c diff --git a/configure.in b/configure.in index 384db72bf..5ae2833f7 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl =========================================================================== m4_define(bonobo_activation_minver, 2.1.0) m4_define(bonobo_minver, 2.1.0) -m4_define(eel_minver, 2.23.2) +m4_define(eel_minver, 2.21.90) m4_define(glib_minver, 2.15.6) m4_define(gnome_desktop_minver, 2.9.91) m4_define(gnome_minver, 2.14.0) diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c index 813384ba0..79a90d2bc 100644 --- a/libnautilus-private/nautilus-directory-background.c +++ b/libnautilus-private/nautilus-directory-background.c @@ -437,7 +437,7 @@ nautilus_file_background_is_set (EelBackground *background) gboolean is_set; color = eel_background_get_color (background); - image = eel_background_get_image_filename (background); + image = eel_background_get_image_uri (background); is_set = (color || image); @@ -462,7 +462,7 @@ background_changed_callback (EelBackground *background, color = eel_background_get_color (background); - image = eel_background_get_image_filename (background); + image = eel_background_get_image_uri (background); if (eel_background_is_desktop (background)) { nautilus_file_background_write_desktop_settings (color, image, eel_background_get_image_placement (background)); @@ -560,7 +560,7 @@ initialize_background_from_settings (NautilusFile *file, file); eel_background_set_color (background, color); - eel_background_set_image_filename (background, image); + eel_background_set_image_uri (background, image); eel_background_set_image_placement (background, placement); /* Unblock the handler. */ diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c index e6ff3577c..0e5a67408 100644 --- a/src/nautilus-information-panel.c +++ b/src/nautilus-information-panel.c @@ -334,7 +334,7 @@ information_panel_has_background (NautilusInformationPanel *information_panel) background = eel_get_widget_background (GTK_WIDGET(information_panel)); color = eel_background_get_color (background); - image = eel_background_get_image_filename (background); + image = eel_background_get_image_uri (background); has_background = (color || image); @@ -682,7 +682,7 @@ background_settings_changed_callback (EelBackground *background, GdkDragAction a information_panel); color = eel_background_get_color (background); - image = eel_background_get_image_filename (background); + image = eel_background_get_image_uri (background); if (action != NAUTILUS_DND_ACTION_SET_AS_BACKGROUND) { nautilus_file_set_metadata (information_panel->details->file, @@ -992,7 +992,7 @@ nautilus_information_panel_update_appearance (NautilusInformationPanel *informat g_free (information_panel->details->current_background_image); information_panel->details->current_background_image = g_strdup (background_image); - eel_background_set_image_filename (background, background_image); + eel_background_set_image_uri (background, background_image); eel_background_set_color (background, background_color); nautilus_sidebar_title_select_text_color diff --git a/test/test.c b/test/test.c index df1a705b0..bd9065ecd 100644 --- a/test/test.c +++ b/test/test.c @@ -54,18 +54,18 @@ test_gtk_widget_set_background_image (GtkWidget *widget, const char *image_name) { EelBackground *background; - char *filename; + char *uri; g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (image_name != NULL); background = eel_get_widget_background (widget); - filename = g_strdup_printf ("%s/%s", NAUTILUS_DATADIR, image_name); + uri = g_strdup_printf ("file://%s/%s", NAUTILUS_DATADIR, image_name); - eel_background_set_image_filename (background, filename); + eel_background_set_image_uri (background, uri); - g_free (filename); + g_free (uri); } void |