[nautilus/gnome-2-32: 231/283] Compile cleanly with GCC 4.5.



commit 67d4d77e18cd9e611e232c02b2a52fcf5c1e823a
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Sat Jul 10 19:31:20 2010 +0200

    Compile cleanly with GCC 4.5.

 .../nautilus-directory-background.c                |    5 +++--
 libnautilus-private/nautilus-icon-dnd.c            |    2 +-
 src/nautilus-information-panel.c                   |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/libnautilus-private/nautilus-directory-background.c b/libnautilus-private/nautilus-directory-background.c
index 75d89eb..a0e9e17 100644
--- a/libnautilus-private/nautilus-directory-background.c
+++ b/libnautilus-private/nautilus-directory-background.c
@@ -388,7 +388,8 @@ background_changed_callback (EelBackground *background,
                 g_signal_handlers_block_by_func (
                         file, G_CALLBACK (saved_settings_changed_callback), background);
 
-                if (action != NAUTILUS_DND_ACTION_SET_AS_FOLDER_BACKGROUND && action != NAUTILUS_DND_ACTION_SET_AS_GLOBAL_BACKGROUND) {
+                if (action != (GdkDragAction) NAUTILUS_DND_ACTION_SET_AS_FOLDER_BACKGROUND &&
+                    action != (GdkDragAction) NAUTILUS_DND_ACTION_SET_AS_GLOBAL_BACKGROUND) {
                         GdkDragAction default_drag_action;
 
                         default_drag_action = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (background), "default_drag_action"));
@@ -397,7 +398,7 @@ background_changed_callback (EelBackground *background,
                         action = default_drag_action;
                 }
         
-                if (action == NAUTILUS_DND_ACTION_SET_AS_GLOBAL_BACKGROUND) {
+                if (action == (GdkDragAction) NAUTILUS_DND_ACTION_SET_AS_GLOBAL_BACKGROUND) {
                         nautilus_file_set_metadata (file,
                                                     NAUTILUS_METADATA_KEY_LOCATION_BACKGROUND_COLOR,
                                                     NULL,
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index a84d52e..9f7d077 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -1229,7 +1229,7 @@ nautilus_icon_container_receive_dropped_icons (NautilusIconContainer *container,
 			(GTK_WIDGET (container), action);
 	}
 	
-	if (real_action == NAUTILUS_DND_ACTION_SET_AS_BACKGROUND) {
+	if (real_action == (GdkDragAction) NAUTILUS_DND_ACTION_SET_AS_BACKGROUND) {
 		selected_item = container->details->dnd_info->drag_info.selection_list->data;
 		eel_background_receive_dropped_background_image
 			(eel_get_widget_background (GTK_WIDGET (container)),
diff --git a/src/nautilus-information-panel.c b/src/nautilus-information-panel.c
index bf8dfbf..e1972a9 100644
--- a/src/nautilus-information-panel.c
+++ b/src/nautilus-information-panel.c
@@ -686,7 +686,7 @@ background_settings_changed_callback (EelBackground *background, GdkDragAction a
 	color = eel_background_get_color (background);
 	image = eel_background_get_image_uri (background);
 
-	if (action != NAUTILUS_DND_ACTION_SET_AS_BACKGROUND) {
+	if (action != (GdkDragAction) NAUTILUS_DND_ACTION_SET_AS_BACKGROUND) {
 		nautilus_file_set_metadata (information_panel->details->file,
 					    NAUTILUS_METADATA_KEY_SIDEBAR_BACKGROUND_COLOR,
 					    NULL,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]