diff options
| author | Søren Sandmann <sandmann@redhat.com> | 2006-03-30 21:39:00 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <ssp@src.gnome.org> | 2006-03-30 21:39:00 +0000 |
| commit | aaafd14124ddf4d43c39f3a14c653a38671ca0d9 (patch) | |
| tree | 58364eb343314700e393a0381e87c3b064acc966 | |
| parent | 3bf211c89f2253c942c5ef97bcc73987d401c060 (diff) | |
| download | metacity-aaafd14124ddf4d43c39f3a14c653a38671ca0d9.tar.gz | |
Fix an illegal write.
Thu Mar 30 16:38:35 2006 Søren Sandmann <sandmann@redhat.com>
* src/compositor.c (meta_compositor_begin_move): Fix an illegal write.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/compositor.c | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Thu Mar 30 16:38:35 2006 Søren Sandmann <sandmann@redhat.com> + + * src/compositor.c (meta_compositor_begin_move): Fix an illegal write. + Thu Mar 30 16:13:52 2006 Søren Sandmann <sandmann@redhat.com> * composite.c: Turn wobbling back on Add new explosion effect. diff --git a/src/compositor.c b/src/compositor.c index bb5f3be6..b0361a3c 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1243,6 +1243,7 @@ struct MoveInfo MetaWindow *window; gdouble last_time; gboolean window_destroyed; + MetaCompositor *compositor; }; #endif @@ -1286,7 +1287,7 @@ wobble (gpointer data) if (!info->window_destroyed) meta_screen_info_unset_patch (minfo, get_xid (info->window)); g_free (info); - info = NULL; + info->compositor->move_info = NULL; g_print ("stop wobb\n"); return FALSE; } @@ -1343,16 +1344,19 @@ meta_compositor_begin_move (MetaCompositor *compositor, compositor->move_info = g_new0 (MoveInfo, 1); + compositor->move_info->compositor = compositor; compositor->move_info->last_time = 0.0; compositor->move_info->timer = g_timer_new (); compositor->move_info->window_destroyed = FALSE; compute_window_rect (window, &rect); +#if 0 g_print ("init: %d %d\n", initial->x, initial->y); g_print ("window: %d %d\n", window->rect.x, window->rect.y); g_print ("frame: %d %d\n", rect.x, rect.y); g_print ("grab: %d %d\n", grab_x, grab_y); +#endif compositor->move_info->model = model_new (&rect, TRUE); compositor->move_info->window = window; |