also treat empty string as "unset" in this function.

2002-12-08  Havoc Pennington  <hp@pobox.com>

	* src/prefs.c (update_workspace_name): also treat empty string as
	"unset" in this function.
This commit is contained in:
Havoc Pennington 2002-12-08 14:59:14 +00:00 committed by Havoc Pennington
parent 48b00403b6
commit 15d28dfd97
3 changed files with 14 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2002-12-08 Havoc Pennington <hp@pobox.com>
* src/prefs.c (update_workspace_name): also treat empty string as
"unset" in this function.
Thu Dec 5 18:41:02 2002 HideToshi Tajima <hidetoshi.tajima@sun.com> Thu Dec 5 18:41:02 2002 HideToshi Tajima <hidetoshi.tajima@sun.com>
* src/window.h (META_WINDOW_IN_NORMAL_TAB_CHAIN, * src/window.h (META_WINDOW_IN_NORMAL_TAB_CHAIN,

View File

@ -1566,7 +1566,13 @@ update_workspace_name (const char *name,
return FALSE; return FALSE;
} }
if (value != NULL) /* This is a bad hack. We have to treat empty string as
* "unset" because the root window property can't contain
* null. So it gets empty string instead and we don't want
* that to result in setting the empty string as a value that
* overrides "unset".
*/
if (value != NULL && *value != '\0')
{ {
g_free (workspace_names[i]); g_free (workspace_names[i]);
workspace_names[i] = g_strdup (value); workspace_names[i] = g_strdup (value);

View File

@ -537,6 +537,8 @@ create_constraints (Constraint **constraints,
if (!WINDOW_IN_STACK (w)) if (!WINDOW_IN_STACK (w))
{ {
meta_topic (META_DEBUG_STACK, "Window %s not in the stack, not constraining it\n",
w->desc);
tmp = tmp->next; tmp = tmp->next;
continue; continue;
} }