From 104786735ac54ba93edc97a3ad5f3623bfbdf799 Mon Sep 17 00:00:00 2001 From: Rob Adams Date: Wed, 17 Dec 2003 16:01:00 +0000 Subject: [PATCH] initialize grab_wireframe_active to FALSE. Fix for #128090. 2003-12-17 Rob Adams * src/display.c (meta_display_open): initialize grab_wireframe_active to FALSE. Fix for #128090. 2003-12-17 Rob Adams * src/tabpopup.c (meta_ui_tab_popup_new): Don't try to call utf8_strndup on a null title for an entry. Fix for #128566. * src/workspace.c (meta_workspace_free): Call g_list_free on the mru_list, since with sticky windows that MRU list could well not be emtpy. See #122016. --- ChangeLog | 14 ++++++++++++++ src/display.c | 1 + src/tabpopup.c | 5 ++++- src/workspace.c | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4ff2949d..eec0e1d94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2003-12-17 Rob Adams + + * src/display.c (meta_display_open): initialize + grab_wireframe_active to FALSE. Fix for #128090. + +2003-12-17 Rob Adams + + * src/tabpopup.c (meta_ui_tab_popup_new): Don't try to call + utf8_strndup on a null title for an entry. Fix for #128566. + + * src/workspace.c (meta_workspace_free): Call g_list_free on the + mru_list, since with sticky windows that MRU list could well not + be emtpy. See #122016. + 2003-12-13 Rob Adams * src/window.c (meta_window_new_with_attrs): set on_all_workspaces diff --git a/src/display.c b/src/display.c index 4ff003275..41b13e315 100644 --- a/src/display.c +++ b/src/display.c @@ -479,6 +479,7 @@ meta_display_open (const char *name) display->sentinel_counter = 0; display->grab_op = META_GRAB_OP_NONE; + display->grab_wireframe_active = FALSE; display->grab_window = NULL; display->grab_screen = NULL; display->grab_resize_popup = NULL; diff --git a/src/tabpopup.c b/src/tabpopup.c index fa4201763..3f8256691 100644 --- a/src/tabpopup.c +++ b/src/tabpopup.c @@ -180,7 +180,10 @@ meta_ui_tab_popup_new (const MetaTabEntry *entries, te = g_new (TabEntry, 1); te->key = entries[i].key; - te->title = utf8_strndup (entries[i].title, max_chars_per_title); + te->title = + entries[i].title + ? utf8_strndup (entries[i].title, max_chars_per_title) + : NULL; te->widget = NULL; te->icon = entries[i].icon; te->blank = entries[i].blank; diff --git a/src/workspace.c b/src/workspace.c index 25868c1c0..df7a72dd3 100644 --- a/src/workspace.c +++ b/src/workspace.c @@ -85,7 +85,6 @@ meta_workspace_free (MetaWorkspace *workspace) } g_assert (workspace->windows == NULL); - g_assert (workspace->mru_list == NULL); screen = workspace->screen; @@ -94,6 +93,7 @@ meta_workspace_free (MetaWorkspace *workspace) g_free (workspace->work_areas); + g_list_free (workspace->mru_list); g_slist_free (workspace->left_struts); g_slist_free (workspace->right_struts); g_slist_free (workspace->top_struts);