diff options
| author | Rob Adams <readams@readams.net> | 2003-12-17 16:01:00 +0000 |
|---|---|---|
| committer | Rob Adams <readams@src.gnome.org> | 2003-12-17 16:01:00 +0000 |
| commit | 104786735ac54ba93edc97a3ad5f3623bfbdf799 (patch) | |
| tree | 8ed78601bc8377b576316d32836e7e5e6228c714 /src | |
| parent | 191b3f2c21fbe0d0d135505c0ad39c1df97423c3 (diff) | |
| download | metacity-104786735ac54ba93edc97a3ad5f3623bfbdf799.tar.gz | |
initialize grab_wireframe_active to FALSE. Fix for #128090.
2003-12-17 Rob Adams <readams@readams.net>
* src/display.c (meta_display_open): initialize
grab_wireframe_active to FALSE. Fix for #128090.
2003-12-17 Rob Adams <readams@readams.net>
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/display.c | 1 | ||||
| -rw-r--r-- | src/tabpopup.c | 5 | ||||
| -rw-r--r-- | src/workspace.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/display.c b/src/display.c index 4ff00327..41b13e31 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 fa420176..3f825669 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 25868c1c..df7a72dd 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); |