summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren gmail com>2006-09-18 16:31:25 +0000
committerElijah Newren <newren@src.gnome.org>2006-09-18 16:31:25 +0000
commit87100b64d9e6abfa90dd22f59c5267a5260b5b95 (patch)
tree77999957099fe8517ea0faf6412a1d2aae51b9d0
parentdef5a12ff0d2c6c3aa6c28b2fea2220c6edb9dc6 (diff)
downloadmetacity-87100b64d9e6abfa90dd22f59c5267a5260b5b95.tar.gz
Patch from Maik Beckmann to remove compilation warnings. Fixes #355876.
2006-09-18 Elijah Newren <newren gmail com> * src/spring-model.c (on_end_move, model_is_calm): Patch from Maik Beckmann to remove compilation warnings. Fixes #355876.
-rw-r--r--ChangeLog5
-rw-r--r--src/spring-model.c13
2 files changed, 6 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index c088564a..a9594c70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-09-18 Elijah Newren <newren gmail com>
+ * src/spring-model.c (on_end_move, model_is_calm): Patch from Maik
+ Beckmann to remove compilation warnings. Fixes #355876.
+
+2006-09-18 Elijah Newren <newren gmail com>
+
* configure.in: Make detection of stable vs. unstable automatic
and based upon the version number. Partially based on patch from
Christian Hamar in #356122. Fixes #356122.
diff --git a/src/spring-model.c b/src/spring-model.c
index 88534dfa..a1dd4463 100644
--- a/src/spring-model.c
+++ b/src/spring-model.c
@@ -362,23 +362,12 @@ model_update_move (Model *model, int x, int y)
model->anchor_object->position.y = y - model->anchor_offset.y;
}
-static void
-on_end_move (Model *model)
-{
- if (model->anchor_object)
- {
- model->anchor_object->immobile = 0;
- model->anchor_object = NULL;
- }
-}
-
#define EPSILON 0.02
gboolean
model_is_calm (Model *model)
{
- int i, j;
- gboolean calm = TRUE;
+ int i;
for (i = 0; i < model->num_objects; i++)
{