summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--configure.in3
-rw-r--r--libnautilus-private/nautilus-file-operations.c2
-rw-r--r--libnautilus-private/nautilus-icon-container.c2
-rw-r--r--libnautilus-private/nautilus-icon-dnd.c2
-rw-r--r--libnautilus-private/nautilus-volume-monitor.c1
6 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index fd93b3158..9b68c889f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2002-02-22 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * configure.in: remove obsolete
+ GNOME_COMMON_INIT and GNOME_PLATFORM_GNOME_2 macros.
+ * libnautilus-private/nautilus-file-operations.c
+ (handle_transfer_duplicate):
+ * libnautilus-private/nautilus-icon-dnd.c
+ (nautilus_icon_container_get_drop_action):
+ * libnautilus-private/nautilus-volume-monitor.c
+ (mount_volume_deactivate):
+ remove empty default: label to fix warning on gcc 3.
+ * libnautilus-private/nautilus-icon-container.c (clear_drag_state):
+ fix typo.
+
2002-02-22 Darin Adler <darin@bentspoon.com>
* libnautilus-private/nautilus-icon-container.c:
diff --git a/configure.in b/configure.in
index 831d38ae5..e96479c3f 100644
--- a/configure.in
+++ b/configure.in
@@ -32,7 +32,6 @@ AM_CONFIG_HEADER(config.h)
AM_SANITY_CHECK
AM_MAINTAINER_MODE
-GNOME_COMMON_INIT
AC_C_BIGENDIAN
AC_C_CONST
@@ -47,8 +46,6 @@ AM_PROG_LIBTOOL
AM_PATH_ORBIT2
-GNOME_PLATFORM_GNOME_2(yes)
-
PKG_CHECK_MODULES(ALL, \
esound >= $ESOUND_REQUIRED \
bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED \
diff --git a/libnautilus-private/nautilus-file-operations.c b/libnautilus-private/nautilus-file-operations.c
index 195bdb670..c46c5855e 100644
--- a/libnautilus-private/nautilus-file-operations.c
+++ b/libnautilus-private/nautilus-file-operations.c
@@ -1562,8 +1562,6 @@ handle_transfer_duplicate (GnomeVFSXferProgressInfo *progress_info,
(progress_info->duplicate_name,
progress_info->duplicate_count);
break;
-
- default:
/* For all other cases we use the name as-is. */
}
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index b4216d436..1d571054f 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -2585,7 +2585,7 @@ clear_drag_state (NautilusIconContainer *container)
{
container->details->drag_icon = NULL;
container->details->drag_state = DRAG_STATE_INITIAL;
- remove_context_menu_tiemout (container);
+ remove_context_menu_timeout (container);
}
static gboolean
diff --git a/libnautilus-private/nautilus-icon-dnd.c b/libnautilus-private/nautilus-icon-dnd.c
index a63bf6bc5..e1909cf8d 100644
--- a/libnautilus-private/nautilus-icon-dnd.c
+++ b/libnautilus-private/nautilus-icon-dnd.c
@@ -1108,8 +1108,6 @@ nautilus_icon_container_get_drop_action (NautilusIconContainer *container,
*default_action = context->suggested_action;
*non_default_action = context->suggested_action;
break;
-
- default:
}
}
diff --git a/libnautilus-private/nautilus-volume-monitor.c b/libnautilus-private/nautilus-volume-monitor.c
index 141ad5c09..9a8ea5944 100644
--- a/libnautilus-private/nautilus-volume-monitor.c
+++ b/libnautilus-private/nautilus-volume-monitor.c
@@ -892,7 +892,6 @@ mount_volume_deactivate (NautilusVolumeMonitor *monitor, NautilusVolume *volume)
pthread_create (&eject_thread, NULL, eject_device, g_strdup (volume->device_path));
}
break;
- default:
}
g_signal_emit (monitor,