]>
Commit | Line | Data |
---|---|---|
ad92460f ER |
1 | --- a/src/core/prefs.c |
2 | +++ b/src/core/prefs.c | |
3 | @@ -1962,6 +1962,10 @@ init_commands (void) | |
4 | static void | |
5 | init_workspace_names (void) | |
6 | { | |
7 | + int i; | |
8 | + for (i = 0; i < MAX_REASONABLE_WORKSPACES; i++) | |
9 | + workspace_names[i] = NULL; | |
10 | + | |
11 | #ifdef HAVE_MATECONF | |
12 | GSList *list, *l; | |
13 | const char *str_val; | |
14 | @@ -1980,14 +1984,15 @@ init_workspace_names (void) | |
15 | mateconf_entry_free (entry); | |
16 | } | |
17 | g_slist_free (list); | |
18 | -#else | |
19 | - int i; | |
20 | +#endif /* HAVE_MATECONF */ | |
21 | + | |
22 | + /* initialise any we didn't see */ | |
23 | for (i = 0; i < MAX_REASONABLE_WORKSPACES; i++) | |
24 | - workspace_names[i] = g_strdup_printf (_("Workspace %d"), i + 1); | |
25 | + if (workspace_names[i]==NULL) | |
26 | + workspace_names[i] = g_strdup_printf (_("Workspace %d"), i + 1); | |
27 | ||
28 | meta_topic (META_DEBUG_PREFS, | |
29 | "Initialized workspace names\n"); | |
30 | -#endif /* HAVE_MATECONF */ | |
31 | } | |
32 | ||
33 | static gboolean |